fix: 1.生产排版增加组合编码字段; 2.领料申请批量确认功能优化

src/views/mes/pro/dta/components/LPN-list.vue

@@ -9,6 +9,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="组合编码" prop="combinationCode">
+        <el-input
+          v-model="queryParams.combinationCode"
+          placeholder="请输入组合编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="销售订单" prop="salesVoucher">
         <el-input
           v-model="queryParams.salesVoucher"
@@ -85,6 +93,7 @@
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="工单号" align="center" prop="workorderCode">
       </el-table-column>
+      <el-table-column label="组合编码" align="center" prop="combinationCode"/>
       <el-table-column label="销售订单" align="center" prop="salesVoucher"/>
       <el-table-column label="销售订单项次" align="center" prop="salesVoucherItem"/>
       <el-table-column label="物料名称" align="center" prop="itemName"/>
@@ -154,6 +163,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         workorderCode: null,
+        combinationCode: null,
         salesVoucher: null,
         salesVoucherItem: null,
         sapItemCode: null,

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

@@ -9,6 +9,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="组合编码" prop="combinationCode">
+        <el-input
+          v-model="queryParams.combinationCode"
+          placeholder="请输入组合编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -75,6 +83,7 @@
     <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="workorderCode" />
+      <el-table-column label="组合编码" align="center" prop="combinationCode"/>
       <el-table-column label="销售单号" align="center" prop="salesVoucher" />
       <el-table-column label="销售单号项次" align="center" prop="salesVoucherItem" />
       <el-table-column label="物料名称" align="center" prop="itemName" />
@@ -277,7 +286,8 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        workorderCode: null
+        workorderCode: null,
+        combinationCode: null,
       },
       // 表单参数
       form: {},

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

@@ -52,7 +52,7 @@
           plain
           icon="el-icon-edit"
           size="mini"
-          :disabled="single"
+          :disabled="ids.length == 0"
           @click="confirmUpdate"
           v-hasPermi="['pro:materialRequest:edit']"
         >确认申请</el-button>