代码更新

mes/qd/src/views/wms/ql/physicalMst/Dialog1.vue

@@ -475,12 +475,14 @@ export default {
       const data = this.form1.tableData
       var flag = 0
       for (var row of data) {
-        if (!row.value) {
-          flag = flag + 1
+        if (row.up_limit !== '') {
+          if (!row.value) {
+            flag = flag + 1
+          }
         }
       }
-      // 如果检测值一项都没填则提示是否继续
-      if (flag === data.length) {
+      // 如果检测值有一项没填则提示是否继续 （在上限下限有值的情况下）
+      if (flag > 0) {
         this.$confirm(msg, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',

mes/qd/src/views/wms/ql/physicalMstConfirm/Dialog1.vue

@@ -481,12 +481,14 @@ export default {
       const data = this.form1.tableData
       var flag = 0
       for (var row of data) {
-        if (!row.value) {
-          flag = flag + 1
+        if (row.up_limit !== '') {
+          if (!row.value) {
+            flag = flag + 1
+          }
         }
       }
-      // 如果检测值一项都没填则提示是否继续
-      if (flag === data.length) {
+      // 如果检测值有一项没填则提示是否继续 （在上限下限有值的情况下）
+      if (flag > 0) {
         this.$confirm(msg, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',

mes/qd/src/views/wms/ql/workprocedureQl/ResultPutDialog.vue

@@ -270,6 +270,39 @@ export default {
     count() {
     },
     sure() {
+      const msg = '是否继续！'
+
+      const rows = this.form.tableData
+      var flag = 0
+      for (var row of rows) {
+        if (row.up_limit !== '') {
+          if (!row.value) {
+            flag = flag + 1
+          }
+        }
+      }
+      const data = this.form
+      if (flag > 0) {
+        this.$confirm(msg, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          crudWorkproceduremst.sure(data).then(res => {
+            this.$emit('update:dialogShow', false)
+            this.crud.toQuery()
+            this.crud.notify('录入成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+          })
+        })
+      } else {
+        crudWorkproceduremst.sure(data).then(res => {
+          this.$emit('update:dialogShow', false)
+          this.crud.toQuery()
+          this.crud.notify('录入成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        })
+      }
+    },
+    sure2() {
       const rows = this.form.tableData
       var flag = 0
       for (var row of rows) {