From 3b4485f945b867014feacb4cae2c43dd28d46a16 Mon Sep 17 00:00:00 2001
From: ludj <ldj_willow@163.com>
Date: Fri, 30 Jun 2023 15:57:32 +0800
Subject: [PATCH] =?UTF-8?q?rev:=20=E7=95=8C=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes/qd/src/views/wms/pcs/saleorder/index.vue | 10 +++++-----
 mes/qd/src/views/wms/pdm/device/index.vue    |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mes/qd/src/views/wms/pcs/saleorder/index.vue b/mes/qd/src/views/wms/pcs/saleorder/index.vue
index d24e197e..caa8b91b 100644
--- a/mes/qd/src/views/wms/pcs/saleorder/index.vue
+++ b/mes/qd/src/views/wms/pcs/saleorder/index.vue
@@ -114,7 +114,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="material_code" label="物料编码" />
-        <el-table-column prop="material_name" label="物料名称" min-width="100" show-overflow-tooltip/>
+        <el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')"/>
         <el-table-column prop="status" label="状态">
           <template slot-scope="scope">
             {{ dict.label.PCS_SALE_STATUS[scope.row.status] }}
@@ -122,14 +122,14 @@
         </el-table-column>
         <el-table-column prop="sale_qty" label="销售数量" />
         <el-table-column prop="produce_seq" label="生产顺序" />
-        <el-table-column prop="cust_code" label="客户编码" min-width="100" show-overflow-tooltip/>
-        <el-table-column prop="cust_name" label="客户名称" min-width="100" show-overflow-tooltip/>
+        <el-table-column prop="cust_code" label="客户编码" :min-width="flexWidth('cust_code',crud.data,'客户编码')"/>
+        <el-table-column prop="cust_name" label="客户名称" :min-width="flexWidth('cust_name',crud.data,'cust_name')"/>
         <el-table-column prop="unit_name" label="计量单位" show-overflow-tooltip min-width="150"  />
         <el-table-column prop="plandeliver_date" label="计划交期" min-width="100" show-overflow-tooltip/>
         <el-table-column prop="remark" label="备注" show-overflow-tooltip min-width="200"/>
         <el-table-column prop="create_name" label="创建人" />
-        <el-table-column prop="create_time" label="创建时间" min-width="120" show-overflow-tooltip/>
-        <el-table-column prop="update_time" label="修改时间" min-width="120" show-overflow-tooltip/>
+        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')"/>
+        <el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')"/>
 <!--        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
             <udOperation
diff --git a/mes/qd/src/views/wms/pdm/device/index.vue b/mes/qd/src/views/wms/pdm/device/index.vue
index 4132c00e..a3b00cc6 100644
--- a/mes/qd/src/views/wms/pdm/device/index.vue
+++ b/mes/qd/src/views/wms/pdm/device/index.vue
@@ -169,7 +169,7 @@
         <el-table-column prop="device_code" label="设备编码" width="100px" show-overflow-tooltip />
         <el-table-column prop="device_name" label="设备名称" :min-width="flexWidth('device_name',crud.data,'设备名称')" />
         <el-table-column prop="product_area" label="生产车间" />
-        <el-table-column prop="spec" label="生产物料规格" />
+        <el-table-column prop="spec" label="生产物料规格" :min-width="flexWidth('spec',crud.data,'生产物料规格')"/>
         <el-table-column prop="inupperlimit_qty" label="设备来料仓上限数" :min-width="flexWidth('inupperlimit_qty',crud.data,'设备来料仓上限数')" />
         <el-table-column prop="inlowerlimit_qty" label="设备来料仓下限数" :min-width="flexWidth('inlowerlimit_qty',crud.data,'设备来料仓下限数')" />
         <el-table-column prop="outupperlimit_qty" label="设备产品仓上限数" :min-width="flexWidth('outupperlimit_qty',crud.data,'设备产品仓上限数')" />
@@ -181,9 +181,9 @@
         <el-table-column prop="is_used" :formatter="formatBoolean" label="是否启用"></el-table-column>
         <el-table-column prop="remark" label="备注" width="120px" show-overflow-tooltip />
         <el-table-column prop="create_name" label="创建人" />
-        <el-table-column prop="create_time" label="创建时间" width="120px" show-overflow-tooltip />
+        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
         <el-table-column prop="update_name" label="修改人" />
-        <el-table-column prop="update_time" label="修改时间" width="120px" show-overflow-tooltip />
+        <el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
             <udOperation