朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 e8c8469f9e799488392f17e9eeb94e7ae9cdbd13 1 个父辈 8034c3da

动态设置宽度 以及textarea的样式优化

内嵌 并排对比
正在显示 1 个修改的文件 包含 278 行增加 和 228 行删除
1 <template> 1 <template>
2 <el-row> 2 <el-row>
3 <el-card style="background-color: #F5F7FA"> 3 <el-card style="background-color: #F5F7FA">
  4 + <el-row class="toolbar" style="height:auto">
  5 + <el-form :model="addForm" :rules="rules" ref="addForm">
  6 + <el-divider content-position="left"><i class="el-icon-document"></i> 货物信息</el-divider>
  7 + <el-row>
  8 + <el-col :span="6">
  9 + <el-form-item label="" :label-width="formLabelWidth" prop="serialnumber">
  10 + <el-input v-model="addForm.serialnumber" autocomplete="off" disabled>
  11 + <template slot="prepend">流&emsp;&emsp;水</template>
  12 + </el-input>
  13 + </el-form-item>
  14 + </el-col>
  15 + <el-col :span="6">
  16 + <el-form-item label="" :label-width="formLabelWidth" prop="waybill">
  17 + <el-input v-model="addForm.waybillmaster" autocomplete="off" suffix-icon="el-icon-document" clearable>
  18 + <template slot="prepend">主&emsp;&emsp;单</template>
  19 + </el-input>
  20 + </el-form-item>
  21 + </el-col>
  22 + <el-col :span="6">
  23 + <el-form-item label="" :label-width="formLabelWidth" prop="waybill">
  24 + <el-input v-model="addForm.waybillsub" autocomplete="off" suffix-icon="el-icon-document" clearable>
  25 + <template slot="prepend">分&emsp;&emsp;单</template>
  26 + </el-input>
  27 + </el-form-item>
  28 + </el-col>
  29 + <el-col :span="6">
  30 + <el-form-item label="" :label-width="formLabelWidth" prop="pcs">
  31 + <el-input v-model.number="addForm.pcs" autocomplete="off" suffix-icon="el-icon-files" clearable >
  32 + <template slot="prepend">件&emsp;&emsp;数</template>
  33 + </el-input>
  34 + </el-form-item>
  35 + </el-col>
  36 + <el-col :span="6">
  37 + <el-form-item label="" :label-width="formLabelWidth" prop="weight">
  38 + <el-input v-model="addForm.weight" autocomplete="off" suffix-icon="el-icon-files" clearable>
  39 + <template slot="prepend">重&emsp;&emsp;量</template>
  40 + </el-input>
  41 + </el-form-item>
  42 + </el-col>
  43 + <el-col :span="6">
  44 + <el-form-item label="" :label-width="formLabelWidth" prop="billweight">
  45 + <el-input v-model="addForm.billweight" autocomplete="off" suffix-icon="el-icon-files" clearable>
  46 + <template slot="prepend">计费重量</template>
  47 + </el-input>
  48 + </el-form-item>
  49 + </el-col>
  50 + <el-col :span="6">
  51 + <el-form-item label="" :label-width="formLabelWidth" prop="vol">
  52 + <div class="my-text-area">
  53 + <div class="el-input-group__prepend prepand">体&emsp;&emsp;积</div>
  54 + <el-input v-model="addForm.vol"
  55 + type="textarea"
  56 + autosize
  57 + placeholder="请输入体积"
  58 + style="float: left;width:calc(100% - 89px)"
  59 + >
  60 + </el-input>
  61 + </div>
  62 + </el-form-item>
  63 + </el-col>
  64 + </el-row>
  65 + <el-divider content-position="left"><i class="el-icon-s-home"></i> 入库相关</el-divider>
  66 + <el-row>
  67 + <el-col :span="7">
  68 + <el-form-item label="" :label-width="formLabelWidth" prop="area">
  69 + <el-input v-model="addForm.area" autocomplete="off" style="width: 300px">
  70 + <template slot="prepend">库&emsp;&emsp;区</template>
  71 + </el-input>
  72 + </el-form-item>
  73 + </el-col>
  74 + <el-col :span="7">
  75 + <el-form-item label="" :label-width="formLabelWidth" prop="location">
  76 + <el-input v-model="addForm.location" autocomplete="off" style="width: 300px">
  77 + <template slot="prepend">库&emsp;&emsp;位</template>
  78 + </el-input>
  79 + </el-form-item>
  80 + </el-col>
  81 + <el-col :span="8">
  82 + <el-form-item label="" :label-width="formLabelWidth" prop="transcar">
  83 + <el-input v-model="addForm.transcar" autocomplete="off" style="width: 300px">
  84 + <template slot="prepend">运输车辆</template>
  85 + </el-input>
  86 + </el-form-item>
  87 + </el-col>
  88 + <el-col :span="7">
  89 + <el-form-item label="" :label-width="formLabelWidth" prop="opter">
  90 + <el-input v-model="addForm.opter" autocomplete="off" style="width: 300px" disabled>
  91 + <template slot="prepend">经&nbsp;办&nbsp;人</template>
  92 + </el-input>
  93 + </el-form-item>
  94 + </el-col>
  95 + <el-col :span="8">
  96 + <el-form-item label="" :label-width="formLabelWidth" prop="customername">
  97 + <el-input v-model="addForm.customername" autocomplete="off" style="width: 300px">
  98 + <template slot="prepend">货主名称</template>
  99 + </el-input>
  100 + </el-form-item>
  101 + </el-col>
  102 + </el-row>
  103 +<!-- <el-row>
  104 + <el-col :span="7">
  105 + <el-form-item label="" :label-width="formLabelWidth" prop="house">
  106 + <el-input v-model="addForm.house" autocomplete="off" style="width: 300px">
  107 + <template slot="prepend">出入库仓库</template>
  108 + </el-input>
  109 + </el-form-item>
  110 + </el-col>
  111 + <el-col :span="8">
  112 + <el-form-item label="" :label-width="formLabelWidth" prop="opttime">
  113 + <el-input v-model="addForm.opttime" autocomplete="off" style="width: 300px">
  114 + <template slot="prepend">出入库时间</template>
  115 + </el-input>
  116 + <el-date-picker
  117 + v-model="addForm.opttime"
  118 + type="datetime" size="mini"
  119 + value-format="yyyy-MM-dd HH:mm:ss"
  120 + format="yyyy-MM-dd HH:mm:ss"
  121 + style="width:300px"
  122 + placeholder="选择出入库时间">
  123 + </el-date-picker>
  124 + </el-form-item>
  125 + </el-col>
  126 +
  127 + <el-col :span="8">
  128 + <el-form-item label="" :label-width="formLabelWidth" prop="station">
  129 + <el-input v-model="addForm.station" autocomplete="off" style="width: 300px">
  130 + <template slot="prepend">出入库场站</template>
  131 + </el-input>
  132 + </el-form-item>
  133 + </el-col>
  134 + </el-row>
  135 +-->
  136 + <el-divider content-position="left"><i class="el-icon-mobile-phone"></i> 业务属性</el-divider>
  137 + <el-row>
  138 + <el-col :span="7">
  139 + <el-form-item label="" :label-width="formLabelWidth" prop="transtype">
  140 + <!-- <el-input v-model="addForm.transtype" autocomplete="off" style="width: 300px">-->
  141 + <!-- <template slot="prepend">交易类型</template>-->
  142 + <!-- </el-input>-->
  143 + <el-select v-model="addForm.transtype" placeholder="请选择交易类型" autocomplete="off" style="width: 300px">
  144 + <el-option
  145 + v-for="item in options1"
  146 + :key="item.value"
  147 + :label="item.label"
  148 + :value="item.value">
  149 + </el-option>
  150 + </el-select>
  151 + </el-form-item>
  152 + </el-col>
  153 + <el-col :span="7">
  154 + <el-form-item label="" :label-width="formLabelWidth" prop="goodstype">
  155 + <!-- <el-input v-model="addForm.goodstype" autocomplete="off" style="width: 300px">-->
  156 + <!-- <template slot="prepend">出入库货物类型</template>-->
  157 + <!-- </el-input>-->
  158 + <el-select v-model="addForm.goodstype" placeholder="请选择出入库货物类型" autocomplete="off" style="width: 300px">
  159 + <el-option
  160 + v-for="item in options"
  161 + :key="item.value"
  162 + :label="item.label"
  163 + :value="item.value">
  164 + </el-option>
  165 + </el-select>
  166 + </el-form-item>
  167 + </el-col>
  168 + <el-col :span="8">
  169 + <el-form-item label="" :label-width="formLabelWidth" prop="ietype">
  170 + <el-select v-model="addForm.ietype" placeholder="出入库类型" size="mini" style="width: 300px">
  171 + <el-option label="出入库类型-进" value="I"></el-option>
  172 + <el-option label="出入库类型-出" value="E"></el-option>
  173 + </el-select>
  174 + </el-form-item>
  175 + </el-col>
  176 + </el-row>
  177 + <el-row>
  178 +
  179 + <el-col :span="8">
  180 + <!-- <el-form-item label="" :label-width="formLabelWidth" prop="status">-->
  181 + <!-- <el-input v-model="addForm.status" autocomplete="off" style="width: 300px">-->
  182 + <!-- <template slot="prepend">状&emsp;&emsp;态</template>-->
  183 + <!-- </el-input>-->
  184 + <!-- </el-form-item>-->
  185 +<!-- <el-form-item label="" :label-width="formLabelWidth" prop="status">-->
  186 +<!-- <el-select v-model="addForm.status" placeholder="请选择状态" size="mini" style="width: 300px">-->
  187 +<!-- <el-option label="状态-失败" value="0"></el-option>-->
  188 +<!-- <el-option label="状态-成功" value="1"></el-option>-->
  189 +<!-- </el-select>-->
  190 +<!-- </el-form-item>-->
  191 + </el-col>
  192 + </el-row>
  193 +<!-- <el-row>
  194 + <el-col :span="7">
  195 + <el-form-item label="" :label-width="formLabelWidth" prop="custel">
  196 + <el-input v-model="addForm.custel" autocomplete="off" style="width: 300px">
  197 + <template slot="prepend">出入库客户联系电话</template>
  198 + </el-input>
  199 + </el-form-item>
  200 + </el-col>
  201 + <el-col :span="10">
  202 + <el-form-item label="" :label-width="formLabelWidth" prop="customer">
  203 + <el-input v-model="addForm.customer" autocomplete="off" style="width: 300px">
  204 + <template slot="prepend">出入库客户联系人姓名</template>
  205 + </el-input>
  206 + </el-form-item>
  207 + </el-col>
  208 + </el-row>-->
  209 + </el-form>
  210 + <div slot="footer" class="dialog-footer">
  211 + <el-button @click="apply_dialog.addDialog = false" >取 消</el-button>
  212 + <el-button type="primary" @click="dialogApply==='create'?add():edit()" >提 交</el-button>
  213 + </div>
  214 + </el-row>
