朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 ad91a71115b576d7bee5370ced191700f87a11a3 1 个父辈 0e23854e

必填项识别优化

内嵌 并排对比
正在显示 1 个修改的文件 包含 49 行增加 和 33 行删除
@@ -3,38 +3,52 @@ @@ -3,38 +3,52 @@
3 <el-card style="background-color: #F5F7FA"> 3 <el-card style="background-color: #F5F7FA">
4 <el-row class="toolbar" style="height:auto"> 4 <el-row class="toolbar" style="height:auto">
5 <el-form :model="addForm" :rules="rules" ref="addForm" :inline="true"> 5 <el-form :model="addForm" :rules="rules" ref="addForm" :inline="true">
6 - <el-divider content-position="left"><i class="el-icon-document"></i> 货物信息 <el-tag type="info">流水号: {{addForm.serialnumber}}</el-tag></el-divider> 6 + <el-divider content-position="left"><i class="el-icon-document"></i> 商品 <el-tag>流水号: {{addForm.serialnumber}}</el-tag></el-divider>
  7 + <el-row>
  8 + <el-col :span="6">
  9 + <el-form-item prop="waybill">
  10 + <el-input v-model="addForm.waybill" autocomplete="off" suffix-icon="el-icon-shopping-cart-full" clearable>
  11 + <template slot="prepend">
  12 + &emsp;商品简码
  13 + </template>
  14 + </el-input>
  15 + </el-form-item>
  16 + </el-col>
  17 + </el-row>
  18 + <el-divider content-position="left"><i class="el-icon-document"></i> 货物信息</el-tag></el-divider>
7 <el-row> 19 <el-row>
8 <el-col :span="6" v-if="false"> 20 <el-col :span="6" v-if="false">
9 - <el-form-item label=" " :label-width="formLabelWidth" prop="serialnumber"> 21 + <el-form-item prop="serialnumber">
10 <el-input v-model="addForm.serialnumber" autocomplete="off" suffix-icon="el-icon-files" disabled> 22 <el-input v-model="addForm.serialnumber" autocomplete="off" suffix-icon="el-icon-files" disabled>
11 <template slot="prepend">流&emsp;&emsp;水</template> 23 <template slot="prepend">流&emsp;&emsp;水</template>
12 </el-input> 24 </el-input>
13 </el-form-item> 25 </el-form-item>
14 </el-col> 26 </el-col>
15 <el-col :span="6"> 27 <el-col :span="6">
16 - <el-form-item label=" " :label-width="formLabelWidth" prop="waybill"> 28 + <el-form-item prop="waybill">
17 <el-input v-model="addForm.waybill" autocomplete="off" suffix-icon="el-icon-document" clearable> 29 <el-input v-model="addForm.waybill" autocomplete="off" suffix-icon="el-icon-document" clearable>
18 - <template slot="prepend">主&emsp;&emsp;单</template> 30 + <template slot="prepend">
  31 + 单&emsp;&emsp;&emsp;证
  32 + </template>
