fix:优化齐套性

imcs-ui/src/api/runManageCenter/orderMgr.js

@@ -118,6 +118,10 @@ const apiList = {
     method: 'POST',
     url: `/authority/toolManagement/toolCheck`
   },
+  checkToolTask: {
+    method: 'POST',
+    url: `/authority/cuttingToolApply/checkToolTask`
+  },
   saveToolTask: {
     method: 'POST',
     url: `/authority/toolTask/saveToolTask`
@@ -314,6 +318,12 @@ export default {
       data
     })
   },
+  checkToolTask (data) {
+    return axiosApi({
+      ...apiList.checkToolTask,
+      data
+    })
+  },
   saveToolTask (data) {
     return axiosApi({
       ...apiList.saveToolTask,

imcs-ui/src/views/zuihou/prepareProductMgr/cuttingToolMgr/components/customizeCuttingTool/components/Edit.vue

@@ -41,18 +41,16 @@
               <span style="float:left; width: 30%;font-size: 16px">{{ item.describe }}</span>
             </el-option>
       	</el-select>
-        
+      </el-form-item>
+      <!-- 刀位号 -->
+      <el-form-item :label='$t("cuttingTool.form.customizeCuttingtool.cutterNo")+"："' prop="cutterNo">
+      	<el-input-number v-model="customizeCuttingTool.cutterNo" :min="0"></el-input-number>
       </el-form-item>      
       <el-form-item  :label='$t("cuttingTool.form.customizeCuttingtool.deviceId")+"："' prop="deviceId" >        
       	<el-select v-model="customizeCuttingTool.deviceId" :placeholder='$t("common.pleaseSelect")' style="width: 50%;" >
           <el-option :key="item.name" :label="item.name" :value="item.id" v-for="(item, index) in deviceData.records" />
       	</el-select>
       </el-form-item>
-      <!-- 刀位号 -->
-      <el-form-item :label='$t("cuttingTool.form.customizeCuttingtool.cutterNo")+"："' prop="cutterNo">
-      	<el-input-number v-model="customizeCuttingTool.cutterNo" :min="0"></el-input-number>
-      </el-form-item>
-
       <el-form-item :label='$t("cuttingTool.form.customizeCuttingtool.cuttingToolPicture")+"："' prop="cuttingToolPicture">
         <el-upload
           class="upload-demo"
@@ -288,7 +286,7 @@ export default {
         },
         deviceId: '',
         resourceIdList: [],
-        cutterNo: 1,
+        cutterNo: 0,
         cuttingToolPicture: '',
         cuttingToolInstallPicture: '',
         remark: '',

imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/runningOrder/changeToolTask/Index.vue

@@ -58,8 +58,8 @@
               <el-table-column prop="toolUsedCount" :label='"刀具使用次数"' :show-overflow-tooltip="true" ></el-table-column>
               <el-table-column prop="checkLock" :label='"待装刀具"' align="center" width="90px">
                 <template slot-scope="{ row }">
-                  <el-tag :type="(row.deviceId != '0') ? 'success' : 'danger'">
-                  {{ (row.deviceId != '0') ? $t("common.no") : $t("common.yes") }}
+                  <el-tag :type="(row.deviceId != null) ? 'success' : 'danger'">
+                  {{ (row.deviceId != null) ? $t("common.no") : $t("common.yes") }}
                   </el-tag>
                 </template>
               </el-table-column>

imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/runningOrder/components/checkCuttingTools/index.vue

@@ -131,12 +131,29 @@
           this.fetch(this.planId)
       },
       save(){
-        orderMgrApi.saveToolTask(this.tableData).then(response => {
-          const res = response.data
-          if(res.isSuccess){
-            this.$emit('close');
-          }
-        }).finally(() => this.loading = false)
+        let that = this
+        orderMgrApi.checkToolTask({planId:this.tableData[0].planId}).then(response=> {
+           const res = response.data
+           if(res.isSuccess){             
+             if(!res.data){
+              orderMgrApi.saveToolTask(that.tableData).then(response => {
+                const res = response.data
+                if(res.isSuccess){
+                    this.$emit('close');
+                }
+                }).finally(() => this.loading = false)
+             }else{
+              this.$message({
+	              message: '任务已保存，请勿重复提交 ',
+	              type: "warning"
+	            })
+             }
+            
+           }
+
+        })
+        /* 
+         */
       }
 	  }
 	}