pd 1.0

src/views/setup/warehousing.vue

@@ -102,7 +102,8 @@ export default {
           { pattern: /^.*,.*/ | /^.*$/, message: '输入值不符合格式要求，请重新输入', trigger: 'blur' }
         ],
         qty: [{ validator: this.validatorQty, trigger: 'blur' }],
-        value2: [{ pattern: /^[^,]+,[\d{4}\/\d{2}\/\d{2},[1-9]\d*],[^,]+,[^,]+$/, message: '输入值不符合格式要求，请重新输入', trigger: 'blur' }]
+        // value2: [{ pattern: /^[^,]+,[^,]+,\d{4}\/\d{2}\/\d{2},[1-9]\d*,\d+$/, message: '输入值不符合格式要求，请重新输入', trigger: 'blur' }]
+        value2: [{ pattern: /^[^,]+,[^,]+,\d{4}\/\d{2}\/\d{2},[1-9]\d*,[^,]+/, message: '输入值不符合格式要求，请重新输入', trigger: 'blur' }]
       }
     }
   },
@@ -309,48 +310,51 @@ export default {
         unit: values[4],
         cj_name: values[5]
       }
+      console.log(newObj)
       this.$refs.from.validate(valid => {
         if (valid) {
-          if (this.form.ptype === 30) {
-            if (!values[0] || !values[1] || !values[2] || !values[3] || !values[4]) {
-              this.$message.error({
-                message: '前5个值不能为空，请检查',
-                duration: 2000
-              })
-              this.form.value2 = ''
-            }
+          if (!values[0] && !values[1] && !values[2] && !values[3] && !values[4]) {
+            console.log('1')
+            this.$message.error({
+              message: '前5个值不能为空，请检查',
+              duration: 2000
+            })
+            this.form.value2 = ''
           } else if (this.responsePn && this.responsePn !== '' && this.responsePn !== undefined) {
-            if (this.obj.pn !== this.responsePn) {
+            if (values[0] !== this.responsePn) {
+              console.log('2')
               this.$message.error({
-                message: '您输入的pn:' + this.obj.pn + '与返回pn:' + this.responsePn + '的不一样',
+                message: '您输入的pn:' + values[0] + '与返回pn:' + this.responsePn + '的不一样',
                 duration: 2000
               })
               this.form.pn = ''
-            }
-          } else {
-            console.log('obj.pn', newObj.pn)
-            console.log('newPn', this.newPn)
-            this.form.qty = this.form.qty * values[3]
-            const newLot = values[1]
-            const tooPn = values[0]
-            console.log('tooPn', tooPn)
-            const item = {
-              qty: this.form.qty,
-              newPn: tooPn,
-              lot: newLot,
-              ...this.form
-            }
-            console.log('pn', item)
-            addIncomeWmsBox(item).then(res => {
-              if (res.code === 200) {
-                this.$message.success('保存成功')
-                this.resetForm()
-                this.getOrderCode()
-                this.$nextTick().then(() => {
-                  this.$refs.input1.focus()
-                })
+            } else {
+              console.log('3')
+              this.form.qty = this.form.qty * values[3]
+              const newLot = values[1]
+              const tooPn = values[0]
+              const item = {
+                qty: this.form.qty,
+                newPn: tooPn,
+                lot: newLot,
+                cheBzq: values[2],
+                cheBz: '',
+                cheUnit: values[4],
+                cheCjName: values[5],
+                ...this.form
               }
-            })
+              console.log('item', item)
+              addIncomeWmsBox(item).then(res => {
+                if (res.code === 200) {
+                  this.$message.success('保存成功')
+                  this.resetForm()
+                  this.getOrderCode()
+                  this.$nextTick().then(() => {
+                    this.$refs.input1.focus()
+                  })
+                }
+              })
+            }
           }
         }
       })