保密发料和刀模版具申请单

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

@@ -9,18 +9,20 @@
                 @keyup.enter.native="handleQuery"
                 />
             </el-form-item>
-            <el-form-item label="物料编码" prop="sapItemCode">
+            <el-form-item label="物料编码" prop="sapItemCodeList">
                 <el-input
-                v-model="queryParams.sapItemCode"
+                v-model="queryParams.sapItemCodeList"
                 placeholder="请输入物料编码"
+                type="textarea" :rows="2" resize="none"
                 clearable
                 @keyup.enter.native="handleQuery"
                 />
             </el-form-item>
-            <el-form-item label="物料名称" prop="itemName">
+            <el-form-item label="物料名称" prop="itemNameList">
                 <el-input
-                v-model="queryParams.itemName"
+                v-model="queryParams.itemNameList"
                 placeholder="请输入物料名称"
+                type="textarea" :rows="2" resize="none"
                 clearable
                 @keyup.enter.native="handleQuery"
                 />
@@ -225,10 +227,10 @@ export default {
         queryParams: {
           pageNum: 1,
           pageSize: 10,
-          itemName: null,
+          itemNameList: null,
           statusList: [],
           seRouteCode: null,
-          sapItemCode: null,
+          sapItemCodeList: null,
           abnormalType: null,
           workorderCode: null,
           requestDate: null,
@@ -274,7 +276,12 @@ export default {
         },
         getList() {
             this.loading = true;
-            listSecrecyissue(this.queryParams).then(response => {
+            const params = {
+                ...this.queryParams,
+                itemNameList: this.queryParams.itemNameList ? this.queryParams.itemNameList.split(/[\n,;，、；。]/).filter(item => item) : null,
+                sapItemCodeList: this.queryParams.sapItemCodeList ? this.queryParams.sapItemCodeList.split(/[\n,;，、；。]/).filter(item => item) : null
+            }
+            listSecrecyissue(params).then(response => {
                 this.informationList = response.rows;
                 this.total = response.total;
                 this.loading = false;
@@ -419,7 +426,7 @@ export default {
                 startTime: null,
                 endTime: null,
                 arrangeCode: null,
-                itemName: null,
+                itemNameList: null,
                 taskCode: null
             };
             this.resetForm("form");

src/views/mes/tm/toolrequest/selectTask.vue

@@ -25,6 +25,10 @@
           @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="状态" prop="statusArr">
         <el-select
           v-model="queryParams.statusArr"
@@ -70,7 +74,7 @@
             >{{ "" }}</el-radio
           > -->
           <!-- 可以手动的修改label的值，从而控制选择哪一项 -->
-          <el-radio class="radio" v-model="selectedItemId" :label="scope.row.taskWorkunitId"
+          <el-radio class="radio" v-model="selectedItemId" :label="scope.row.itemId + scope.row.processId + scope.row.taskId + scope.row.taskWorkunitId" @change="handleRowChange(scope.row)"
             >{{ "" }}</el-radio
           >
         </template>
@@ -82,13 +86,13 @@
         key="taskCode"
         prop="taskCode"
       />
-      <!-- <el-table-column
-        label="排产数量"
+      <el-table-column
+        label="编排单号"
         min-width="100"
         align="center"
-        key="quantity"
-        prop="quantity"
-      /> -->
+        key="arrangeCode"
+        prop="arrangeCode"
+      />
       <el-table-column
         label="单位"
         align="center"
@@ -185,7 +189,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        // statusArr: '',
+        arrangeCode: '',
         workorderType: 'SELF',
         // statusStr: 'PREPARE,BEGINNING,ISSUEGENERATED'
       },
@@ -239,7 +243,7 @@ export default {
     handleRowChange(row) {
       if (row) {
         this.selectedRows = row;
-        this.selectedItemId = row.taskWorkunitId
+        this.selectedItemId = row.itemId + row.processId + row.taskId + row.taskWorkunitId
       }
     },
     //确定选中