19 </el-input> 33 </el-input>
20 </el-form-item> 34 </el-form-item>
21 </el-col> 35 </el-col>
22 <el-col :span="6"> 36 <el-col :span="6">
23 - <el-form-item label=" " :label-width="formLabelWidth" prop="billfhl"> 37 + <el-form-item prop="billfhl">
24 <el-input v-model="addForm.billfhl" autocomplete="off" suffix-icon="el-icon-document" clearable> 38 <el-input v-model="addForm.billfhl" autocomplete="off" suffix-icon="el-icon-document" clearable>
25 - <template slot="prepend">分&emsp;&emsp;单</template> 39 + <template slot="prepend">分&emsp;&emsp;&emsp;单</template>
26 </el-input> 40 </el-input>
27 </el-form-item> 41 </el-form-item>
28 </el-col> 42 </el-col>
29 <el-col :span="6"> 43 <el-col :span="6">
30 - <el-form-item label=" " :label-width="formLabelWidth" prop="totalpcs"> 44 + <el-form-item prop="totalpcs">
31 <el-input v-model.number="addForm.totalpcs" autocomplete="off" suffix-icon="el-icon-files" clearable > 45 <el-input v-model.number="addForm.totalpcs" autocomplete="off" suffix-icon="el-icon-files" clearable >
32 <template slot="prepend">总&nbsp;件&nbsp;数</template> 46 <template slot="prepend">总&nbsp;件&nbsp;数</template>
33 </el-input> 47 </el-input>
34 </el-form-item> 48 </el-form-item>
35 </el-col> 49 </el-col>
36 <el-col :span="6"> 50 <el-col :span="6">
37 - <el-form-item label=" " :label-width="formLabelWidth" prop="totalweight"> 51 + <el-form-item prop="totalweight">
38 <el-input v-model="addForm.totalweight" autocomplete="off" suffix-icon="el-icon-files" clearable> 52 <el-input v-model="addForm.totalweight" autocomplete="off" suffix-icon="el-icon-files" clearable>
39 <template slot="prepend">总&nbsp;重&nbsp;量</template> 53 <template slot="prepend">总&nbsp;重&nbsp;量</template>
40 </el-input> 54 </el-input>
@@ -43,28 +57,30 @@ @@ -43,28 +57,30 @@
43 </el-row> 57 </el-row>
44 <el-row> 58 <el-row>
45 <el-col :span="6"> 59 <el-col :span="6">
46 - <el-form-item label=" " :label-width="formLabelWidth" prop="pcs"> 60 + <el-form-item prop="pcs">
47 <el-input v-model.number="addForm.pcs" autocomplete="off" suffix-icon="el-icon-files" clearable > 61 <el-input v-model.number="addForm.pcs" autocomplete="off" suffix-icon="el-icon-files" clearable >
48 - <template slot="prepend">入库件数</template> 62 + <template slot="prepend">
  63 + <i v-if="rules.hasOwnProperty('pcs')" style="color:red;">*</i> 入库件数
  64 + </template>
