From 97c59ccb563b8cd3732c98c279d9e9788d870c6f Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Sun, 3 Jul 2022 19:42:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/wms/pdm/produce/workorder/index.vue    | 16 ++++++++++++++--
 .../src/views/wms/pdm/produce/worktask/index.vue |  5 ++---
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/mes/qd/src/views/wms/pdm/produce/workorder/index.vue b/mes/qd/src/views/wms/pdm/produce/workorder/index.vue
index be08c07f..4dd1a643 100644
--- a/mes/qd/src/views/wms/pdm/produce/workorder/index.vue
+++ b/mes/qd/src/views/wms/pdm/produce/workorder/index.vue
@@ -214,11 +214,11 @@
         <el-table-column prop="realend_time" min-width="140" label="实际结束时间"/>
         <el-table-column   min-width="100" prop="source_bill_type" label="源类型" />
         <el-table-column prop="source_bill_code" label="来源单据编号" min-width="100" />
-        <el-table-column min-width="90" prop="workprocedure_name" label="当前工序" />
+        <el-table-column min-width="90" prop="workprocedure_id" label="当前工序" :formatter="seriesFormat2" />
         <el-table-column prop="startwork_name" min-width="80" label="开工人"/>
         <el-table-column prop="endwork_name" min-width="80" label="完工人"/>
         <el-table-column prop="create_name" min-width="80" label="创建人"/>
-        <el-table-column prop="update_optname" min-width="100" label="修改人"/>
+        <el-table-column prop="update_optname" min-width="80" label="修改人"/>
         <el-table-column prop="remark" min-width="120" label="备注"/>
       </el-table>
       <!--分页组件-->
@@ -243,6 +243,7 @@ import ChangeDialog from '@/views/wms/pdm/produce/workorder/ChangeDialog'
 import crudseriesProcessRoute from "@/api/wms/pdm/seriesProcessRoute";
 import {getLodop} from "@/assets/js/lodop/LodopFuncs";
 import Date from "@/utils/datetime";
+import crudWorkProcedure from "@/api/wms/basedata/pdm/workProcedure";
 
 export default {
   name: 'workorder',
@@ -277,6 +278,7 @@ export default {
       mstrow: {},
       XLList: [],
       Depts: [],
+      workProcedureList: [],
       viewShow: false,
       changeShow: false,
       currentRow: null,
@@ -293,6 +295,9 @@ export default {
     crudseriesProcessRoute.getXLlist2().then(res => {
       this.XLList = res
     })
+    crudWorkProcedure.downSelect().then(res => {
+      this.workProcedureList = res
+    })
     workorder.getDepts().then(res => {
       this.Depts = res
     })
@@ -356,6 +361,13 @@ export default {
         }
       }
     },
+    seriesFormat2(row) {
+      for (const item of this.workProcedureList) {
+        if (item.workprocedure_id === row.workprocedure_id) {
+          return item.workprocedure_name
+        }
+      }
+    },
     orgFormat(row) {
       for (const item of this.Depts) {
         if (item.id === row.org_id) {
diff --git a/mes/qd/src/views/wms/pdm/produce/worktask/index.vue b/mes/qd/src/views/wms/pdm/produce/worktask/index.vue
index b06e0e15..9f0e5d10 100644
--- a/mes/qd/src/views/wms/pdm/produce/worktask/index.vue
+++ b/mes/qd/src/views/wms/pdm/produce/worktask/index.vue
@@ -206,8 +206,8 @@
         <el-table-column prop="qty_unit_name" min-width="80" label="单位"/>
         <el-table-column prop="planstart_time" min-width="140" label="计划开始时间"/>
         <el-table-column prop="planend_time" min-width="140" label="计划结束时间"/>
-        <el-table-column prop="start_name" min-width="140" label="开始人"/>
-        <el-table-column prop="end_name" min-width="140" label="结束人"/>
+        <el-table-column prop="start_name" min-width="80" label="开始人"/>
+        <el-table-column prop="end_name" min-width="80" label="结束人"/>
         <el-table-column   min-width="100" prop="remark" label="备注" />
         <el-table-column prop="finish_type" label="完成方式" min-width="80" :formatter="finish_typeFormat" />
       </el-table>
@@ -239,7 +239,6 @@ export default {
   components: { print2Dialog, ViewDialog, DeviceDialog, crudOperation, rrOperation, udOperation, pagination },
   cruds() {
     return CRUD({ title: '工令工序任务', idField: 'worktask_id', url: 'api/worktask',
-      //query:{createTime:[new Date().daysAgo(2), new Date()]},
       optShow: {
         add: false,
         edit: false,