Merge remote-tracking branch 'origin/master'

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

@@ -64,6 +64,9 @@
       <!-- 刀具规格 -->
       <el-table-column align="center" prop="specifications" :label='$t("cuttingTool.table.customizeCuttingtool.specifications")' :show-overflow-tooltip="true"></el-table-column>
       <el-table-column align="center" prop="cutterCode" :label='$t("cuttingTool.table.customizeCuttingtool.cutterCode")' :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column align="center" prop="toolLifeSpan" :label='"刀具寿命"' :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column align="center" prop="toolRatedUsageCount" :label='"刀具额定次数"' :show-overflow-tooltip="true"></el-table-column>
+      <el-table-column align="center" prop="toolUsedCount" :label='"刀具已使用次数"' :show-overflow-tooltip="true"></el-table-column>
       <!-- 设备名称 -->
 <!--	  <el-table-column align="center" prop="deviceName" :label='$t("cuttingTool.table.customizeCuttingtool.deviceName")' :show-overflow-tooltip="true"></el-table-column>-->
 	  <!-- 刀具类型 -->

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

@@ -15,18 +15,19 @@
       <el-table-column prop="name" :label='$t("runCenter.table.checkCuttingTool.partName")' :show-overflow-tooltip="true"></el-table-column>
       <!-- 刀具齐套性 -->
       <el-table-column
-        :label="$t('runCenter.table.checkCuttingTool.hasCuttingTools')"
+        :label='"换刀"'
         fixed="right"
         align="center"
         column-key="operation"
       >
         <template slot-scope="{ row }">
-          <a @click="showCheckDetails(row)" style="color: #2db7f5">{{row.hasCuttingToolsFlag}} </a>
+          <a @click="showCheckDetails(row)" style="color: #2db7f5">{{(row.hasCuttingToolsFlag === '是' || row.isFree || row.isTask === '是')?'':row.hasCuttingToolsFlag}} </a>
         </template>
       </el-table-column>
       <el-table-column prop="deviceName" :label='"设备"' :show-overflow-tooltip="true"></el-table-column>
       <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-column prop="hasCuttingToolsFlag" :label='"刀具齐套性"' :show-overflow-tooltip="true"></el-table-column>
     </el-table>
     <el-button  class="el-button--primary generateTask" @click="save()">生成任务</el-button>
     <!-- 刀具校验详情对话框-->