fix: 1.生产领料增加编排单号查询条件; 2.生产工单增加产品编码查询条件; 3.某些细节的优化

src/views/mes/pro/workorder/indexApply.vue

@@ -23,19 +23,17 @@
       <el-form-item label="来源单据" prop="sourceCode">
         <el-input v-model="queryParams.sourceCode" placeholder="请输入来源单据" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-
-      <!-- <el-form-item label="产品编号" prop="productCode">
+      <el-form-item label="产品名称" prop="productName">
+        <el-input v-model="queryParams.productName" placeholder="请输入产品名称" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="产品编号" prop="productCode">
         <el-input
           v-model="queryParams.productCode"
           placeholder="请输入产品编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item> -->
-      <el-form-item label="产品名称" prop="productName">
-        <el-input v-model="queryParams.productName" placeholder="请输入产品名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-
       <!-- <el-form-item label="客户编码" prop="clientCode">
         <el-input
           v-model="queryParams.clientCode"
@@ -119,6 +117,11 @@
           v-hasPermi="['mes:pro:workorder:edit']">导入
         </el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-plus" size="mini" :disabled="single" @click="handleTurnWorry">
+          转急单
+        </el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-plus" size="mini" :disabled="multiple" @click="handleToolNumCheck"
           v-hasPermi="['mes:pro:workorder:dofinish']">刀模版具齐套检查
@@ -129,11 +132,6 @@
           v-hasPermi="['pro:combination:add']">订单组合
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-plus" size="mini" :disabled="single" @click="handleTurnWorry">
-          转急单
-        </el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-edit" size="mini" @click="()=>handleCombination('del')" :disabled="combinationDisable"
           >取消组合

src/views/mes/wm/issue/index.vue

@@ -17,6 +17,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="编排单号" prop="arrangeCode">
+        <el-input
+          v-model="queryParams.arrangeCode"
+          placeholder="请输入编排单号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="创建时间">
         <el-date-picker
           v-model="daterangePurchaseDate"
@@ -101,8 +109,8 @@
         </template>
       </el-table-column>
 
-  
-      <el-table-column label="创建人" align="center" prop="createBy" />   
+
+      <el-table-column label="创建人" align="center" prop="createBy" />
       <el-table-column label="领料日期" align="center" prop="issueDate" width="180">
         <!-- <template slot-scope="scope">width="180"
           <span>{{ parseTime(scope.row.issueDate, '{y}-{m}-{d}') }}</span>
@@ -142,7 +150,7 @@
         </template>
       </el-table-column> -->
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -165,7 +173,7 @@
               <el-switch v-model="autoGenFlag"
                   active-color="#13ce66"
                   active-text="自动生成"
-                  @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">               
+                  @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view' && form.status =='PREPARE'">
               </el-switch>
             </el-form-item>
           </el-col>
@@ -188,13 +196,13 @@
           </el-col>
         </el-row>
       </el-form>
-      <el-divider v-if="form.issueId !=null" content-position="center">物料信息</el-divider> 
+      <el-divider v-if="form.issueId !=null" content-position="center">物料信息</el-divider>
       <el-card shadow="always" v-if="form.issueId !=null" class="box-card">
-        <Issueline ref="line" :issueId="form.issueId" :warehouseId="form.warehouseId" :locationId="form.locationId" :areaId="form.areaId" :optType="optType"></Issueline>    
+        <Issueline ref="line" :issueId="form.issueId" :warehouseId="form.warehouseId" :locationId="form.locationId" :areaId="form.areaId" :optType="optType"></Issueline>
       </el-card>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>     
