fix优化组套关系界面

imcs-ui/src/api/modelingCenter/cutterCategoriesGroup.js

@@ -9,6 +9,10 @@ const apiList = {
     method: 'POST',
     url: `/authority/cutterCategory/pageListByPartNeedCutter`
   },
+  deleteMore: {
+    method: 'POST',
+    url: `/authority/cutterCategory/deleteMore`
+  },
   partNeedCuttersave: {
     method: 'POST',
     url: `/authority/partNeedCuttersave`
@@ -136,6 +140,12 @@ export default {
       data
     })
   },
+  deleteMore (data) {
+    return axiosApi({
+      ...apiList.deleteMore,
+      data
+    })
+  },
   delete (data) {
     return axiosApi({
       ...apiList.remove,

imcs-ui/src/lang/zh/calssSchedule.js

@@ -91,6 +91,7 @@ export default {
 			schedulTips: '删除班表管理数据后，会将班表管理数据全部删除，确认删除？',
 			settingTips: '清除设置班表数据后，会将设置班表人员数据全部清除，确认清除？',
 			settingAllTips: '全部清除设置班表数据后，会将设置班表人员数据全部清除，确认全部清除？',
+			generalTips: '确认清除？',
       shiftChangeTips: '删除人员换班数据后，会将该人员当前换班数据全部删除，确认删除？',
 		}
 	}

imcs-ui/src/lang/zh/cuttingTool.js

@@ -17,8 +17,10 @@ export default {
         resourceStatus: '在线状态',
       },
       customizeCuttingtool: {
+        cuttingToolNo: '刀具号',
         cuttingtoolName: '刀具名称',
         specifications: '刀具规格',
+        cuttingToolType: '刀具类型',
         deviceId: '安装设备',
         status: '状态',
         cutterCode: '刀具编码',

imcs-ui/src/views/zuihou/centralToolMagazine/cutterCategoriesGroup/tab/partNeedGroupCutter/index.vue

@@ -11,6 +11,15 @@
           size="medium"
         />
       </span>
+      <span>
+        <span>刀具号：</span>
+        <el-input
+          v-model="queryParams.model.cutterT"
+          :placeholder="$t('common.pleaseEnter')"
+          style="width: 150px"
+          size="medium"
+        />
+      </span>
       <span>
         <span>刀具名：</span>
         <el-input
@@ -116,13 +125,20 @@
         width="80px"
       >
         <template slot-scope="{ row }">
-          <el-tooltip  class="item" content='修改' effect="dark" placement="top-start" v-if=" row.dkPointId!=null || row.jcPointId!=null" >
+          <el-tooltip  class="item" content='位置管理' effect="dark" placement="top-start" v-if=" row.dkPointId!=null || row.jcPointId!=null" >
             <i
-              class="el-icon-edit table-operation"
+              class="el-icon-location-information table-operation"
               style="color: #2db7f5;"
               @click="edit(row)"
             />
           </el-tooltip>
+          <el-tooltip  class="item" content='删除' effect="dark" placement="top-start" >
+            <i
+              class="el-icon-delete table-operation"
+              style="color:crimson;"
+              @click="singleDelete(row)"
+            />
+          </el-tooltip>
         </template>
       </el-table-column>
     </el-table>
@@ -565,7 +581,7 @@
 	        return
 	      }
 
-	      this.$confirm(this.$t("calssSchedule.tips.schedulTips"), this.$t("common.tips"), {
+	      this.$confirm(this.$t("calssSchedule.tips.generalTips"), this.$t("common.tips"), {
 	      	distinguishCancelAndClose: true,
 	        confirmButtonText: this.$t("common.confirm"),
 	        cancelButtonText: this.$t("common.cancel"),
@@ -594,7 +610,8 @@
 	      this.$refs.table.clearSelection()
 	    },
 	    delete (ids) {
-	      classScheduleMgrApi.remove({ ids: ids }).then(response => {
+		  console.log("删除");
+	      classScheduleMgrApi.deleteMore({ ids: ids }).then(response => {
 	        const res = response.data
 	        if (res.isSuccess) {
 	          this.$message({

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

@@ -2,14 +2,32 @@
 	<div class="app-container">
 		  <!-- 搜索模块 -->
 	  <div class="filter-container">
+		  <span>
+			  <span>{{$t("cuttingTool.searchForm.customizeCuttingtool.cuttingToolNo")}}：</span>
+			  <el-input v-model="queryParams.model.cuttingToolNo" :placeholder='$t("common.pleaseEnter")' style="width: 160px;" size="medium"/>
+		  </span>
 		  <span>
 			  <span>{{$t("cuttingTool.searchForm.customizeCuttingtool.cuttingtoolName")}}：</span>
-			  <el-input v-model="queryParams.model.cuttingToolName" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
+			  <el-input v-model="queryParams.model.cuttingToolName" :placeholder='$t("common.pleaseEnter")' style="width: 160px;" size="medium"/>
 		  </span>
-		  <span style="margin-left: 15px;">
+		  <!-- <span style="margin-left: 15px;">
 			  <span>{{$t("cuttingTool.searchForm.customizeCuttingtool.specifications")}}：</span>
 			  <el-input v-model="queryParams.model.specifications" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
+		  </span> -->
+		  <span style="margin-left: 15px;">
+			  <span>{{$t("cuttingTool.searchForm.customizeCuttingtool.cuttingToolType")}}：</span>
+			  <el-select v-model="queryParams.model.cuttingToolType.key" clearable :placeholder='$t("common.pleaseSelect")' style="width: 160px;">
+				<el-option
+					v-for="item in dicts.CUTTING_TOOL_TYPE"
+					:key="item.code"
+					:label="item.name"
+					:value="item.code"
+					:disabled="item.disabled">
+					<span style="float:left;font-size: 16px">{{ item.name }}</span>
+					</el-option>
+				</el-select>
 		  </span>
+
   <!--		<span style="margin-left: 15px;">
 			  <span>{{$t("cuttingTool.searchForm.customizeCuttingtool.deviceId")}}：</span>
 			  <el-select v-model="queryParams.model.deviceId" :placeholder='$t("common.pleaseSelect")' style="width: 150px;">