4 <!-- 搜索区域--> 215 <!-- 搜索区域-->
5 <el-row :gutter="10" class="toolbar"> 216 <el-row :gutter="10" class="toolbar">
6 <el-col :span="7"> 217 <el-col :span="7">
7 - <el-input v-model="queryInfo.waybill" prefix-icon="el-icon-search" size="small" style="width: 280px" 218 + <el-input v-model="queryInfo.waybill" prefix-icon="el-icon-search" style="width: 280px"
8 placeholder="货物单号" clearable> 219 placeholder="货物单号" clearable>
9 <template slot="prepend">货物单号</template> 220 <template slot="prepend">货物单号</template>
10 </el-input> 221 </el-input>
11 </el-col> 222 </el-col>
12 - <el-col :span="6">  
13 - <el-button type="primary" icon="el-icon-search" size="small" @click="getList()"> 223 + <el-col :span="8">
  224 + <el-button type="primary" icon="el-icon-search" @click="getList()">
14 查询 225 查询
15 </el-button> 226 </el-button>
16 - <el-button type="success" icon="el-icon-edit" size="small" @click="applyAdd()">新增</el-button> 227 + <el-button type="success" icon="el-icon-edit" @click="applyAdd()">直接入库</el-button>
  228 + <el-button type="success" icon="el-icon-edit" @click="applyAdd()">批量入库</el-button>