-        <el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">确 定</el-button>           
+        <el-button type="primary" @click="cancel" v-if="optType =='view' || form.status !='PREPARE' ">返回</el-button>
+        <el-button type="primary" @click="submitForm" v-if="form.status =='PREPARE' && optType !='view' ">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -237,7 +245,7 @@ export default {
       total: 0,
       // 生产领料单头表格数据
       issueheaderList: [],
-      
+
       daterangePurchaseDate: [],
       // 弹出层标题
       title: "",
@@ -267,6 +275,7 @@ export default {
         issueDate: null,
         status: 'PREPARE',
         applyNo: null,
+        arrangeCode: null,
       },
       // 表单参数
       form: {},
@@ -307,7 +316,7 @@ export default {
       });
     },
     getWarehouseList(){
-      getTreeList().then( response =>{        
+      getTreeList().then( response =>{
         if(response.data){
           this.warehouseOptions = response.data.filter((el) =>{
               return el.warehouseCode.indexOf('VIR') == -1;
@@ -315,12 +324,12 @@ export default {
         }
         this.warehouseOptions.map(w =>{
           w.children.map(l =>{
-                  let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');                  
+                  let lstr =JSON.stringify(l.children).replace(/locationId/g,'lId').replace(/areaId/g, 'pId').replace(/areaName/g,'pName');
                   l.children = JSON.parse(lstr);
           });
-            
-          let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName');  
-          w.children =  JSON.parse(wstr); 
+
+          let wstr = JSON.stringify(w.children).replace(/warehouseId/g,'wId').replace(/locationId/g, 'pId').replace(/locationName/g,'pName');
+          w.children =  JSON.parse(wstr);
 
         });
         let ostr=JSON.stringify(this.warehouseOptions).replace(/warehouseId/g,'pId').replace(/warehouseName/g, 'pName');
@@ -371,7 +380,7 @@ export default {
         updateTime: null,
         applyNo: null,
       };
-      this.autoGenFlag = false;  
+      this.autoGenFlag = false;
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -405,9 +414,9 @@ export default {
       getIssueheader(issueId).then(response => {
         debugger;
         this.form = response.data;
-        this.warehouseInfo[0] = response.data.warehouseId;    
-        this.warehouseInfo[1] = response.data.locationId;    
-        this.warehouseInfo[2] = response.data.areaId;  
+        this.warehouseInfo[0] = response.data.warehouseId;
+        this.warehouseInfo[1] = response.data.locationId;
+        this.warehouseInfo[2] = response.data.areaId;
         this.open = true;
         this.title = "修改生产领料单";
         this.optType = "edit";
@@ -419,9 +428,9 @@ export default {
       const issueIds = row.issueId
       getIssueheader(issueIds).then(response => {
         this.form = response.data;
-        this.warehouseInfo[0] = response.data.warehouseId;    
-        this.warehouseInfo[1] = response.data.locationId;    
-        this.warehouseInfo[2] = response.data.areaId; 
+        this.warehouseInfo[0] = response.data.warehouseId;
+        this.warehouseInfo[1] = response.data.locationId;
+        this.warehouseInfo[2] = response.data.areaId;
         this.open = true;
         this.title = "查看领料单信息";
         this.optType = "view";
@@ -474,7 +483,7 @@ export default {
       }, `issueheader_${new Date().getTime()}.xlsx`)
     },
     //选择默认的仓库、库区、库位
-    handleWarehouseChanged(obj){      
+    handleWarehouseChanged(obj){
       if(obj !=null){
         this.form.warehouseId = obj[0];
         this.form.locationId = obj[1];

src/views/mes/wm/issue/line.vue

 <template>
-  <div class="app-container">    
+  <div class="app-container">
     <el-row v-if="optType != 'view'" :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
@@ -40,12 +40,13 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="产品物料编码" width="120px" align="center" prop="itemCode" />
       <el-table-column label="产品物料名称" width="120px"  align="center" prop="itemName" :show-overflow-tooltip="true"/>
-      <el-table-column label="生产工单" align="center" prop="workorderCode" />     
-      <el-table-column label="申请单号" align="center" prop="applyNo" /> 
+      <el-table-column label="生产工单" align="center" prop="workorderCode" />
+      <el-table-column label="申请单号" align="center" prop="applyNo" />
       <el-table-column label="规格型号" align="center" prop="specification" :show-overflow-tooltip="true"/>
       <el-table-column label="单位" align="center" prop="unitOfMeasure" />
       <el-table-column label="领料数量" align="center" prop="quantityIssued" />
       <el-table-column label="批次号" align="center" prop="batchCode" />
+      <el-table-column width="200" label="PL号" align="center" prop="plNum" />
       <el-table-column label="仓库名称" align="center" prop="warehouseName" />
        <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" v-if="optType != 'view'" width="100px" class-name="small-padding fixed-width">
@@ -69,7 +70,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -350,7 +351,7 @@ export default {
           this.form.itemCode = obj.itemCode;
           this.form.itemName = obj.itemName;
           this.form.specification = obj.specification;
-          this.form.unitOfMeasure = obj.unitOfMeasure;  
+          this.form.unitOfMeasure = obj.unitOfMeasure;
           this.form.batchCode = obj.batchCode;
           this.form.warehouseId = obj.warehouseId;
           this.form.warehouseCode = obj.warehouseCode;