From 86117a04eefaf5ff90ae1bba1e2e3fa017ad6b66 Mon Sep 17 00:00:00 2001
From: ldj_willow <ldj_willow@163.com>
Date: Sat, 27 Aug 2022 10:54:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=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/mps/produce/index.vue    | 25 ++++++++++---------
 mes/qd/src/views/wms/pcs/saleorder/index.vue  | 16 ++++++------
 .../src/views/wms/pdm/base/routing/index.vue  |  8 +++---
 mes/qd/src/views/wms/st/in/index.vue          |  4 +--
 mes/qd/src/views/wms/st/out/index.vue         |  2 +-
 5 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/mes/qd/src/views/wms/mps/produce/index.vue b/mes/qd/src/views/wms/mps/produce/index.vue
index 4552a483..4d250907 100644
--- a/mes/qd/src/views/wms/mps/produce/index.vue
+++ b/mes/qd/src/views/wms/mps/produce/index.vue
@@ -31,17 +31,6 @@
               class="filter-item"
             />
           </el-form-item>
-          <el-form-item label="生产日期">
-            <el-date-picker
-              v-model="query.createTime"
-              type="daterange"
-              value-format="yyyy-MM-dd"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00','23:59:59']"
-              @change="crud.toQuery"
-            />
-          </el-form-item>
           <el-form-item label="工单类型">
             <el-select
               v-model="query.order_type_scode"
@@ -59,6 +48,7 @@
               />
             </el-select>
           </el-form-item>
+
           <el-form-item label=" 工单状态">
             <el-select
               v-model="order_status"
@@ -81,6 +71,17 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="生产日期">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00','23:59:59']"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
           <el-form-item label="班次类型">
             <el-select
               v-model="query.shift_type_scode"
@@ -98,7 +99,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="产品系列">
+          <el-form-item label="产品系列" style="height: 20px;">
             <treeselect
               v-model="query.product_series"
               :options="classes3"
diff --git a/mes/qd/src/views/wms/pcs/saleorder/index.vue b/mes/qd/src/views/wms/pcs/saleorder/index.vue
index 72b0a1fb..531dc4ae 100644
--- a/mes/qd/src/views/wms/pcs/saleorder/index.vue
+++ b/mes/qd/src/views/wms/pcs/saleorder/index.vue
@@ -79,15 +79,15 @@
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
-        <el-table-column prop="sale_code" label="销售单号" />
+        <el-table-column prop="sale_code" label="销售单号" min-width="100" show-overflow-tooltip/>
         <el-table-column prop="seq_no" label="明细序号" />
-        <el-table-column prop="sale_type" label="销售单类型">
+        <el-table-column prop="sale_type" label="销售单类型" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ dict.label.PCS_SAL_TYPE[scope.row.sale_type] }}
           </template>
         </el-table-column>
         <el-table-column prop="material_code" label="物料编码" />
-        <el-table-column prop="material_name" label="物料名称" />
+        <el-table-column prop="material_name" label="物料名称" min-width="100" show-overflow-tooltip/>
         <el-table-column prop="status" label="状态">
           <template slot-scope="scope">
             {{ dict.label.PCS_SALE_STATUS[scope.row.status] }}
@@ -95,13 +95,13 @@
         </el-table-column>
         <el-table-column prop="sale_qty" label="销售数量" />
         <el-table-column prop="produce_seq" label="生产顺序" />
-        <el-table-column prop="cust_code" label="客户编码" />
-        <el-table-column prop="cust_name" 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="unit_name" label="计量单位" show-overflow-tooltip min-width="150"  />
-        <el-table-column prop="plandeliver_date" label="计划交期" />
+        <el-table-column prop="plandeliver_date" label="计划交期" min-width="100" show-overflow-tooltip/>
         <el-table-column prop="create_name" label="创建人" />
-        <el-table-column prop="create_time" label="创建时间" />
-        <el-table-column prop="update_time" 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 v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
             <udOperation
diff --git a/mes/qd/src/views/wms/pdm/base/routing/index.vue b/mes/qd/src/views/wms/pdm/base/routing/index.vue
index 042cb3c9..15353e9e 100644
--- a/mes/qd/src/views/wms/pdm/base/routing/index.vue
+++ b/mes/qd/src/views/wms/pdm/base/routing/index.vue
@@ -68,18 +68,18 @@
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55"/>
         <el-table-column v-if="false" prop="processroute_id" label="工艺路线标识"/>
-        <el-table-column prop="processroute_code" label="工艺路线编码">
+        <el-table-column prop="processroute_code" label="工艺路线编码" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.processroute_code }}</el-link>
           </template>
         </el-table-column>
-        <el-table-column prop="processroute_name" label="工艺路线名称"/>
+        <el-table-column prop="processroute_name" label="工艺路线名称" min-width="100" show-overflow-tooltip/>
         <el-table-column prop="processroute_status" label="状态" :formatter="formatStatus"/>
         <el-table-column prop="detail_count" label="工序数"/>
         <el-table-column prop="remark" label="备注"/>
-        <el-table-column prop="create_name" label="创建人姓名"/>
+        <el-table-column prop="create_name" label="创建人"/>
         <el-table-column prop="create_time" label="创建时间" width="150px"/>
-        <el-table-column prop="audit_optname" label="审核人姓名"/>
+        <el-table-column prop="audit_optname" label="审核人"/>
         <el-table-column prop="audit_time" label="审核时间" width="150px"/>
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
diff --git a/mes/qd/src/views/wms/st/in/index.vue b/mes/qd/src/views/wms/st/in/index.vue
index 57418fd6..1611f89c 100644
--- a/mes/qd/src/views/wms/st/in/index.vue
+++ b/mes/qd/src/views/wms/st/in/index.vue
@@ -426,7 +426,7 @@
         @select-all="onSelectAll"
       >
         <el-table-column :selectable="checkboxT" type="selection" width="55" />
-        <el-table-column prop="bill_code" label="单据编号" width="120">
+        <el-table-column prop="bill_code" label="单据编号" min-width="130" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-link type="warning" @click="lookUp(scope.row)">{{ scope.row.bill_code }}</el-link>
           </template>
@@ -442,7 +442,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="workprocedure_name" label="所属工序" width="90" />
-        <el-table-column prop="material_name" label="物料" width="200px" />
+        <el-table-column prop="material_name" label="物料"min-width="130" show-overflow-tooltip />
         <el-table-column prop="vehicle_code" label="载具编码" width="120px" />
         <el-table-column prop="pcsn" label="批次" />
         <el-table-column v-if="false" prop="mix_seq" label="黏次" />
diff --git a/mes/qd/src/views/wms/st/out/index.vue b/mes/qd/src/views/wms/st/out/index.vue
index ad8a4344..b395514c 100644
--- a/mes/qd/src/views/wms/st/out/index.vue
+++ b/mes/qd/src/views/wms/st/out/index.vue
@@ -338,7 +338,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="workprocedure_name" label="所属工序" width="90" />
-        <el-table-column prop="material_name" label="物料" width="200" />
+        <el-table-column prop="material_name" label="物料" min-width="130" show-overflow-tooltip />
         <el-table-column prop="vehicle_code" label="载具编码" width="200" />
         <el-table-column prop="pcsn" label="批次" />
         <el-table-column prop="mix_seq" label="黏次" />