入库

src/views/equipment/income.vue

@@ -21,15 +21,15 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item style="flex-basis: 50%;" >
+          <el-form-item style="flex-basis: 50%;">
             <el-button ref="input4" type="primary" @click="handleConfirm">确认</el-button>
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
     <div style="width: 82%; margin-left: 80px; padding-left: 8.6%;">
-      <el-table border :data="tableData" :gutter="40" >
-        <el-table-column type="index" label="序号" width="50px"/>
+      <el-table border :data="tableData" :gutter="40">
+        <el-table-column type="index" label="序号" width="50px" />
         <el-table-column label="pn" prop="businessId">
           <template slot-scope="scope">
             {{ scope.row.pn || '-' }}
@@ -76,7 +76,7 @@
     <el-form label-width="80px">
       <el-row style="padding-left: 8.6%; padding-top: 1%">
         <el-col :span="12">
-          <el-form-item  style="flex-basis: 50%;" >
+          <el-form-item style="flex-basis: 50%;">
             <el-button type="primary" @click="submitForm">提交</el-button>
           </el-form-item>
         </el-col>
@@ -121,8 +121,7 @@ export default {
           { required: true, message: '请输入位置', trigger: 'blur' },
           { pattern: /^[^[\uD800-\uDFFF]+$/, message: '不能包含表情符号', trigger: 'change' },
           { max: 100, message: '输入长度不能超过100个字符', trigger: 'change' }
-        ],
-        phd: [{ pattern: /^\d+$/, message: '仅能输入整数', trigger: 'change' }]
+        ]
       }
     }
   },
@@ -178,11 +177,10 @@ export default {
           lot,
           phd
         }
+
         if (this.form.index === undefined) {
           if (this.tableData.length) {
             this.tableData.forEach((item, index) => {
-              console.log('item', item)
-              console.log('pn', this.form.pn)
               if (item.pn === this.form.pn) {
                 this.flag = true
                 this.index = index + 1
@@ -190,6 +188,20 @@ export default {
             })
             if (this.flag) {
               this.$message.warning('与第' + this.index + '条pn值重复')
+            } else {
+              if (this.form.phd % 1 !== 0) {
+                this.$message.warning('厚度要为整数')
+              } else {
+                this.tableData.push(newRow)
+                // 清空输入框
+                this.form.pn = ''
+                this.form.lot = ''
+                this.form.phd = ''
+              }
+            }
+          } else {
+            if (this.form.phd % 1 !== 0) {
+              this.$message.warning('厚度为整数')
             } else {
               this.tableData.push(newRow)
               // 清空输入框
@@ -197,12 +209,6 @@ export default {
               this.form.lot = ''
               this.form.phd = ''
             }
-          } else {
-            this.tableData.push(newRow)
-            // 清空输入框
-            this.form.pn = ''
-            this.form.lot = ''
-            this.form.phd = ''
           }
         } else {
           let number = 0
@@ -217,13 +223,17 @@ export default {
           if (flag) {
             this.$message.warning('与第' + number + '条pn值重复')
           } else {
-            this.tableData[this.form.index].pn = this.form.pn
-            this.tableData[this.form.index].lot = this.form.lot
-            this.tableData[this.form.index].phd = this.form.phd
-            this.form.pn = ''
-            this.form.lot = ''
-            this.form.phd = ''
-            this.form.index = undefined
+            if (this.form.phd % 1 !== 0) {
+              this.$message.warning('厚度要为整数')
+            } else {
+              this.tableData[this.form.index].pn = this.form.pn
+              this.tableData[this.form.index].lot = this.form.lot
+              this.tableData[this.form.index].phd = this.form.phd
+              this.form.pn = ''
+              this.form.lot = ''
+              this.form.phd = ''
+              this.form.index = undefined
+            }
           }
         }
       }