1、新增标签“可用刀模 XX套“

2、生产排版增加取消组合

src/api/mes/pro/dta.js

@@ -50,4 +50,12 @@ export function unMarkDelete(id) {
     url: '/pro/serial/record/unMarkDelete/' + id,
     method: 'delete'
   })
+}
+
+// 删除组合
+export function deleteCombination(id) {
+  return request({
+    url: '/md/dta/record/deleteCombination/' + id,
+    method: 'put'
+  })
 }
\ No newline at end of file

src/api/mes/pro/scheduleList.js

@@ -142,3 +142,11 @@ export function getDictAssistMark(id) {
     method: "get"
   });
 }
+
+// 获取可用套数
+export function getavailableToolCount(id) {
+  return request({
+    url: "tm/tmToolMachines/availableToolCount/" + id,
+    method: "get"
+  });
+}

src/views/mes/pro/dta/index.vue

@@ -45,17 +45,7 @@
           v-hasPermi="['pro:scheduleSetupRule:edit']"
         >修改</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['pro:scheduleSetupRule:remove']"
-        >删除</el-button>
-      </el-col>
+      
        -->
       <el-col :span="1.5">
         <el-button
@@ -77,11 +67,23 @@
           v-hasPermi="['pro:dta:queryLPN']"
         >查询LPN</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['pro:dta:remove']"
+        >删除组合</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="scheduleSetupRuleList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="排版编号" align="center" prop="dtaRecordCode" />
       <el-table-column label="工单编号" align="center" prop="workorderCode" />
       <el-table-column label="组合编码" align="center" prop="combinationCode"/>
       <el-table-column label="销售单号" align="center" prop="salesVoucher" />
@@ -254,7 +256,7 @@
 </template>
 
 <script>
-import { getDtaList, finishApi, cancelApi } from "@/api/mes/pro/dta";
+import { getDtaList, finishApi, cancelApi, deleteCombination } from "@/api/mes/pro/dta";
 import BrandSelect from "@/components/itemType/single.vue";
 import ProcessSelect from "@/components/process/taskSelectSingle.vue";
 import LPNList from "./components/LPN-list.vue";
@@ -428,9 +430,9 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ruleIds = row.ruleId || this.ids;
-      this.$modal.confirm('是否确认删除排产换型对照信息编号为"' + ruleIds + '"的数据项？').then(function() {
-        return delScheduleSetupRule(ruleIds);
+      const ruleIds = this.selectedRows.map(v => v.combinationCode)
+      this.$modal.confirm('是否确认删除组合编码为"' + ruleIds.join(',') + '"的数据项？').then(function() {
+        return deleteCombination(ruleIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");

src/views/mes/pro/scheduleList/index.vue

@@ -526,6 +526,11 @@
     >
       <el-form :model="Assignform" ref="Assignform" size="small" :inline="true">
         <el-row>
+          <el-col :span="24" style="color: red;">
+            <el-form-item label="可用刀模" prop="quantity" style="color: red;">
+              {{availableToolCount}}套
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item label="排产数量" prop="quantity">
               <el-input-number
@@ -663,6 +668,7 @@ import {
   gettaskWorkunitList,
   getDictAssistMark,
   postAssistMark,
+  getavailableToolCount,
   getdefaultWorkCenterList} from '@/api/mes/pro/scheduleList'
 import {putProtaskSplit, splitWorkstation, deleteTask, unschedule, updateProTaskWorkunitApi} from '@/api/mes/pro/protask'
 import BrandSelect from "@/components/TmTool/index.vue";
@@ -710,6 +716,7 @@ export default {
       loading: false,
       // 选中数组
       ids: [],
+      availableToolCount: 0,
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -918,6 +925,16 @@ export default {
         workunitName: null,
         workunitId: null
       };
+      getavailableToolCount(this.selectedRows[0].taskWorkunitId).then(res => {
+        if(res.data) {
+          this.availableToolCount = res.data
+        } else {
+          this.availableToolCount = 0
+        }
+      }).catch(e => {
+        this.availableToolCount = 0
+      }
+      )
       this.workstationId = this.selectedRows[0].workstationId
       this.taskId = this.selectedRows[0].taskId
       console.log('this.selectedRows[0]', this.selectedRows[0])