Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

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

@@ -9,6 +9,7 @@
         <el-table-column label="生产工单号" width="180" prop="workorderCode"/>
         <el-table-column label="产品编号" width="180" prop="productCode"/>
         <el-table-column label="产品名称" prop="productName"/>
+        <el-table-column label="生产订单数量" v-if="isOrder" prop="quantity"/>
         <el-table-column label="规格" width="140" prop="productSpc"/>
         <el-table-column label="需求日期" width="140" prop="requestDate"/>
       </el-table>
@@ -21,6 +22,7 @@ import {
 } from "@/api/mes/pro/scheduleList";
 
 export default {
+  props: ['isOrder'],
   name: "arrangCodeList",
   components: { },
   data() {
@@ -51,7 +53,11 @@ export default {
     getList() {
       this.loading = true;
       const params = new FormData()
-      params.append('taskWorkunitId', this.$attrs.taskWorkunitId)
+      if (this.isOrder) {
+        params.append('arrangeCode', this.$attrs.arrangeCode)
+      } else {
+        params.append('taskWorkunitId', this.$attrs.taskWorkunitId)
+      }
       taskWorkunitList(params).then((response) => {
         this.itemList = response;
         this.loading = false;

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

@@ -81,6 +81,22 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
+          <el-form-item label="编排人员" prop="arrangeUsername">
+            <el-input
+              v-model="queryParams.arrangeUsername"
+              placeholder="请输入编排人员"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="工单编码" prop="workorderCode">
+            <el-input
+              v-model="queryParams.workorderCode"
+              placeholder="请输入工单编码"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
           <el-form-item label="计划开始时间段" label-width="130px" prop="scheduleStartDate">
             <el-date-picker
               v-model="queryParams.scheduleStartDate"
@@ -137,7 +153,7 @@
           <el-button
             size="mini"
             type="text"
-            @click="taskWorkunitId= scope.row.taskWorkunitId, arrangCodeVisible = true"
+            @click="taskWorkunitId= scope.row.taskWorkunitId, isOrder = false, arrangCodeVisible = true"
             >{{ scope.row.arrangeCode }}</el-button
           >
         </template>
@@ -162,6 +178,8 @@
       <el-table-column label="排产数量" align="center" prop="quantity" />
       <el-table-column label="可加工数量" align="center" prop="quantityWait"/>
       <el-table-column label="已完成数量" align="center" prop="quantityQualify" />
+      <el-table-column label="编排人员" align="center" prop="arrangeUsername" />
+      <el-table-column label="工单编码" align="center" prop="workorderCode" />
       <el-table-column
         label="工作中心"
         align="center"
@@ -396,7 +414,7 @@
       width="1000px"
       append-to-body
     >
-      <order-list v-if="scheduleVisible" ref="orderListRef"></order-list>
+      <order-list v-if="scheduleVisible" ref="orderListRef" @clickTask="clickTask"></order-list>
       <div slot="footer" class="dialog-footer">
         <el-button
           type="primary"
@@ -413,7 +431,7 @@
       width="1000px"
       append-to-body
     >
-      <arrangCodeList v-if="arrangCodeVisible" ref="orderListRef" :taskWorkunitId="taskWorkunitId"></arrangCodeList>
+      <arrangCodeList v-if="arrangCodeVisible" ref="orderListRef" :taskWorkunitId="taskWorkunitId" :arrangeCode="arrangeCode" :isOrder="isOrder"></arrangCodeList>
       <div slot="footer" class="dialog-footer">
         <el-button @click="arrangCodeVisible = false">取 消</el-button>
       </div>
@@ -460,6 +478,7 @@ export default {
       taskWorkunitId: null,
       arrangCodeVisible: false,
       scheduleVisible: false,
+      isOrder: true,
       // 遮罩层
       loading: false,
       // 选中数组
@@ -486,11 +505,14 @@ export default {
         pageSize: 10,
         taskCode: null,
         arrangeCode: null,
+        arrangeUsername: null,
+        workorderCode: null,
         processName: null,
         statusArr: ['PREPARE'],
         scheduleStartDate: null,
         scheduleEndDate: null,
       },
+      arrangeCode: null,
       // 表单参数
       form: {},
       // 表单校验
@@ -503,6 +525,11 @@ export default {
     this.hanldeGetdefaultWorkCenterList()
   },
   methods: {
+    clickTask(arrangeCode){
+      this.arrangeCode= arrangeCode
+      this.isOrder = true
+      this.arrangCodeVisible = true
+    },
     hanldeGetdefaultWorkCenterList() {
       getdefaultWorkCenterList().then(async (res) => {
         console.log(res, 5566)

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

@@ -28,7 +28,16 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="编排单号" align="center" prop="arrangeCode"/>
+      <el-table-column label="编排单号" align="center" prop="arrangeCode">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="$emit('clickTask', scope.row.arrangeCode)"
+            >{{ scope.row.arrangeCode }}</el-button
+          >
+        </template>
+      </el-table-column>
       <el-table-column label="编排时间" align="center" prop="createTime"/>
       <el-table-column label="编排人员" align="center" prop="createBy"/>