生产排产

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

@@ -75,9 +75,9 @@
           </el-form-item>
           <el-form-item label="编排单号" prop="arrangeCode">
             <el-input
-              v-model="queryParams.arrangeCodes"
+              v-model="queryParams.arrangeCode"
               placeholder="请输入编排单号"
-              clearable type="textarea" :rows="2" resize="none"
+              clearable
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
@@ -89,14 +89,6 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="产品类别名称" prop="itemTypeName">
-            <el-input
-              v-model="queryParams.itemTypeName"
-              placeholder="请输入产品类别名称"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
           <el-form-item label="工单编码" prop="workorderCode">
             <el-input
               v-model="queryParams.workorderCode"
@@ -716,9 +708,8 @@ export default {
         pageNum: 1,
         pageSize: 10,
         taskCode: null,
-        arrangeCodes: null,
+        arrangeCode: null,
         arrangeUsername: null,
-        itemTypeName: null,
         workorderCode: null,
         processName: null,
         statusArr: ['PREPARE'],
@@ -938,7 +929,7 @@ export default {
       this.queryParams.workCenterId = this.queryWorkunitParams.workstationId
       this.queryParams.workshopId = this.queryWorkunitParams.workshopId
       this.loading = true;
-      const params = {...this.queryParams, arrangeCodes: this.queryParams.arrangeCodes ? this.queryParams.arrangeCodes.split(/[\n,;，、；。]/).filter(item => item) : null,}
+      const params = {...this.queryParams}
       if (params.scheduleEndDate&&params.scheduleEndDate.length > 0) {
         params.scheduleEndDateFrom = params.scheduleEndDate[0]
         params.scheduleEndDateTo = params.scheduleEndDate[1]

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

 <template>
     <div>
       <el-form :model="queryParams" @submit.native.prevent ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="编排单号" prop="arrangeCode">
+      <el-form-item label="编排单号" prop="arrangeCodes">
         <el-input
-          v-model="queryParams.arrangeCode"
+          v-model="queryParams.arrangeCodes"
           placeholder="请输入编排单号"
-          clearable
+          clearable type="textarea" :rows="2" resize="none"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
@@ -17,6 +17,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="产品类别名称" prop="itemTypeName" label-width="100px">
+        <el-input
+          v-model="queryParams.itemTypeName"
+          placeholder="请输入产品类别名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="编排人员" prop="createBy">
         <el-input
           v-model="queryParams.createBy"
@@ -49,6 +57,7 @@
       </el-table-column>
       <!-- <el-table-column label="生产工单" align="center" prop="workorderCode"/> -->
       <el-table-column label="编排时间" align="center" prop="createTime"/>
+      <el-table-column label="产品类别名称" align="center" prop="itemTypeName"/>
       <el-table-column label="编排人员" align="center" prop="createBy"/>
 
     </el-table>
@@ -93,7 +102,8 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 50,
-        arrangeCode: '',
+        itemTypeName: "",
+        arrangeCodes: '',
         workorderCode: '',
         createBy: ''
       },
@@ -112,7 +122,14 @@ export default {
       const formdata = new FormData()
       formdata.append('pageNum', this.queryParams.pageNum)
       formdata.append('pageSize', this.queryParams.pageSize)
-      formdata.append('arrangeCode', this.queryParams.arrangeCode)
+      if (this.queryParams.arrangeCodes) {
+        const arr = this.queryParams.arrangeCodes.split(/[\n,;，、；。]/).filter(item => item)
+        arr.forEach((value, index) => {
+          formdata.append(`arrangeCodes[${index}]`, value)
+        })
+      }
+
+      formdata.append('itemTypeName', this.queryParams.itemTypeName)
       formdata.append('workorderCode', this.queryParams.workorderCode)
       formdata.append('createBy', this.queryParams.createBy)
       formdata.append('workorderStatus', ['ORCHESTRATED'])