49 </el-input> 65 </el-input>
50 </el-form-item> 66 </el-form-item>
51 </el-col> 67 </el-col>
52 <el-col :span="6"> 68 <el-col :span="6">
53 - <el-form-item label=" " :label-width="formLabelWidth" prop="billweight"> 69 + <el-form-item prop="billweight">
54 <el-input v-model="addForm.billweight" autocomplete="off" suffix-icon="el-icon-files" clearable> 70 <el-input v-model="addForm.billweight" autocomplete="off" suffix-icon="el-icon-files" clearable>
55 - <template slot="prepend">入库重量</template> 71 + <template slot="prepend"><i v-if="rules.hasOwnProperty('billweight')" style="color:red;">*</i> 入库重量</template>
56 </el-input> 72 </el-input>
57 </el-form-item> 73 </el-form-item>
58 </el-col> 74 </el-col>
59 <el-col :span="6"> 75 <el-col :span="6">
60 - <el-form-item label=" " :label-width="formLabelWidth" prop="feeweight"> 76 + <el-form-item prop="feeweight">
61 <el-input v-model="addForm.feeweight" autocomplete="off" suffix-icon="el-icon-files" clearable> 77 <el-input v-model="addForm.feeweight" autocomplete="off" suffix-icon="el-icon-files" clearable>
62 <template slot="prepend">计费重量</template> 78 <template slot="prepend">计费重量</template>
63 </el-input> 79 </el-input>
64 </el-form-item> 80 </el-form-item>
65 </el-col> 81 </el-col>
66 <el-col :span="6"> 82 <el-col :span="6">
67 - <el-form-item label=" " :label-width="formLabelWidth" prop="packingid"> 83 + <el-form-item prop="packingid">
68 <el-input v-model="addForm.packingid" autocomplete="off" suffix-icon="el-icon-files" clearable> 84 <el-input v-model="addForm.packingid" autocomplete="off" suffix-icon="el-icon-files" clearable>
69 <template slot="prepend">包裝类型</template> 85 <template slot="prepend">包裝类型</template>
70 </el-input> 86 </el-input>
@@ -90,15 +106,15 @@ @@ -90,15 +106,15 @@
90 </el-row> 106 </el-row>
91 <el-row> 107 <el-row>
92 <el-col :span="6"> 108 <el-col :span="6">
93 - <el-form-item label=" " :label-width="formLabelWidth" prop="goodssize"> 109 + <el-form-item prop="goodssize">
94 <el-tooltip class="item" effect="dark" content="单位:厘米,每行录入一个尺寸信息格式如:1x2x3x4(长x宽x高x件数),回车换行" placement="right"> 110 <el-tooltip class="item" effect="dark" content="单位:厘米,每行录入一个尺寸信息格式如:1x2x3x4(长x宽x高x件数),回车换行" placement="right">
95 <div class="my-text-area"> 111 <div class="my-text-area">
96 - <div class="el-input-group__prepend prepand">尺&emsp;&emsp;寸</div> 112 + <div class="el-input-group__prepend prepand"><i v-if="rules.hasOwnProperty('goodssize')" style="color:red;">*</i> 尺&emsp;&emsp;寸</div>
97 <el-input v-model="goodsSize" 113 <el-input v-model="goodsSize"
98 type="textarea" 114 type="textarea"
99 autosize 115 autosize
100 placeholder="请输入尺寸" 116 placeholder="请输入尺寸"
101 - style="float: left;width:calc(100% - 89px)" 117 + style="float: left;width:calc(100% - 110px)"
102 > 118 >
103 </el-input> 119 </el-input>
104 </div> 120 </div>
@@ -106,28 +122,28 @@ @@ -106,28 +122,28 @@
106 </el-form-item> 122 </el-form-item>
107 </el-col> 123 </el-col>
108 <el-col :span="6"> 124 <el-col :span="6">
109 - <el-form-item label=" " :label-width="formLabelWidth" prop="goodsvol"> 125 + <el-form-item prop="goodsvol">
110 <el-input v-model="addForm.goodsvol" autocomplete="off" suffix-icon="el-icon-files" disabled> 126 <el-input v-model="addForm.goodsvol" autocomplete="off" suffix-icon="el-icon-files" disabled>
111 - <template slot="prepend">入库体积</template> 127 + <template slot="prepend">&emsp;入库体积</template>
112 </el-input> 128 </el-input>
113 </el-form-item> 129 </el-form-item>
114 </el-col> 130 </el-col>
115 <el-col :span="6"> 131 <el-col :span="6">
116 - <el-form-item label=" " :label-width="formLabelWidth" prop="remark4"> 132 + <el-form-item prop="remark4">
117 <el-input v-model="addForm.remark4" autocomplete="off" suffix-icon="el-icon-files" > 133 <el-input v-model="addForm.remark4" autocomplete="off" suffix-icon="el-icon-files" >
118 <template slot="prepend">随货文件</template> 134 <template slot="prepend">随货文件</template>
119 </el-input> 135 </el-input>
120 </el-form-item> 136 </el-form-item>
121 </el-col> 137 </el-col>
122 <el-col :span="6"> 138 <el-col :span="6">
123 - <el-form-item label=" " :label-width="formLabelWidth" prop="remark1"> 139 + <el-form-item prop="remark1">
124 <div class="my-text-area"> 140 <div class="my-text-area">
125 <div class="el-input-group__prepend prepand">备&emsp;&emsp;注</div> 141 <div class="el-input-group__prepend prepand">备&emsp;&emsp;注</div>
126 <el-input v-model="addForm.remark1" 142 <el-input v-model="addForm.remark1"
127 type="textarea" 143 type="textarea"
128 autosize 144 autosize
129 placeholder="备注信息" 145 placeholder="备注信息"
130 - style="float: left;width:calc(100% - 89px)" 146 + style="float: left;width:calc(100% - 110px)"
131 > 147 >
132 </el-input> 148 </el-input>
133 </div> 149 </div>
@@ -137,7 +153,7 @@ @@ -137,7 +153,7 @@
137 <el-divider content-position="left"><i class="el-icon-house"></i> 入库相关</el-divider> 153 <el-divider content-position="left"><i class="el-icon-house"></i> 入库相关</el-divider>
138 <el-row> 154 <el-row>
139 <!-- <el-col :span="6">--> 155 <!-- <el-col :span="6">-->
140 -<!-- <el-form-item label=" " :label-width="formLabelWidth" prop="area">--> 156 +<!-- <el-form-item prop="area">-->
141 <!-- <el-autocomplete--> 157 <!-- <el-autocomplete-->
142 <!-- v-model="addForm.area"--> 158 <!-- v-model="addForm.area"-->
143 <!-- :fetch-suggestions="areaQuerySearch"--> 159 <!-- :fetch-suggestions="areaQuerySearch"-->
@@ -157,7 +173,7 @@ @@ -157,7 +173,7 @@
157 <!-- </el-form-item>--> 173 <!-- </el-form-item>-->
158 <!-- </el-col>--> 174 <!-- </el-col>-->
159 <el-col :span="6"> 175 <el-col :span="6">
160 - <el-form-item label=" " :label-width="formLabelWidth" prop="location"> 176 + <el-form-item prop="location">
161 <el-autocomplete 177 <el-autocomplete
162 v-model="addForm.location" 178 v-model="addForm.location"
163 :fetch-suggestions="locationQuerySearch" 179 :fetch-suggestions="locationQuerySearch"
@@ -168,7 +184,7 @@ @@ -168,7 +184,7 @@
168 highlight-first-item 184 highlight-first-item
169 style="width: 100%" 185 style="width: 100%"
170 > 186 >
171 - <template slot="prepend">库&emsp;&emsp;位</template> 187 + <template slot="prepend"><i v-if="rules.hasOwnProperty('location')" style="color:red;">*</i> 库&emsp;&emsp;位</template>
172 <template slot-scope="{ item }"> 188 <template slot-scope="{ item }">
173 <div class="name" style="float: left">{{ item.locationno }}</div> 189 <div class="name" style="float: left">{{ item.locationno }}</div>
174 <div class="addr" style="float: right">{{ item.locationname }}</div> 190 <div class="addr" style="float: right">{{ item.locationname }}</div>
@@ -177,14 +193,14 @@ @@ -177,14 +193,14 @@
177 </el-form-item> 193 </el-form-item>
178 </el-col> 194 </el-col>
179 <el-col :span="6"> 195 <el-col :span="6">
180 - <el-form-item label=" " :label-width="formLabelWidth" prop="licenseplate"> 196 + <el-form-item prop="licenseplate">
181 <el-input v-model="addForm.licenseplate" autocomplete="off" suffix-icon="el-icon-files" > 197 <el-input v-model="addForm.licenseplate" autocomplete="off" suffix-icon="el-icon-files" >
182 <template slot="prepend">运输车辆</template> 198 <template slot="prepend">运输车辆</template>
183 </el-input> 199 </el-input>
184 </el-form-item> 200 </el-form-item>
185 </el-col> 201 </el-col>
186 <el-col :span="6"> 202 <el-col :span="6">
187 - <el-form-item label=" " :label-width="formLabelWidth" prop="custcode"> 203 + <el-form-item prop="custcode">
188 <el-autocomplete 204 <el-autocomplete
189 v-model="addForm.custcode" 205 v-model="addForm.custcode"
190 :fetch-suggestions="crmQuerySearch" 206 :fetch-suggestions="crmQuerySearch"
@@ -204,7 +220,7 @@ @@ -204,7 +220,7 @@
204 </el-form-item> 220 </el-form-item>
205 </el-col> 221 </el-col>
206 <el-col :span="6"> 222 <el-col :span="6">
207 - <el-form-item label=" " :label-width="formLabelWidth" prop="opter"> 223 + <el-form-item prop="opter">
208 <el-input v-model="addForm.opter" autocomplete="off" disabled suffix-icon="el-icon-files"> 224 <el-input v-model="addForm.opter" autocomplete="off" disabled suffix-icon="el-icon-files">
209 <template slot="prepend">经&nbsp;办&nbsp;人</template> 225 <template slot="prepend">经&nbsp;办&nbsp;人</template>
210 </el-input> 226 </el-input>
@@ -248,7 +264,7 @@ @@ -248,7 +264,7 @@
248 <!-- <el-divider content-position="left"><i class="el-icon-mobile-phone"></i> 业务属性</el-divider>--> 264 <!-- <el-divider content-position="left"><i class="el-icon-mobile-phone"></i> 业务属性</el-divider>-->
249 <!-- <el-row>--> 265 <!-- <el-row>-->
250 <!-- <el-col :span="6">--> 266 <!-- <el-col :span="6">-->
251 -<!-- <el-form-item label=" " :label-width="formLabelWidth" prop="transtype">--> 267 +<!-- <el-form-item prop="transtype">-->
252 <!-- <div class="my-text-area">--> 268 <!-- <div class="my-text-area">-->
253 <!-- <div class="el-input-group__prepend prepand">交易类型</div>--> 269 <!-- <div class="el-input-group__prepend prepand">交易类型</div>-->
254 <!-- <el-select v-model="addForm.transtype" placeholder="请选择交易类型" autocomplete="off">--> 270 <!-- <el-select v-model="addForm.transtype" placeholder="请选择交易类型" autocomplete="off">-->
@@ -263,7 +279,7 @@ @@ -263,7 +279,7 @@
263 <!-- </el-form-item>--> 279 <!-- </el-form-item>-->
264 <!-- </el-col>--> 280 <!-- </el-col>-->
265 <!-- <el-col :span="6">--> 281 <!-- <el-col :span="6">-->
266 -<!-- <el-form-item label=" " :label-width="formLabelWidth" prop="goodstype">--> 282 +<!-- <el-form-item prop="goodstype">-->
267 <!-- <div class="my-text-area">--> 283 <!-- <div class="my-text-area">-->
268 <!-- <div class="el-input-group__prepend prepand">交易类型</div>--> 284 <!-- <div class="el-input-group__prepend prepand">交易类型</div>-->
269 <!-- <el-select v-model="addForm.goodstype" placeholder="请选择出入库货物类型" autocomplete="off">--> 285 <!-- <el-select v-model="addForm.goodstype" placeholder="请选择出入库货物类型" autocomplete="off">-->
@@ -278,7 +294,7 @@ @@ -278,7 +294,7 @@
278 <!-- </el-form-item>--> 294 <!-- </el-form-item>-->
279 <!-- </el-col>--> 295 <!-- </el-col>-->
280 <!-- <el-col :span="8">--> 296 <!-- <el-col :span="8">-->
281 -<!-- <el-form-item label=" " :label-width="formLabelWidth" prop="ietype">--> 297 +<!-- <el-form-item prop="ietype">-->
282 <!-- <div class="my-text-area">--> 298 <!-- <div class="my-text-area">-->
283 <!-- <div class="el-input-group__prepend prepand">交易类型</div>--> 299 <!-- <div class="el-input-group__prepend prepand">交易类型</div>-->
284 <!-- <el-select v-model="addForm.ietype" placeholder="出入库类型" size="mini">--> 300 <!-- <el-select v-model="addForm.ietype" placeholder="出入库类型" size="mini">-->
@@ -292,7 +308,7 @@ @@ -292,7 +308,7 @@
292 <el-divider content-position="left"><i class="el-icon-picture-outline"></i>图像操作</el-divider> 308 <el-divider content-position="left"><i class="el-icon-picture-outline"></i>图像操作</el-divider>
293 <el-row> 309 <el-row>
294 <el-col :span="12"> 310 <el-col :span="12">
295 - <el-form-item label=" " :label-width="formLabelWidth" prop="annex"> 311 + <el-form-item prop="annex">
296 <el-input v-model="addForm.annex" autocomplete="off" suffix-icon="el-icon-document" clearable> 312 <el-input v-model="addForm.annex" autocomplete="off" suffix-icon="el-icon-document" clearable>
297 <template slot="prepend">图片地址</template> 313 <template slot="prepend">图片地址</template>
298 </el-input> 314 </el-input>
@@ -1374,7 +1390,7 @@ @@ -1374,7 +1390,7 @@
1374 1390
1375 .my-text-area .prepand{ 1391 .my-text-area .prepand{
1376 float: left; 1392 float: left;
1377 - width:89px; 1393 + width:110px;
1378 height: 28px; 1394 height: 28px;
1379 font-size: 12px; 1395 font-size: 12px;
1380 line-height: 28px; 1396 line-height: 28px;