报工数量和刀模版

common/http.api.js

@@ -475,6 +475,8 @@ const install = (Vue, vm) => {
           vm.$u.postJson(config.adminPath + '/tm/tmToolMachines', params),
         tmToolMachinesRecord: (params = {}) =>
           vm.$u.putJson(config.adminPath + '/tm/tmToolMachines', params),
+        checkIsExsitToolWindow: (params = {}) =>
+          vm.$u.postJson(config.adminPath + '/tm/tmToolMachines/checkIsExsitToolWindow', params),
         tmToolMachinesScancode: (params = {}) =>
           vm.$u.postJson(
             config.adminPath + '/tm/tmToolMachines/scancode',

pages/mes/prodReport/components/editFeeding.vue

@@ -176,7 +176,7 @@ export default {
           width: 120
         },
         {
-          name: 'feedbackTime',
+          name: 'quantityQualify',
           label: '报工数量',
           width: 100,
           type: 'slot',

pages/mes/prodReport/index.vue

@@ -1544,14 +1544,50 @@ export default {
       this.getPemissionScan();
     },
     handleUpdateKnifeTemp(code) {
-      console.log({ type: this.knifeTempType, sn: code, taskWorkunitId: this.tableSelectData[0].taskWorkunitId }, code, 'code---handleUpdateKnifeTemp');
-      this.$u.api.dModel.tmToolMachinesScancode({ type: this.knifeTempType, sn: code, taskWorkunitId: this.tableSelectData[0].taskWorkunitId }).then((res) => {
+      console.log('isExsitTool', this.knifeTempType, this.tableSelectData[0].isExsitTool)
+
+      if (this.knifeTempType === '1') {
+        if(this.tableSelectData[0].isExsitTool) {
+          this.$u.api.dModel.checkIsExsitToolWindow({ type: this.knifeTempType, sn: code, taskWorkunitId: this.tableSelectData[0].taskWorkunitId }).then((res) => {
+            if (res.code === 200) {
+              if (res.data) {
+                uni.showModal({
+                  title: '系统提示',
+                  content: '是否新增刀模版和产品工序的关联?',
+                  success:  (res) => {
+                    if (res.confirm) {
+                      this.confirmKnifeTemp(code)
+                    } else {
+                      this.$u.toast("刀模版SN不一致")
+                    }
+                  }
+                })
+              } else {
+                this.confirmKnifeTemp(code)
+              }
+            } else {
+              this.$u.toast(res.msg)
+            }
+          })
+        } else {
+          this.confirmKnifeTemp(code)
+        }
+      } else {
+        this.confirmKnifeTemp(code)
+      }
+    },
+    confirmKnifeTemp(code) {
+      const params = { type: this.knifeTempType, sn: code, taskWorkunitId: this.tableSelectData[0].taskWorkunitId }
+      if (this.knifeTempType === '1') {
+        params['isExsitTool'] = this.tableSelectData[0].isExsitTool
+      }
+      this.$u.api.dModel.tmToolMachinesScancode(params).then((res) => {
         console.log(res, 'res333');
         if (res.code === 200) {
           this.$u.toast(this.knifeTempType === '1' ? '上机成功' : '下机成功');
           this.upDownGetList();
         }
-      });
+      })
     },
     handleChangeTabPro(index, row) {
       row.currentTabPro = index;