17 </el-col> 229 </el-col>
18 </el-row> 230 </el-row>
19 <!-- 列表区域--> 231 <!-- 列表区域-->
20 <el-row> 232 <el-row>
21 - <template>  
22 - <el-table 233 + <el-table
23 :data="tableData" 234 :data="tableData"
24 border 235 border
25 :cell-style="{textAlign:'center'}" 236 :cell-style="{textAlign:'center'}"
26 style="border-radius: 10px 10px 0px 0px;line-height: 25px" 237 style="border-radius: 10px 10px 0px 0px;line-height: 25px"
27 - :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small" 238 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
28 > 239 >
29 <el-table-column 240 <el-table-column
30 fixed 241 fixed
@@ -145,7 +356,6 @@ @@ -145,7 +356,6 @@
145 </template> 356 </template>
146 </el-table-column> 357 </el-table-column>
147 </el-table> 358 </el-table>
148 - </template>  
149 </el-row> 359 </el-row>
150 <el-row style="margin-top: 10px" class="toolbar"> 360 <el-row style="margin-top: 10px" class="toolbar">
151 <el-pagination 361 <el-pagination
@@ -158,208 +368,15 @@ @@ -158,208 +368,15 @@
158 :total="total"> 368 :total="total">
159 </el-pagination> 369 </el-pagination>
160 </el-row> 370 </el-row>
161 - <el-row>  
162 - <el-dialog :title="dialogMap[dialogApply]" :visible.sync="apply_dialog.addDialog" width="80%" >  
163 - <el-form :model="addForm" :rules="rules" ref="addForm" style="margin-top: 40px">  
164 - <el-row>  
165 - <el-col :span="7">  
166 - <el-form-item label="" :label-width="formLabelWidth" prop="waybill">  
167 - <el-input v-model="addForm.waybill" autocomplete="off" size="small" style="width: 300px">  
168 - <template slot="prepend">货物单号</template>  
169 - </el-input>  
170 - </el-form-item>  
171 - </el-col>  
172 - <el-col :span="8">  
173 - <el-form-item label="" :label-width="formLabelWidth" prop="weight">  
174 - <el-input v-model="addForm.weight" autocomplete="off" size="small" style="width: 300px">  
175 - <template slot="prepend">重&emsp;&emsp;量</template>  
176 - </el-input>  
177 - </el-form-item>  
178 - </el-col>  
179 - <el-col :span="8">  
180 - <el-form-item label="" :label-width="formLabelWidth" prop="vol">  
181 - <el-input v-model="addForm.vol" autocomplete="off" size="small" style="width: 300px">  
182 - <template slot="prepend">体&emsp;&emsp;积</template>  
183 - </el-input>  
184 - </el-form-item>  
185 - </el-col>  
186 - </el-row>  
187 - <el-row>  
188 - <el-col :span="7">  
189 - <el-form-item label="" :label-width="formLabelWidth" prop="pcs">  
190 - <el-input v-model="addForm.pcs" autocomplete="off" size="small" style="width: 300px">  
191 - <template slot="prepend">件&emsp;&emsp;数</template>  
192 - </el-input>  
193 - </el-form-item>  
194 - </el-col>  
195 - <el-col :span="8">  
196 - <el-form-item label="" :label-width="formLabelWidth" prop="billweight">  
197 - <el-input v-model="addForm.billweight" autocomplete="off" size="small" style="width: 300px">  
198 - <template slot="prepend">计费重量</template>  
199 - </el-input>  
200 - </el-form-item>  
201 - </el-col>  
202 - <el-col :span="8">  
203 - <el-form-item label="" :label-width="formLabelWidth" prop="area">  
204 - <el-input v-model="addForm.area" autocomplete="off" size="small" style="width: 300px">  
205 - <template slot="prepend">库&emsp;&emsp;区</template>  
206 - </el-input>  
207 - </el-form-item>  
208 - </el-col>  
209 - </el-row>  
210 - <el-row>  
211 - <el-col :span="7">  
212 - <el-form-item label="" :label-width="formLabelWidth" prop="location">  
213 - <el-input v-model="addForm.location" autocomplete="off" size="small" style="width: 300px">  
214 - <template slot="prepend">库&emsp;&emsp;位</template>  
215 - </el-input>  
216 - </el-form-item>  
217 - </el-col>  
218 - <el-col :span="8">  
219 - <el-form-item label="" :label-width="formLabelWidth" prop="serialnumber">  
220 - <el-input v-model="addForm.serialnumber" autocomplete="off" size="small" style="width: 300px">  
221 - <template slot="prepend">流水&emsp;号</template>  
222 - </el-input>  
223 - </el-form-item>  
224 - </el-col>  
225 - <el-col :span="8">  
226 - <el-form-item label="" :label-width="formLabelWidth" prop="transtype">  
227 -<!-- <el-input v-model="addForm.transtype" autocomplete="off" size="small" style="width: 300px">-->  
228 -<!-- <template slot="prepend">交易类型</template>-->  
229 -<!-- </el-input>-->  
230 - <el-select v-model="addForm.transtype" placeholder="请选择交易类型" autocomplete="off" size="small" style="width: 300px">  
231 - <el-option  
232 - v-for="item in options1"  
233 - :key="item.value"  
234 - :label="item.label"  
235 - :value="item.value">  
236 - </el-option>  
237 - </el-select>  
238 - </el-form-item>  
239 - </el-col>  
240 - </el-row>  
241 - <el-row>  
242 - <el-col :span="7">  
243 - <el-form-item label="" :label-width="formLabelWidth" prop="house">  
244 - <el-input v-model="addForm.house" autocomplete="off" size="small" style="width: 300px">  
245 - <template slot="prepend">出入库仓库</template>  
246 - </el-input>  
247 - </el-form-item>  
248 - </el-col>  
249 - <el-col :span="8">  
250 - <el-form-item label="" :label-width="formLabelWidth" prop="opttime">  
251 -<!-- <el-input v-model="addForm.opttime" autocomplete="off" size="small" style="width: 300px">-->  
252 -<!-- <template slot="prepend">出入库时间</template>-->  
253 -<!-- </el-input>-->  
254 - <el-date-picker  
255 - v-model="addForm.opttime"  
256 - type="datetime" size="mini"  
257 - value-format="yyyy-MM-dd HH:mm:ss"  
258 - format="yyyy-MM-dd HH:mm:ss"  
259 - style="width:300px"  
260 - placeholder="选择出入库时间">  
261 - </el-date-picker>  
262 - </el-form-item>  
263 - </el-col>  
264 -  
265 - <el-col :span="8">  
266 - <el-form-item label="" :label-width="formLabelWidth" prop="station">  
267 - <el-input v-model="addForm.station" autocomplete="off" size="small" style="width: 300px">  
268 - <template slot="prepend">出入库场站</template>  
269 - </el-input>  
270 - </el-form-item>  
271 - </el-col>  
272 - </el-row>  
273 - <el-row>  
274 - <el-col :span="7">  
275 - <el-form-item label="" :label-width="formLabelWidth" prop="transcar">  
276 - <el-input v-model="addForm.transcar" autocomplete="off" size="small" style="width: 300px">  
277 - <template slot="prepend">运输车辆信息</template>  
278 - </el-input>  
279 - </el-form-item>  
280 - </el-col>  
281 - <el-col :span="8">  
282 - <el-form-item label="" :label-width="formLabelWidth" prop="opter">  
283 - <el-input v-model="addForm.opter" autocomplete="off" size="small" style="width: 300px">  
284 - <template slot="prepend">出入库经办人</template>  
285 - </el-input>  
286 - </el-form-item>  
287 - </el-col>  
288 - <el-col :span="8">  
289 - <el-form-item label="" :label-width="formLabelWidth" prop="customername">  
290 - <el-input v-model="addForm.customername" autocomplete="off" size="small" style="width: 300px">  
291 - <template slot="prepend">出入库客户名称</template>  
292 - </el-input>  
293 - </el-form-item>  
294 - </el-col>  
295 - </el-row>  
296 - <el-row>  
297 - <el-col :span="7">  
298 - <el-form-item label="" :label-width="formLabelWidth" prop="goodstype">  
299 - <!-- <el-input v-model="addForm.goodstype" autocomplete="off" size="small" style="width: 300px">-->  
300 - <!-- <template slot="prepend">出入库货物类型</template>-->  
301 - <!-- </el-input>-->  
302 - <el-select v-model="addForm.goodstype" placeholder="请选择出入库货物类型" autocomplete="off" size="small" style="width: 300px">  
303 - <el-option  
304 - v-for="item in options"  
305 - :key="item.value"  
306 - :label="item.label"  
307 - :value="item.value">  
308 - </el-option>  
309 - </el-select>  
310 - </el-form-item>  
311 - </el-col>  
312 - <el-col :span="8">  
313 - <el-form-item label="" :label-width="formLabelWidth" prop="ietype">  
314 - <el-select v-model="addForm.ietype" placeholder="出入库类型" size="mini" style="width: 300px">  
315 - <el-option label="出入库类型-进" value="I"></el-option>  
316 - <el-option label="出入库类型-出" value="E"></el-option>  
317 - </el-select>  
318 - </el-form-item>  
319 - </el-col>  
320 - <el-col :span="8">  
321 - <!-- <el-form-item label="" :label-width="formLabelWidth" prop="status">-->  
322 - <!-- <el-input v-model="addForm.status" autocomplete="off" size="small" style="width: 300px">-->  
323 - <!-- <template slot="prepend">状&emsp;&emsp;态</template>-->  
324 - <!-- </el-input>-->  
325 - <!-- </el-form-item>-->  
326 - <el-form-item label="" :label-width="formLabelWidth" prop="status">  
327 - <el-select v-model="addForm.status" placeholder="请选择状态" size="mini" style="width: 300px">  
328 - <el-option label="状态-失败" value="0"></el-option>  
329 - <el-option label="状态-成功" value="1"></el-option>  
330 - </el-select>  
331 - </el-form-item>  
332 - </el-col>  
333 - </el-row>  
334 - <el-row>  
335 - <el-col :span="7">  
336 - <el-form-item label="" :label-width="formLabelWidth" prop="custel">  
337 - <el-input v-model="addForm.custel" autocomplete="off" size="small" style="width: 300px">  
338 - <template slot="prepend">出入库客户联系电话</template>  
339 - </el-input>  
340 - </el-form-item>  
341 - </el-col>  
342 - <el-col :span="10">  
343 - <el-form-item label="" :label-width="formLabelWidth" prop="customer">  
344 - <el-input v-model="addForm.customer" autocomplete="off" size="small" style="width: 300px">  
345 - <template slot="prepend">出入库客户联系人姓名</template>  
346 - </el-input>  
347 - </el-form-item>  
348 - </el-col>  
349 - </el-row>  
350 - </el-form>  
351 - <div slot="footer" class="dialog-footer">  
352 - <el-button @click="apply_dialog.addDialog = false" size="small">取 消</el-button>  
353 - <el-button type="primary" @click="dialogApply==='create'?add():edit()" size="small">提 交</el-button>  
354 - </div>  
355 - </el-dialog>  
356 - </el-row>  
357 </el-card> 371 </el-card>
358 </el-row> 372 </el-row>
359 </template> 373 </template>
360 374
361 <script> 375 <script>
362 import {selectInventroyrecords,delInventoryrecord,addInventoryrecord,ediInventroyrecord} from '../../api/consigner/station'; 376 import {selectInventroyrecords,delInventoryrecord,addInventoryrecord,ediInventroyrecord} from '../../api/consigner/station';
  377 + import dateUtil from "@/utils/index"
  378 + import jsutil from "@/common/js/util";
  379 + import {mapActions, mapGetters} from 'vuex'
