From 37a01777a62f5e9e4314a15081a20d57a500a55c Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Thu, 30 Jun 2022 19:12:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/wms/pdm/produce/workorder/index.vue | 37 +++++++++----------
 .../views/wms/pdm/produce/worktask/index.vue  | 29 +++++++--------
 2 files changed, 32 insertions(+), 34 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 dbfd487a..be08c07f 100644
--- a/mes/qd/src/views/wms/pdm/produce/workorder/index.vue
+++ b/mes/qd/src/views/wms/pdm/produce/workorder/index.vue
@@ -191,36 +191,35 @@
           </template>
         </el-table-column>
         <el-table-column :selectable="checkboxT" type="selection" width="55" />
-        <el-table-column prop="workorder_date" min-width="90" label="工令日期" :formatter="workorder_dateFormat"/>
+        <el-table-column prop="workorder_date" min-width="85" label="工令日期" :formatter="workorder_dateFormat"/>
         <el-table-column prop="workorder_code" width="130" label="工令号">
           <template slot-scope="scope">
             <el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.workorder_code }}</el-link>
           </template>
         </el-table-column>
-        <el-table-column prop="org_id" :formatter="orgFormat" min-width="120" label="所属组织" />
+        <el-table-column prop="org_id" :formatter="orgFormat" min-width="110" label="所属组织" />
         <el-table-column prop="workorder_type" :formatter="bill_typeFormat" min-width="80" label="工令类型" />
-        <el-table-column  :formatter="stateFormat" min-width="100" prop="status" label="工令状态" />
-        <el-table-column prop="device_name" min-width="130" label="设备"/>
+        <el-table-column  :formatter="stateFormat" min-width="80" prop="status" label="工令状态" />
+        <el-table-column prop="device_name" min-width="100" label="设备"/>
         <el-table-column prop="material_code" min-width="130" label="物料编码"/>
-        <el-table-column :formatter="seriesFormat" min-width="130" prop="product_series_id" label="系列" />
-        <el-table-column prop="pcsn" min-width="130" label="批次"/>
-        <el-table-column prop="workorder_qty" min-width="100" label="重量" :formatter="crud.formatNum3"/>
-        <el-table-column prop="bill_qty" min-width="100" label="开单总重量" :formatter="crud.formatNum3" />
+        <el-table-column :formatter="seriesFormat" min-width="80" prop="product_series_id" label="系列" />
+        <el-table-column prop="pcsn" min-width="80" label="批次"/>
+        <el-table-column prop="workorder_qty" min-width="80" label="重量" :formatter="crud.formatNum3"/>
+        <el-table-column prop="bill_qty" min-width="80" label="开单总重量" :formatter="crud.formatNum3" />
         <el-table-column prop="productin_qty" min-width="100" label="实际生产重量" :formatter="crud.formatNum3"/>
-        <el-table-column prop="ok_qty" min-width="100" label="合格重量" :formatter="crud.formatNum3"/>
-        <el-table-column prop="qty_unit_name" min-width="100" label="单位"/>
-        <el-table-column prop="planstart_time" min-width="150" label="计划开始时间"/>
-        <el-table-column prop="planend_time" min-width="150" label="计划结束时间"/>
-        <el-table-column prop="realstart_time" min-width="150" label="实际开始时间"/>
-        <el-table-column prop="realend_time" min-width="150" label="实际结束时间"/>
+        <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="realstart_time" min-width="140" label="实际开始时间"/>
+        <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="100" prop="workprocedure_name" label="当前工序" />
-        <el-table-column prop="remark" min-width="100" label="备注"/>
-        <el-table-column prop="startwork_name" min-width="100" label="开工人"/>
-        <el-table-column prop="endwork_name" min-width="100" label="完工人"/>
-        <el-table-column prop="create_name" min-width="100" label="创建人"/>
+        <el-table-column min-width="90" prop="workprocedure_name" label="当前工序" />
+        <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="remark" min-width="120" label="备注"/>
       </el-table>
       <!--分页组件-->
       <pagination />
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 10f2323f..b06e0e15 100644
--- a/mes/qd/src/views/wms/pdm/produce/worktask/index.vue
+++ b/mes/qd/src/views/wms/pdm/produce/worktask/index.vue
@@ -187,30 +187,29 @@
         @selection-change="mySelectionChange"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column prop="workorder_date" min-width="90" label="日期" :formatter="workorder_dateFormat"/>
+        <el-table-column prop="workorder_date" min-width="85" label="日期" :formatter="workorder_dateFormat"/>
         <el-table-column prop="workorder_code" width="130" label="工令号">
           <template slot-scope="scope">
             <el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.workorder_code }}</el-link>
           </template>
         </el-table-column>
         <el-table-column min-width="80" prop="workprocedure_name" label="工序" />
-        <el-table-column min-width="150" prop="worktask_code" label="工序任务号" />
-        <el-table-column  :formatter="stateFormat" min-width="100" prop="status" label="状态" />
-        <el-table-column prop="device_name" min-width="130" label="设备"/>
+        <el-table-column min-width="130" prop="worktask_code" label="工序任务号" />
+        <el-table-column  :formatter="stateFormat" min-width="70" prop="status" label="状态" />
+        <el-table-column prop="device_name" min-width="100" label="设备"/>
         <el-table-column prop="material_code" min-width="130" label="物料编码"/>
-        <el-table-column :formatter="seriesFormat" min-width="130" prop="product_series_id" label="系列" />
-        <el-table-column prop="pcsn" min-width="130" label="批次"/>
-        <el-table-column prop="workorder_qty" min-width="100" label="重量" :formatter="crud.formatNum3"/>
+        <el-table-column :formatter="seriesFormat" min-width="80" prop="product_series_id" label="系列" />
+        <el-table-column prop="pcsn" min-width="80" label="批次"/>
+        <el-table-column prop="workorder_qty" min-width="80" label="重量" :formatter="crud.formatNum3"/>
         <el-table-column prop="product_qty" min-width="100" label="实际生产重量" :formatter="crud.formatNum3"/>
-        <el-table-column prop="ok_qty" min-width="100" label="合格重量" :formatter="crud.formatNum3"/>
-        <el-table-column prop="qty_unit_name" min-width="100" label="单位"/>
-        <el-table-column prop="planstart_time" min-width="150" label="计划开始时间"/>
-        <el-table-column prop="planend_time" min-width="150" label="计划结束时间"/>
-        <el-table-column prop="check_name" min-width="150" label="检查人"/>
-        <el-table-column prop="start_name" min-width="150" label="开始人"/>
-        <el-table-column prop="end_name" min-width="150" label="结束人"/>
+        <el-table-column prop="ok_qty" min-width="80" label="合格重量" :formatter="crud.formatNum3"/>
+        <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   min-width="100" prop="remark" label="备注" />
-        <el-table-column prop="finish_type" label="完成方式" min-width="100" :formatter="finish_typeFormat" />
+        <el-table-column prop="finish_type" label="完成方式" min-width="80" :formatter="finish_typeFormat" />
       </el-table>
       <!--分页组件-->
       <pagination />