From 657008b33f1b230a1e041f3487d64522fbdcbd18 Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Tue, 1 Nov 2022 16:06:58 +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

---
 mes/qd/src/views/wms/pdm/produce/workorder/index.vue | 4 ++--
 mes/qd/src/views/wms/pf/initformula/index.vue        | 5 +++--
 2 files changed, 5 insertions(+), 4 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 8df515c2..06fce689 100644
--- a/mes/qd/src/views/wms/pdm/produce/workorder/index.vue
+++ b/mes/qd/src/views/wms/pdm/produce/workorder/index.vue
@@ -254,8 +254,8 @@
           </template>
         </el-table-column>
         <el-table-column prop="org_id" :formatter="orgFormat" min-width="105" label="所属组织" />
-        <el-table-column prop="workorder_type" :formatter="bill_typeFormat" min-width="70" label="工令类型" />
-        <el-table-column  :formatter="stateFormat" min-width="70" prop="status" label="工令状态" />
+        <el-table-column prop="workorder_type" :formatter="bill_typeFormat" min-width="75" label="工令类型" />
+        <el-table-column  :formatter="stateFormat" min-width="75" prop="status" label="工令状态" />
         <el-table-column prop="device_name" min-width="80" label="设备"/>
         <el-table-column prop="material_code" min-width="130" label="物料编码"/>
         <el-table-column prop="old_mark" min-width="100" label="牌号"/>
diff --git a/mes/qd/src/views/wms/pf/initformula/index.vue b/mes/qd/src/views/wms/pf/initformula/index.vue
index be608741..841d9b6d 100644
--- a/mes/qd/src/views/wms/pf/initformula/index.vue
+++ b/mes/qd/src/views/wms/pf/initformula/index.vue
@@ -146,8 +146,8 @@
             <el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.workorder_code }}</el-link>
           </template>
         </el-table-column>
-        <el-table-column prop="workorder_type" :formatter="bill_typeFormat" min-width="70" label="工令类型" />
-        <el-table-column  :formatter="stateFormat" min-width="70" prop="status" label="工令状态" />
+        <el-table-column prop="workorder_type" :formatter="bill_typeFormat" min-width="75" label="工令类型" />
+        <el-table-column  :formatter="stateFormat" min-width="75" prop="status" label="工令状态" />
         <el-table-column prop="material_code" min-width="130" label="物料编码"/>
         <el-table-column :formatter="seriesFormat" min-width="80" prop="product_series_id" label="系列" />
         <el-table-column prop="pcsn" min-width="80" label="批次"/>
@@ -155,6 +155,7 @@
         <el-table-column prop="bill_qty" min-width="90" label="开单总重量" :formatter="crud.formatNum3" />
         <el-table-column  :formatter="create_modeFormat" min-width="160" prop="create_mode" label="生成方式" />
         <el-table-column prop="qty_unit_name" min-width="80" label="单位"/>
+        <el-table-column prop="remark" min-width="200" label="备注"/>
         <el-table-column prop="formula_time" min-width="135" label="开单时间"/>
         <el-table-column prop="formula_name" min-width="80" label="开单人"/>
       </el-table>