Merge branch 'master' of http://106.14.142.95:3000/oyq28/imcs_331_web

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

@@ -27,13 +27,15 @@ export default {
       cuttingToolInstallPicture: '安装指导',
       orderName:'订单名称',
       orderDeliveryTime:'订单交期',
-      orderPartDeliveryTime:'零件交期',
-      partNo:'零部件编号',
+      partsNo:'零部件编号',
       productNo:'产品代号',
       partName:'零件名称',
       procedureNo:'工序号',
       procedureName:'工序名',
-      processStatus:'状态'
+      processStatus:'状态',
+      start: '起点点位',
+      storgeName: '库位名称',
+      goalType: '设备类型',
     },
     // 表单数据名称
     form: {

imcs-ui/src/views/zuihou/prepareProductMgr/cuttingToolApplyMgr/Index.vue

@@ -72,42 +72,20 @@
     <el-table-column align="center" prop="resourceName" :label='$t("cuttingToolApply.table.resourceName")' width="200" :show-overflow-tooltip="true"></el-table-column>
     <!-- 刀具名称 -->
     <el-table-column align="center" prop="cuttingToolName" :label='$t("cuttingToolApply.table.cuttingToolName")' :show-overflow-tooltip="true"></el-table-column>
-    <!-- 刀具图片 -->
-    <el-table-column align="center" :label='$t("cuttingToolApply.table.cuttingToolPicture")' :show-overflow-tooltip="true">
-      <template slot-scope="{ row }">
-        <el-image
-          style="width: 100px; height: 100px"
-          :src="row.cuttingToolPicture"
-          :preview-src-list="[row.cuttingToolPicture]">
-        </el-image>
-      </template>
-    </el-table-column>
-      <!-- 装夹方式 -->
-      <el-table-column align="center" :label='$t("cuttingToolApply.table.cuttingToolInstallPicture")' :show-overflow-tooltip="true">
-        <template slot-scope="{ row }">
-          <el-image
-            style="width: 100px; height: 100px"
-            :src="row.cuttingToolInstallPicture"
-            :preview-src-list="[row.cuttingToolInstallPicture]">
-          </el-image>
-        </template>
-      </el-table-column>
       <!-- 订单名称 -->
       <el-table-column align="center" prop="orderName" :label='$t("cuttingToolApply.table.orderName")' :show-overflow-tooltip="true"></el-table-column>
       <!-- 订单交期 -->
       <el-table-column align="center" prop="orderDeliveryTime" :label='$t("cuttingToolApply.table.orderDeliveryTime")' width="200" :show-overflow-tooltip="true"></el-table-column>
-      <!-- 零件交期 -->
-      <el-table-column align="center" prop="orderPartDeliveryTime" :label='$t("cuttingToolApply.table.orderPartDeliveryTime")' width="200" :show-overflow-tooltip="true"></el-table-column>
       <!-- 零部件编号 -->
-      <el-table-column align="center" prop="partNo" :label='$t("cuttingToolApply.table.partNo")' :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column align="center" prop="partsNo" :label='$t("cuttingToolApply.table.partsNo")' :show-overflow-tooltip="true"></el-table-column>
       <!-- 产品代号 -->
-      <el-table-column align="center" prop="productNo" :label='$t("cuttingToolApply.table.productNo")' :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column align="center" prop="start" :label='$t("cuttingToolApply.table.start")' :show-overflow-tooltip="true"></el-table-column>
       <!-- 零件名称 -->
-      <el-table-column align="center" prop="partName" :label='$t("cuttingToolApply.table.partName")' :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column align="center" prop="goalType" :label='$t("cuttingToolApply.table.goalType")' :show-overflow-tooltip="true"></el-table-column>
       <!-- 工序号 -->
       <el-table-column align="center" prop="procedureNo" :label='$t("cuttingToolApply.table.procedureNo")' :show-overflow-tooltip="true"></el-table-column>
-      <!-- 工序名 -->
-      <el-table-column align="center" prop="procedureName" :label='$t("cuttingToolApply.table.procedureName")' :show-overflow-tooltip="true"></el-table-column>
+      <!-- 库位名 -->
+      <el-table-column align="center" prop="storgeName" :label='$t("cuttingToolApply.table.storgeName")' :show-overflow-tooltip="true"></el-table-column>
       <!-- 状态 -->
       <el-table-column align="center" prop="processStatusName" :label='$t("cuttingToolApply.table.processStatus")' :show-overflow-tooltip="true"></el-table-column>
     </el-table>

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

@@ -34,7 +34,7 @@
             <!-- 列表数据 -->
             <span style="font-size: 18px;">{{ deviceName }}需要放入 <span style="color: red;font-size: 30px;">{{ allCount }}</span> 把刀</span>
             <span style="font-size: 18px;">,还缺 <span style="color: red;font-size: 30px;">{{ remainingToolCount }}</span> 把刀</span>
-            <el-button  class="el-button--primary generateTask" @click="saveToolTask()">生成任务</el-button>
+            <el-button  v-show="false" class="el-button--primary generateTask" @click="saveToolTask()">生成任务</el-button>
             <el-table
               :key="tableKey"
               ref="table"
@@ -48,18 +48,18 @@
             >
               <el-table-column label='' width="50" align="center"></el-table-column>
               <el-table-column align="center"  type="selection" width="50" :reserve-selection="true" />
-              <el-table-column prop="name" :label='"库位名称"' :show-overflow-tooltip="true"></el-table-column>
-              <el-table-column prop="no" :label='"库位编码"' :show-overflow-tooltip="true" ></el-table-column>
-              <el-table-column prop="handleName" :label='"刀柄名称"' :show-overflow-tooltip="true" ></el-table-column>
-              <el-table-column prop="cuttingToolName" :label='"刀具名称"' :show-overflow-tooltip="true" ></el-table-column>
-              <el-table-column prop="cutterCode" :label='"刀具编码"' :show-overflow-tooltip="true" ></el-table-column>
+              <el-table-column prop="deviceName" :label='"设备名称"' :show-overflow-tooltip="true"></el-table-column>
+              <el-table-column prop="cutterNo" :label='"刀位号"' :show-overflow-tooltip="true" ></el-table-column>
+              <el-table-column prop="cuttingToolNo" :label='"刀具号"' :show-overflow-tooltip="true" ></el-table-column>
+              <el-table-column prop="cuttingToolName" :label='"刀具名称"' :show-overflow-tooltip="true" ></el-table-column>			  
+              <el-table-column prop="toolSetToCheckParameter" :label='"刀具参数"' :show-overflow-tooltip="true" ></el-table-column>
               <el-table-column prop="toolLifeSpan" :label='"刀具寿命"' :show-overflow-tooltip="true" ></el-table-column>
               <el-table-column prop="toolRatedUsageCount" :label='"刀具额定次数"' :show-overflow-tooltip="true" ></el-table-column>
               <el-table-column prop="toolUsedCount" :label='"刀具使用次数"' :show-overflow-tooltip="true" ></el-table-column>
-              <el-table-column prop="checkLock" :label='"锁定状态"' align="center" width="90px">
+              <el-table-column prop="checkLock" :label='"待装刀具"' align="center" width="90px">
                 <template slot-scope="{ row }">
-                  <el-tag :type="(row.checkLock === '0' || row.checkLock === '') ? 'success' : 'danger'">
-                  {{ (row.checkLock === '0' || row.checkLock === '') ? $t("common.yes") : $t("common.no") }}
+                  <el-tag :type="(row.deviceId != '0') ? 'success' : 'danger'">
+                  {{ (row.deviceId != '0') ? $t("common.no") : $t("common.yes") }}
                   </el-tag>
                 </template>
               </el-table-column>
@@ -107,6 +107,7 @@
 	// 【边线库管理】-API
 	import lineSideMgrApi from "@/api/lineSideLibrary/lineSideMgr"
 	import toolStroge from "@/api/lineSideLibrary/toolStorge"
+	import cuttingToolMgrApi from "@/api/prepareProductMgr/customizeCuttingTool"
 
 	import elDragDialog from '@/directive/el-drag-dialog'
 	import { downloadFile, initEnums, initDicts, initQueryParams } from '@/utils/commons'
@@ -399,12 +400,16 @@
 	    // 获取列表数据
 	    getTabList(deviceId){
         console.log("deviceId:"+this.deviceId)
-        toolStroge.getDeviceStorge({"deviceId":deviceId}).then(res => {
+        //toolStroge.getDeviceStorge({"deviceId":deviceId}).then(res => {
+	      this.queryParams.size = 100
+		  this.queryParams.model.deviceId = this.deviceId
+		  this.queryParams.model.needCutterList = this.toolCategory
+		  cuttingToolMgrApi.page(this.queryParams).then(res => {
 	    		res = res.data
 	    		console.log("方块列表：", res)
-          if(res.isSuccess){
-            this.shelvesTreeList = res.data;
-          }
+          		if(res.isSuccess){
+            		this.shelvesTreeList = res.data.records;
+          		}
 	    	})
 	    },
       saveToolTask(){

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

@@ -28,7 +28,7 @@
       <el-table-column prop="msg" :label='"校验信息"' :show-overflow-tooltip="true"></el-table-column>
       <el-table-column prop="isTask" :label='"任务是否已生成"' :show-overflow-tooltip="true"></el-table-column>
     </el-table>
-    <el-button  class="el-button--primary generateTask" @click="save()">生成任务</el-button>
+    <el-button v-if="this.runTaskVisble" class="el-button--primary generateTask" @click="save()">生成任务</el-button>
     <!-- 刀具校验详情对话框-->
     <el-dialog
       :visible.sync="checkDetailCuttingToolsVisible"
@@ -70,6 +70,7 @@
 	    return {
 	      tableKey: 0,
 	      loading: false,
+        runTaskVisble: false,
         checkDetailCuttingToolsVisible: false,
         detailPlanId: '',
         deviceId:'',
@@ -105,23 +106,16 @@
           const res = response.data
           if(res.isSuccess){
             this.tableData = res.data
+            this.runTaskVisble = this.tableData[0].list.length>0 ? true: false
           }
-        }).finally(() => this.loading = false)
-
-        // TOTO 临时写死一个测试，后面订单页面调整完成后直接用选中的计划id
-     /*  planMgrApi.checkPlanCuttingTools({ "planId": this.planId }).then(response => {
-	        const res = response.data
-	        if (res.isSuccess) {
-	          this.tableData = res.data
-	        }
-	      }).finally(() => this.loading = false)*/
+        }).finally(() => this.loading = false)     
 	    },
 
       showCheckDetails(data){
-        console.log("showCheckDetails:"+data)
-	        if(data.hasCuttingToolsFlag === '是' || data.isFree || data.isTask === '是'){
+        console.log(data)
+	        if(data.hasCuttingToolsFlag === '是' || !data.isFree || data.isTask === '否'){
             return
-          }
+          }          
           this.detailPlanId = data.planId
           this.deviceId = data.id
           this.toolCategory=data.list