363 380
364 export default { 381 export default {
365 name: "inventroyrecord", 382 name: "inventroyrecord",
@@ -391,9 +408,9 @@ @@ -391,9 +408,9 @@
391 custel: '', 408 custel: '',
392 customer: '', 409 customer: '',
393 customername: '', 410 customername: '',
394 - goodstype: '', 411 + goodstype: '运单',
395 house:'', 412 house:'',
396 - ietype:'', 413 + ietype:'I',
397 location:'', 414 location:'',
398 opter:'', 415 opter:'',
399 opttime: '', 416 opttime: '',
@@ -402,7 +419,7 @@ @@ -402,7 +419,7 @@
402 station: '', 419 station: '',
403 status: '', 420 status: '',
404 transcar: '', 421 transcar: '',
405 - transtype:'', 422 + transtype:'销售入库',
406 vol:'', 423 vol:'',
407 waybill:'', 424 waybill:'',
408 weight:'', 425 weight:'',
@@ -433,25 +450,27 @@ @@ -433,25 +450,27 @@
433 value: '销售入库', 450 value: '销售入库',
434 label: '交易类型-销售入库' 451 label: '交易类型-销售入库'
435 }], 452 }],
436 - formLabelWidth: '80px', 453 + formLabelWidth: '5px',
437 rules: { 454 rules: {
438 - userName: [  
439 - // { required: true, message: '请输入申请人', trigger: 'blur' },  
440 - // // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }  
441 - // ],  
442 - // applyTime: [  
443 - // { required: true, message: '请选择时间', trigger: 'change' }  
444 - // ],  
445 - // needCount: [  
446 - // { required: true, message: '请输入需要车辆数量', trigger: 'blur' },  
447 - // ],  
448 - // orginStation: [  
449 - // { required: true, message: '请输入起始场站', trigger: 'blur' },  
450 - // ],  
451 - // endStation: [  
452 - // { required: true, message: '请输入目的场站', trigger: 'blur' },  
453 - // ], 455 + pcs: [
  456 + { required: true, message: '件数必填', trigger: 'blur' },
  457 + { type:"number", message: '件数必须为整数'}
  458 + ],
  459 + weight: [
  460 + { required: true, message: '重量为必填项', trigger: 'blur' },
  461 + // eslint-disable-next-line no-useless-escape
  462 + { pattern: /^([0-9]+)(\.\d{2})?$/, message: '只允许输入数字与小数,支持到小数点后两位' }
  463 + ],
  464 + billweight: [
  465 + { required: true, message: '计费重量为必填项', trigger: 'blur' },
  466 + { pattern: /^([0-9]+)(\.\d{2})?$/, message: '只允许输入数字与小数,支持到小数点后两位' }
  467 + ],
  468 + orginStation: [
  469 + { required: true, message: '请输入起始场站', trigger: 'blur' },
454 ], 470 ],
  471 + endStation: [
  472 + { required: true, message: '请输入目的场站', trigger: 'blur' },
  473 + ]
455 }, 474 },
456 } 475 }
457 }, 476 },
@@ -587,12 +606,26 @@ @@ -587,12 +606,26 @@
587 }).catch(() => { 606 }).catch(() => {
588 }) 607 })
589 }, 608 },
  609 + serialNumber:()=>{
  610 + let serialDate= new Date();
  611 + let serialCode = serialDate.format("yyyyMMddhhmmssS")
  612 + return serialCode
  613 + }
