From 8e4a75021851b487dbfb35b2f86a4c17b4862de9 Mon Sep 17 00:00:00 2001
From: ldj_willow <ldj_willow@163.com>
Date: Tue, 25 Oct 2022 11:13:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/pdm/order/rawfoilworkorder/index.vue  | 10 +++----
 .../wms/pdm/order/slittingplan/index.vue      | 30 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue b/lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue
index 17c4f3726..293f4f21e 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue
@@ -145,15 +145,15 @@
       >
         <el-table-column type="selection" width="55" />
         <el-table-column v-if="false" prop="workorder_id" label="工单标识" />
-        <el-table-column prop="mfg_order_name" label="工单号" min-width="120" show-overflow-tooltip/>
+        <el-table-column prop="mfg_order_name" label="工单号" min-width="120" show-overflow-tooltip />
         <el-table-column prop="status" label="工单状态" :formatter="formatStatusName" />
-        <el-table-column prop="container_name" label="母卷号" min-width="120" show-overflow-tooltip/>
-        <el-table-column prop="resource_name" label="机台编码" min-width="100" show-overflow-tooltip/>
-        <el-table-column prop="product_name" label="产品编码" min-width="150" show-overflow-tooltip/>
+        <el-table-column prop="container_name" label="母卷号" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="resource_name" label="机台编码" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="product_name" label="产品编码" min-width="150" show-overflow-tooltip />
         <el-table-column prop="theory_height" label="理论长度" />
         <el-table-column prop="realstart_time" label="开始时间" width="150px" />
         <el-table-column prop="realend_time" label="结束时间" width="150px" />
-        <el-table-column prop="productin_qty" label="重量" :formatter="crud.formatNum3"/>
+        <el-table-column prop="productin_qty" label="重量" :formatter="crud.formatNum3" />
         <el-table-column prop="agvno" label="车号" />
         <el-table-column prop="product_area" label="生产区域" />
         <el-table-column prop="update_time" label="更新时间" width="150px" />
diff --git a/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue b/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue
index e20b3e850..2aa815bdc 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue
@@ -205,28 +205,28 @@
       <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="workorder_id" label="分切计划标识" />
-        <el-table-column prop="status" label="状态" :formatter="formatStatusName"/>
-        <el-table-column prop="order_type" label="订单类型" :formatter="formatTypeName"/>
-        <el-table-column prop="mfg_order_name" label="订单号" min-width="140" show-overflow-tooltip/>
-        <el-table-column prop="container_name" label="子卷号" min-width="140" show-overflow-tooltip/>
-        <el-table-column prop="parent_container_name" label="母卷号" min-width="120" show-overflow-tooltip/>
+        <el-table-column prop="status" label="状态" :formatter="formatStatusName" />
+        <el-table-column prop="order_type" label="订单类型" :formatter="formatTypeName" />
+        <el-table-column prop="mfg_order_name" label="订单号" min-width="140" show-overflow-tooltip />
+        <el-table-column prop="container_name" label="子卷号" min-width="140" show-overflow-tooltip />
+        <el-table-column prop="parent_container_name" label="母卷号" min-width="120" show-overflow-tooltip />
         <el-table-column prop="ware_house" label="来源位置" :formatter="formatHouseName" width="120px" />
-        <el-table-column prop="restruct_container_name" label="改制来源子卷号" width="120px"/>
+        <el-table-column prop="restruct_container_name" label="改制来源子卷号" width="120px" />
         <el-table-column prop="package_box_sn" label="改制来源子卷木箱号" width="150px" />
-        <el-table-column prop="resource_name" label="机台编码" min-width="110" show-overflow-tooltip/>
-        <el-table-column prop="product_name" label="产品编码" min-width="130" show-overflow-tooltip/>
+        <el-table-column prop="resource_name" label="机台编码" min-width="110" show-overflow-tooltip />
+        <el-table-column prop="product_name" label="产品编码" min-width="130" show-overflow-tooltip />
         <el-table-column prop="product_area" label="生产区域" />
         <el-table-column prop="split_group" label="分切组" />
         <el-table-column prop="manufacture_sort" label="生产顺序" />
         <el-table-column prop="manufacture_date" label="生产日期" width="120px" />
-        <el-table-column prop="split_breadth" label="子卷幅宽"  :formatter="crud.formatNum3"/>
-        <el-table-column prop="split_height" label="子卷理论长度" width="100px"  :formatter="crud.formatNum3"/>
-        <el-table-column prop="split_weight" label="子卷理论重量" width="100px"  :formatter="crud.formatNum3"/>
+        <el-table-column prop="split_breadth" label="子卷幅宽" :formatter="crud.formatNum3" />
+        <el-table-column prop="split_height" label="子卷理论长度" width="100px" :formatter="crud.formatNum3" />
+        <el-table-column prop="split_weight" label="子卷理论重量" width="100px" :formatter="crud.formatNum3" />
         <el-table-column prop="paper_tube_or_frp" label="管件类型" :formatter="formatTubeName" />
         <el-table-column prop="paper_tube_material" label="纸筒物料编码" min-width="140" show-overflow-tooltip />
         <el-table-column prop="paper_tube_description" label="纸筒物料描述" width="120px" />
-        <el-table-column prop="paper_tube_model" label="纸筒规格" min-width="140" show-overflow-tooltip/>
-        <el-table-column prop="frp_material" label="FRP管物料编码" min-width="140" show-overflow-tooltip/>
+        <el-table-column prop="paper_tube_model" label="纸筒规格" min-width="140" show-overflow-tooltip />
+        <el-table-column prop="frp_material" label="FRP管物料编码" min-width="140" show-overflow-tooltip />
         <el-table-column prop="frp_description" label="FRP管物料描述" min-width="140" show-overflow-tooltip />
         <el-table-column prop="frp_model" label="FRP管规格" min-width="140" show-overflow-tooltip />
         <el-table-column prop="is_parent_ok" label="母卷上料完成" width="100px" :formatter="formatParentName" />
@@ -234,7 +234,7 @@
         <el-table-column prop="is_child_ps_ok" label="子卷配送完成" width="100px" :formatter="formatChildPsName" />
         <el-table-column prop="start_time" label="开始时间" width="150px" />
         <el-table-column prop="end_time" label="结束时间" width="150px" />
-  <!--      <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
+        <!--      <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
             <udOperation
               :data="scope.row"
@@ -244,7 +244,7 @@
         </el-table-column>-->
       </el-table>
       <!--分页组件-->
-      <pagination/>
+      <pagination />
     </div>
   </div>
 </template>