库位绑定刀柄

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

@@ -60,6 +60,10 @@ const apiList = {
   getRule: {
     method: 'POST',
     url: `/authority/toolHandle/getRule`
+  },
+  pageList: {
+    method: 'POST',
+    url: `/authority/toolHandle/pageList`
   }
 }
 
@@ -167,5 +171,11 @@ export default {
       ...apiList.getRule,
       data
     })
+  },
+  pageList(data) {
+    return axiosApi({
+      ...apiList.pageList,
+      data
+    })
   }
 }

imcs-ui/src/views/zuihou/centralToolMagazine/changeToolTask/Index.vue

@@ -28,7 +28,7 @@
 	  			<!-- 中部-货架小格子 -->
 	  			<table class="contentDiv" border="0" cellspacing="0" cellpadding="6">
             <tr v-for="(objTr, objIndex) in item.children" :key="objIndex">
-              <td v-for="objTd in objTr.children" :key="objTd.toolId" :class="objTd.toolId ? 'blueBg' : ''" @click="editOne(objTd)">
+              <td v-for="objTd in objTr.children" :key="objTd.toolId" :class="objTd.toolHandleId ? 'blueBg' : ''" @click="editOne(objTd)">
                 {{objTd.no}}
                 <el-image v-if="objTd.lockStatus == '0'" class="locked" :src="resolveLogo(lockImg)" fit="contain"></el-image>
               </td>

imcs-ui/src/views/zuihou/centralToolMagazine/changeToolTask/components/Edit.vue

@@ -34,9 +34,9 @@
 	      <!--<el-table-column align="center" type="selection" width="50" :reserve-selection="true" />-->
 	      <el-table-column prop="cuttingToolName" label='刀具名称' :show-overflow-tooltip="true"></el-table-column>
 	      <el-table-column prop="specifications" label='刀具规格' width="180px"></el-table-column>
-	      <el-table-column prop="cutterCode" label='刀具编码' width="180px">
+	      <el-table-column prop="handleCode" label='刀柄编码' width="180px">
           <template slot-scope="scope">
-            <el-input v-model="tenant.cutterCode" type='text' />
+            <el-input v-model="tenant.handleCode" type='text' />
             </template>
         </el-table-column>
         <el-table-column prop="remark" label='备注' width="180px"></el-table-column>
@@ -128,7 +128,7 @@ export default {
     initTenant () {
       return {
         id: '',
-        cutterCode:''
+        handleCode:''
       }
     },
     initWidth () {
@@ -175,7 +175,7 @@ export default {
     },
     save () {
       console.log(this.tenant)
-      if (!this.tenant.cutterCode || this.tenant.cutterCode.trim() === '') {
+      if (!this.tenant.handleCode || this.tenant.handleCode.trim() === '') {
         this.$message.info('请输入刀具编码');
         this.confirmDisabled = false
         return;
@@ -224,14 +224,14 @@ export default {
     getList (row) {
 
 	      this.loading = true
-      lineSideMgrApi.getCuttingToolByCutterCode({ "id": row.toolId }).then(response => {
+      lineSideMgrApi.getCuttingToolByCutterCode({ "id": row.toolHandleId }).then(response => {
 	        const res = response.data;
 	        console.log("res123123214==== ", res);
 	        if (res.isSuccess) {
 	          this.tableData = res
             const firstRow = res.data[0];
             if (firstRow) {
-              this.$set(this.tenant, 'cutterCode', firstRow.cutterCode);
+              this.$set(this.tenant, 'handleCode', firstRow.handleCode);
             }
 	        }
 	        // eslint-disable-next-line no-return-assign
@@ -283,7 +283,7 @@ export default {
         id: '', // 你的新数据的 id
         cuttingToolName: '',
         specifications: '',
-        cutterCode: '',
+        handleCode: '',
         remark: '',
         // 其他字段按需新增
       };

imcs-ui/src/views/zuihou/centralToolMagazine/lineSideEmulate/Index.vue

@@ -62,7 +62,7 @@
 	  			<!-- 中部-货架小格子 -->
 	  			<table class="contentDiv" border="0" cellspacing="0" cellpadding="6">
             <tr v-for="(objTr, objIndex) in item.children" :key="objIndex">
-              <td v-for="objTd in objTr.children" :key="objTd.toolId" :class="objTd.toolId ? 'blueBg' : ''" @click="editOne(objTd)">
+              <td v-for="objTd in objTr.children" :key="objTd.toolHandleId" :class="objTd.toolHandleId ? 'blueBg' : ''" @click="editOne(objTd)">
                 {{objTd.no}}
                 <el-image v-if="objTd.lockStatus == '0'" class="locked" :src="resolveLogo(lockImg)" fit="contain"></el-image>
               </td>

imcs-ui/src/views/zuihou/centralToolMagazine/lineSideEmulate/components/Edit.vue

@@ -235,7 +235,7 @@ export default {
     getList (row) {
 
 	      this.loading = true
-      lineSideMgrApi.getCuttingToolByCutterCode({ "id": row.toolId }).then(response => {
+      lineSideMgrApi.getCuttingToolByCutterCode({ "id": row.toolHandleId }).then(response => {
 	        const res = response.data;
 	        console.log("res123123214==== ", res);
 	        if (res.isSuccess) {

imcs-ui/src/views/zuihou/centralToolMagazine/locationMgr/components/Edit.vue

@@ -12,9 +12,9 @@
       <el-form-item :label='$t("lineSide.form.storgeNo")+ "："' prop="no">
           <el-input v-model="tenant.no" :placeholder='$t("common.pleaseEnter")'/>
       </el-form-item>
-      <el-form-item :label='$t("lineSide.form.toolNo")' prop="toolId"  >
-        <el-select v-model="tenant.toolId"   style="width: 50%">
-          <el-option v-for="(item, index) in toolList" :key="index" :label="item.cuttingToolName" :value="item.id" />
+      <el-form-item :label='"刀柄"' prop="toolHandleId"  >
+        <el-select v-model="tenant.toolHandleId"   style="width: 50%">
+          <el-option v-for="(item, index) in toolHandleList" :key="index" :label="item.handleName" :value="item.id" />
         </el-select>
       </el-form-item>
       <el-form-item :label='$t("lineSide.form.storgeName")+ "："' prop="name">
@@ -49,6 +49,7 @@
 import warehouseTypeMgrApi from "@/api/modelingCenter/warehouseTypeMgr"
 // 【库位管理】-API
 import locationMgrApi from "@/api/lineSideLibrary/toolStorge"
+import toolHandleApi from "@/api/modelingCenter/toolHandle"
 export default {
   name: 'TenantEdit',
   props: {
@@ -113,7 +114,7 @@ export default {
       oldName: '',
       oldNo: '',
       oldToolNo: '',
-      toolId: '',
+      toolHandleId: '',
       tenant: this.initTenant(),
       screenWidth: 0,
       width: this.initWidth(),
@@ -123,7 +124,7 @@ export default {
         NATION: {}
       },
       roles: [],
-      toolList: [],
+      toolHandleList: [],
       rules: {
       	no: [
         	{ required: true, message: this.$t("rules.require"), trigger: 'blur' },
@@ -295,10 +296,10 @@ export default {
 			})
 		},
     getToolList(){
-      locationMgrApi.toolPageList({}).then(res => {
+      toolHandleApi.pageList({}).then(res => {
         res = res.data
         if(res.isSuccess){
-          this.toolList = res.data
+          this.toolHandleList = res.data
         }
       })
     }