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,12 +52,12 @@
           plain
           icon="el-icon-edit"
           size="mini"
-          :disabled="single"
+          :disabled="ids.length == 0"
           @click="confirmUpdate"
           v-hasPermi="['pro:materialRequest:edit']"
         >确认申请</el-button>
       </el-col>
-      
+
       <!--   <el-col :span="1.5">
         <el-button
           type="success"
@@ -293,7 +293,7 @@
             </el-form-item>
           </el-col>
         </el-row>
- 
+
         <BrandSelect ref="brSelect"  :workorderId="form.workorderId"  :arrangeCode="form.arrangeCode" @onSelected="(row)=>onSelected(row, 'BrandSelect')"></BrandSelect>
         <arangeSelect ref="arangeSelect"  :workorderId="form.workorderId" :arrangeCode="form.arrangeCode" @onSelected="(row)=>onSelected(row, 'arangeSelect')"></arangeSelect>
         <workorderSelect ref="workorderselect" key="workorderselect"   @onSelected="onWorkorderSelect"></workorderSelect>
@@ -314,7 +314,7 @@
           </el-col>
         </el-row>
         <el-row>
-         
+
           <el-col :span="12">
             <el-form-item label="预计结束时间" prop="endTime">
               <el-date-picker clearable v-model="form.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
@@ -326,7 +326,7 @@
       </el-form>
       <el-divider content-position="center">申请单物料</el-divider>
             <el-card shadow="always" class="box-card">
-                <requestIndex v-if="opens" ref="materialRequestRef" :quantity="form.requestNum" :id="form.materialRequestId" 
+                <requestIndex v-if="opens" ref="materialRequestRef" :quantity="form.requestNum" :id="form.materialRequestId"
                     :optType="optType" :workunitCodes="form.workunitCode" :workunitNames="form.workunitName" :workstationNames="form.workstationName"  :workstationCodes="form.workstationCode"></requestIndex>
             </el-card>
       <div slot="footer" class="dialog-footer">
@@ -335,8 +335,8 @@
         <el-button @click="cancels" v-if="optType != 'view'">取 消</el-button>
       </div>
     </el-dialog>
-    
-    
+
+
     <div style="overflow: hidden;width: 0;height: 0;">
       <div id="productOrderDetail">
         <div v-for="(item, index) in printTable" :key="'printTable' + index">
@@ -386,7 +386,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      
+
       applyNos: null,
 
       combinationCodes: [],
@@ -460,7 +460,7 @@ export default {
       // 表单校验
       rules: {
 
-      
+
                 taskCode: [
                     { required: true, message: "任务单号称不能为空", trigger: "blur" }
                 ],
@@ -473,7 +473,7 @@ export default {
                 workorderCode: [
                     { required: true, message: "任务单号称不能为空", trigger: "blur" }
                 ],
-            
+
       }
     };
   },
@@ -542,7 +542,7 @@ export default {
           this.form.arrangeCode = row.arrangeCode;
           }
       }
-     
+
     },
 
     onWorkorderSelect(row){
@@ -553,7 +553,7 @@ export default {
           this.form.taskId = '';
           this.form.arrangeCode = '';
           this.form.taskName = '';
-        } 
+        }
     },
 
   handleItemSelect() {
@@ -587,7 +587,7 @@ export default {
           this.form.workstationName = row.workstationName;
         }
        }
-       
+
     },
 
     getTypeList(params){
@@ -735,7 +735,7 @@ export default {
               ...this.form,
               itemList,
             }
-  
+
             addMaterialRequest(params).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.opens = false;
@@ -744,7 +744,7 @@ export default {
 
           }
 
-       
+
 
           // if (this.form.materialRequestId != null) {
           //   updateMaterialRequest(this.form).then(response => {