申报数据编辑页面bug修复

feiyue.teng
Commit a355dd984abca5db459aa0683a5161f6c0ada6bb a355dd98 1 parent 1d14de6b
Showing 3 changed files with 38 additions and 19 deletions
src/views/customerConfig/dialog.vue
src/views/editReportingData/RowDataEditForm.vue
src/views/editReportingData/index.vue
--- a/src/views/customerConfig/dialog.vue
View file @a355dd9
+++ b/src/views/customerConfig/dialog.vue
View file @a355dd9
@@ -143,7 +143,6 @@
               ></el-input>
             </Formitem>
           </el-col>
-          <!-- DXPID -->
           <el-col :span="8">
             <Formitem label="山电DXPID" prop="qingdaoDanyiUserDxpid" type="edit">
               <el-input
@@ -173,7 +172,6 @@
               ></el-input>
             </Formitem>
           </el-col>
-           <!-- DXPID -->
            <el-col :span="8">
             <Formitem label="山电用户密码" prop="qingdaoUserPassword" type="edit">
               <el-input
@@ -324,13 +322,13 @@
         </div>
         </el-col>
         <el-col :span="8">
-            <Formitem label="证书序列号" prop="dxpid" type="edit">
+            <Formitem label="证书序列号" prop="certificateSerialNumber" type="edit">
               <el-input
                 type="text"
                 class="inputShadow"
-                id="inputInner-edit-dxpid"
+                id="inputInner-edit-certificateSerialNumber"
                 resize="none"
-                v-model="formData.dxpid"
+                v-model="formData.certificateSerialNumber"
                 clearable
                 placeholder=""
               ></el-input>
@@ -403,7 +401,7 @@ export default {
         ecomEntEmail: "",
         ecomEntName: "",
         orderRequester: "",
-        dxpid: "",
+        certificateSerialNumber: "",
         qingdaoKey: "",
         qingdaoUserDxpid: "",
         qingdaoDanyiUserDxpid:"",
@@ -785,7 +783,7 @@ export default {
         ecomEntEmail: "",
         ecomEntName: "",
         orderRequester: "",
-        dxpid: "",
+        certificateSerialNumber: "",
         qingdaoKey: "",
         qingdaoUserDxpid: "",
         qingdaoDanyiUserDxpid:"",
--- a/src/views/editReportingData/RowDataEditForm.vue
View file @a355dd9
+++ b/src/views/editReportingData/RowDataEditForm.vue
View file @a355dd9
@@ -77,7 +77,7 @@
                     <el-col :span="4">
                         <Formitem label="规格型号" prop="model">
                             <el-input
-                                type="textarea"
+                                type="text"
                                 class="inputShadow"
                                 id="inputInner--model"
                                 resize="none"
@@ -156,11 +156,10 @@
                     <el-col :span="4">
                         <Formitem label="数量" prop="qty">
                             <el-input
-                                type="number"
                                 class="inputShadow"
                                 id="inputInner--qty"
                                 resize="none"
-                                v-model="tableRowformData.qty"
+                                v-model.number="tableRowformData.qty"
                                 clearable
                                 placeholder=""
                             ></el-input>
@@ -169,11 +168,10 @@
                     <el-col :span="4">
                         <Formitem label="法定数量" prop="legalQty">
                             <el-input
-                                type="number"
                                 class="inputShadow"
                                 id="inputInner--legalQty"
                                 resize="none"
-                                v-model="tableRowformData.legalQty"
+                                v-model.number="tableRowformData.legalQty"
                                 clearable
                                 placeholder=""
                             ></el-input>
@@ -242,7 +240,7 @@
                     <el-col :span="8">
                         <Formitem label="备注" prop="remark">
                             <el-input
-                                type="textarea"
+                                type="text"
                                 class="inputShadow"
                                 id="inputInner--remark"
                                 resize="none"
@@ -268,6 +266,24 @@
       },
     },
     data() {
+        var checkNegativeNum = (rule, value, callback) => {
+            if (value < 0) {
+              callback(new Error('数值不能为负'));
+            } else {
+             callback();  
+            }
+        };
+        var checkQty = (rule, value, callback) => {
+            if (!Number.isInteger(value)) {
+                callback(new Error('请输入整数值'));
+            } else {
+                if (value < 0) {
+                callback(new Error('数值不能为负'));
+                } else {
+                callback();
+                }
+            }
+        };
       return {
         tableRowformData:{},
         tableRowFormRules:{
@@ -307,22 +323,27 @@
                 { required: true, message: '请选择计量单位', trigger: 'change' }
             ],
             qty: [
-                { required: true, message: '请输入数量', trigger: 'blur' }
+                { required: true, message: '请输入数量', trigger: 'blur' },
+                { validator: checkQty, trigger: 'blur' }
             ],
             legalQty: [
-                { required: true, message: '请输入法定数量', trigger: 'blur' }
+                { required: true, message: '请输入法定数量', trigger: 'blur' },
+                { validator: checkQty, trigger: 'blur' }
             ],
             currency: [
                 { required: true, message: '请选择币制', trigger: 'change' }
             ],
             price: [
-                { required: true, message: '请输入单价', trigger: 'blur' }
+                { required: true, message: '请输入单价', trigger: 'blur' },
+                { validator: checkNegativeNum, trigger: 'blur' }
             ],
             totalPrice: [
-                { required: true, message: '请输入总价', trigger: 'blur' }
+                { required: true, message: '请输入总价', trigger: 'blur' },
+                { validator: checkNegativeNum, trigger: 'blur' }
             ],
             netWeight: [
-                { required: true, message: '请输入净重', trigger: 'blur' }
+                { required: true, message: '请输入净重', trigger: 'blur' },
+                { validator: checkNegativeNum, trigger: 'blur' }
             ],
             remark: [
                 { max: 1000, message: '长度不能超过1000个字符', trigger: 'blur' }
@@ -369,7 +390,7 @@
     }
   }
   .formRowDataOperate{
-    text-align: right;
+    text-align: center;
     padding: 0 20px;
     a{
         color: #007AB7;
--- a/src/views/editReportingData/index.vue
View file @a355dd9
+++ b/src/views/editReportingData/index.vue
View file @a355dd9