Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
feiyue.teng
a355dd98 1 parent 1d14de6b

申报数据编辑页面bug修复

Expand all
Inline Side-by-side
Showing 3 changed files with 38 additions and 19 deletions
...@@ -143,7 +143,6 @@ ...@@ -143,7 +143,6 @@
143 ></el-input> 143 ></el-input>
144 </Formitem> 144 </Formitem>
145 </el-col> 145 </el-col>
146 - <!-- DXPID -->
147 <el-col :span="8"> 146 <el-col :span="8">
148 <Formitem label="山电DXPID" prop="qingdaoDanyiUserDxpid" type="edit"> 147 <Formitem label="山电DXPID" prop="qingdaoDanyiUserDxpid" type="edit">
149 <el-input 148 <el-input
...@@ -173,7 +172,6 @@ ...@@ -173,7 +172,6 @@
173 ></el-input> 172 ></el-input>
174 </Formitem> 173 </Formitem>
175 </el-col> 174 </el-col>
176 - <!-- DXPID -->
177 <el-col :span="8"> 175 <el-col :span="8">
178 <Formitem label="山电用户密码" prop="qingdaoUserPassword" type="edit"> 176 <Formitem label="山电用户密码" prop="qingdaoUserPassword" type="edit">
179 <el-input 177 <el-input
...@@ -324,13 +322,13 @@ ...@@ -324,13 +322,13 @@
324 </div> 322 </div>
325 </el-col> 323 </el-col>
326 <el-col :span="8"> 324 <el-col :span="8">
327 - <Formitem label="证书序列号" prop="dxpid" type="edit"> 325 + <Formitem label="证书序列号" prop="certificateSerialNumber" type="edit">
328 <el-input 326 <el-input
329 type="text" 327 type="text"
330 class="inputShadow" 328 class="inputShadow"
331 - id="inputInner-edit-dxpid" 329 + id="inputInner-edit-certificateSerialNumber"
332 resize="none" 330 resize="none"
333 - v-model="formData.dxpid" 331 + v-model="formData.certificateSerialNumber"
334 clearable 332 clearable
335 placeholder="" 333 placeholder=""
336 ></el-input> 334 ></el-input>
...@@ -403,7 +401,7 @@ export default { ...@@ -403,7 +401,7 @@ export default {
403 ecomEntEmail: "", 401 ecomEntEmail: "",
404 ecomEntName: "", 402 ecomEntName: "",
405 orderRequester: "", 403 orderRequester: "",
406 - dxpid: "", 404 + certificateSerialNumber: "",
407 qingdaoKey: "", 405 qingdaoKey: "",
408 qingdaoUserDxpid: "", 406 qingdaoUserDxpid: "",
409 qingdaoDanyiUserDxpid:"", 407 qingdaoDanyiUserDxpid:"",
...@@ -785,7 +783,7 @@ export default { ...@@ -785,7 +783,7 @@ export default {
785 ecomEntEmail: "", 783 ecomEntEmail: "",
786 ecomEntName: "", 784 ecomEntName: "",
787 orderRequester: "", 785 orderRequester: "",
788 - dxpid: "", 786 + certificateSerialNumber: "",
789 qingdaoKey: "", 787 qingdaoKey: "",
790 qingdaoUserDxpid: "", 788 qingdaoUserDxpid: "",
791 qingdaoDanyiUserDxpid:"", 789 qingdaoDanyiUserDxpid:"",
......
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
77 <el-col :span="4"> 77 <el-col :span="4">
78 <Formitem label="规格型号" prop="model"> 78 <Formitem label="规格型号" prop="model">
79 <el-input 79 <el-input
80 - type="textarea" 80 + type="text"
81 class="inputShadow" 81 class="inputShadow"
82 id="inputInner--model" 82 id="inputInner--model"
83 resize="none" 83 resize="none"
...@@ -156,11 +156,10 @@ ...@@ -156,11 +156,10 @@
156 <el-col :span="4"> 156 <el-col :span="4">
157 <Formitem label="数量" prop="qty"> 157 <Formitem label="数量" prop="qty">
158 <el-input 158 <el-input
159 - type="number"
160 class="inputShadow" 159 class="inputShadow"
161 id="inputInner--qty" 160 id="inputInner--qty"
162 resize="none" 161 resize="none"
163 - v-model="tableRowformData.qty" 162 + v-model.number="tableRowformData.qty"
164 clearable 163 clearable
165 placeholder="" 164 placeholder=""
166 ></el-input> 165 ></el-input>
...@@ -169,11 +168,10 @@ ...@@ -169,11 +168,10 @@
169 <el-col :span="4"> 168 <el-col :span="4">
170 <Formitem label="法定数量" prop="legalQty"> 169 <Formitem label="法定数量" prop="legalQty">
171 <el-input 170 <el-input
172 - type="number"
173 class="inputShadow" 171 class="inputShadow"
174 id="inputInner--legalQty" 172 id="inputInner--legalQty"
175 resize="none" 173 resize="none"
176 - v-model="tableRowformData.legalQty" 174 + v-model.number="tableRowformData.legalQty"
177 clearable 175 clearable
178 placeholder="" 176 placeholder=""
179 ></el-input> 177 ></el-input>
...@@ -242,7 +240,7 @@ ...@@ -242,7 +240,7 @@
242 <el-col :span="8"> 240 <el-col :span="8">
243 <Formitem label="备注" prop="remark"> 241 <Formitem label="备注" prop="remark">
244 <el-input 242 <el-input
245 - type="textarea" 243 + type="text"
246 class="inputShadow" 244 class="inputShadow"
247 id="inputInner--remark" 245 id="inputInner--remark"
248 resize="none" 246 resize="none"
...@@ -268,6 +266,24 @@ ...@@ -268,6 +266,24 @@
268 }, 266 },
269 }, 267 },
270 data() { 268 data() {
269 + var checkNegativeNum = (rule, value, callback) => {
270 + if (value < 0) {
271 + callback(new Error('数值不能为负'));
272 + } else {
273 + callback();
274 + }
275 + };
276 + var checkQty = (rule, value, callback) => {
277 + if (!Number.isInteger(value)) {
278 + callback(new Error('请输入整数值'));
279 + } else {
280 + if (value < 0) {
281 + callback(new Error('数值不能为负'));
282 + } else {
283 + callback();
284 + }
285 + }
286 + };
271 return { 287 return {
272 tableRowformData:{}, 288 tableRowformData:{},
273 tableRowFormRules:{ 289 tableRowFormRules:{
...@@ -307,22 +323,27 @@ ...@@ -307,22 +323,27 @@
307 { required: true, message: '请选择计量单位', trigger: 'change' } 323 { required: true, message: '请选择计量单位', trigger: 'change' }
308 ], 324 ],
309 qty: [ 325 qty: [
310 - { required: true, message: '请输入数量', trigger: 'blur' } 326 + { required: true, message: '请输入数量', trigger: 'blur' },
327 + { validator: checkQty, trigger: 'blur' }
311 ], 328 ],
312 legalQty: [ 329 legalQty: [
313 - { required: true, message: '请输入法定数量', trigger: 'blur' } 330 + { required: true, message: '请输入法定数量', trigger: 'blur' },
331 + { validator: checkQty, trigger: 'blur' }
314 ], 332 ],
315 currency: [ 333 currency: [
316 { required: true, message: '请选择币制', trigger: 'change' } 334 { required: true, message: '请选择币制', trigger: 'change' }
317 ], 335 ],
318 price: [ 336 price: [
319 - { required: true, message: '请输入单价', trigger: 'blur' } 337 + { required: true, message: '请输入单价', trigger: 'blur' },
338 + { validator: checkNegativeNum, trigger: 'blur' }
320 ], 339 ],
321 totalPrice: [ 340 totalPrice: [
322 - { required: true, message: '请输入总价', trigger: 'blur' } 341 + { required: true, message: '请输入总价', trigger: 'blur' },
342 + { validator: checkNegativeNum, trigger: 'blur' }
323 ], 343 ],
324 netWeight: [ 344 netWeight: [
325 - { required: true, message: '请输入净重', trigger: 'blur' } 345 + { required: true, message: '请输入净重', trigger: 'blur' },
346 + { validator: checkNegativeNum, trigger: 'blur' }
326 ], 347 ],
327 remark: [ 348 remark: [
328 { max: 1000, message: '长度不能超过1000个字符', trigger: 'blur' } 349 { max: 1000, message: '长度不能超过1000个字符', trigger: 'blur' }
...@@ -369,7 +390,7 @@ ...@@ -369,7 +390,7 @@
369 } 390 }
370 } 391 }
371 .formRowDataOperate{ 392 .formRowDataOperate{
372 - text-align: right; 393 + text-align: center;
373 padding: 0 20px; 394 padding: 0 20px;
374 a{ 395 a{
375 color: #007AB7; 396 color: #007AB7;
......
This diff is collapsed. Click to expand it.