590 }, 614 },
591 mounted() { 615 mounted() {
592 - this.getList();  
593 - // this.getYardList(); 616 + // this.getList();
  617 + this.addForm.serialnumber = this.serialNumber()
  618 + if (!jsutil.checkNull(this.getUserInfoStore) && !jsutil.checkNull(this.getUserInfoStore.username)){
  619 + this.$message.error("获取用户信息出错")
  620 + }else{
  621 + this.addForm.opter = this.getUserInfoStore.username
  622 + }
  623 +
  624 + },
  625 + computed: {
  626 + ...mapGetters(['getUserInfoStore','getUserMenuStore']) // 动态计算属性，相当于this.$store.getters.resturantName
  627 + },
594 628
595 - }  
596 629
597 } 630 }
598 </script> 631 </script>
@@ -604,8 +637,25 @@ @@ -604,8 +637,25 @@
604 /*line-height: 60px;*/ 637 /*line-height: 60px;*/
605 vertical-align: middle; 638 vertical-align: middle;
606 border-radius: 5px 5px 5px 5px; 639 border-radius: 5px 5px 5px 5px;
607 - padding: 15px 0 0 20px; 640 + padding: 10px 10px 0 10px;
608 box-shadow: 0px 5px 5px #e5e8eb; 641 box-shadow: 0px 5px 5px #e5e8eb;
609 } 642 }
  643 +
  644 + .my-text-area .prepand{
  645 + float: left;
  646 + width:89px;
  647 + height: 28px;
  648 + font-size: 12px;
  649 + line-height: 28px;
  650 + }
610 </style> 651 </style>
  652 +<style>
  653 + .my-text-area .el-textarea__inner{
  654 + min-height: 28px;
  655 + height: 28px;
  656 + border-bottom-left-radius: 0;
  657 + border-top-left-radius: 0;
  658 + }
  659 +</style>
  660 +
611 661