From 43c313bb57da586fe381e149307009ec88cb6c1d Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Thu, 24 Aug 2023 13:46:39 +0800
Subject: [PATCH] 66

---
 src/views/modules/board/SORoutingBoard.vue |  4 ++--
 src/views/modules/board/scheduledBoard.vue |  2 +-
 src/views/modules/board/shopOrderBoard.vue | 20 +++++++++++++-------
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/views/modules/board/SORoutingBoard.vue b/src/views/modules/board/SORoutingBoard.vue
index ed13af8..ec3682b 100644
--- a/src/views/modules/board/SORoutingBoard.vue
+++ b/src/views/modules/board/SORoutingBoard.vue
@@ -98,7 +98,7 @@
       </el-table>
       <el-table
         cell-style="cc"
-        height="140"
+        height="99"
         :data="tableData2"
         ref="wt_table"
         border
@@ -193,7 +193,7 @@
     },
     mounted () {
       this.$nextTick(() => {
-        this.height = window.innerHeight - 221
+        this.height = window.innerHeight - 172
       })
       // this.autoRoll()
     },
diff --git a/src/views/modules/board/scheduledBoard.vue b/src/views/modules/board/scheduledBoard.vue
index 7d8b5b4..bd478a2 100644
--- a/src/views/modules/board/scheduledBoard.vue
+++ b/src/views/modules/board/scheduledBoard.vue
@@ -227,7 +227,7 @@
 
               this.option = ({
                   title: [{
-                      text: '总生产情况\nProduction State' ,
+                      text: '总生产情况\nProduction Status' ,
                       // text: '工序：' + data_temp[i + x].itemNo,
                       // x 设置水平安放位置，默认左对齐，可选值：'center' ¦ 'left' ¦ 'right' ¦ {number}（x坐标，单位px）
                       x: 'center',
diff --git a/src/views/modules/board/shopOrderBoard.vue b/src/views/modules/board/shopOrderBoard.vue
index 6a4b87d..2c867fa 100644
--- a/src/views/modules/board/shopOrderBoard.vue
+++ b/src/views/modules/board/shopOrderBoard.vue
@@ -27,7 +27,7 @@
         <el-table-column
           prop="customerID"
           header-align="center"
-          align="left"
+          align="center"
           min-width="60"
           label="客户编码">
         </el-table-column>
@@ -41,7 +41,7 @@
         <el-table-column
           prop="partNo"
           header-align="center"
-          align="left"
+          align="center"
           min-width="60"
           label="物料编码">
         </el-table-column>
@@ -51,6 +51,9 @@
           align="right"
           min-width="60"
           label="订单数量">
+          <template slot-scope="scope">
+            {{scope.row.lotSize}}&nbsp
+          </template>
         </el-table-column>
         <el-table-column
           prop="finishedQty"
@@ -58,6 +61,9 @@
           align="right"
           min-width="60"
           label="入库数量">
+          <template slot-scope="scope">
+            {{scope.row.finishedQty}}&nbsp
+          </template>
         </el-table-column>
         <el-table-column
           prop="percentQty"
@@ -66,7 +72,7 @@
           min-width="60"
           label="完成比例">
           <template slot-scope="scope">
-            {{scope.row.percentQty}}%
+            {{scope.row.percentQty}}%&nbsp
           </template>
         </el-table-column>
         <el-table-column
@@ -79,7 +85,7 @@
       </el-table>
       <el-table
         cell-style="cc"
-        height="140"
+        height="99"
         :data="tableData2"
         ref="wt_table"
         border
@@ -101,7 +107,7 @@
         <el-table-column
           prop="partNo"
           header-align="center"
-          align="left"
+          align="center"
           width="100"
           label="物料编码">
         </el-table-column>
@@ -122,7 +128,7 @@
         <el-table-column
           prop="status"
           header-align="center"
-          align="left"
+          align="center"
           width="60"
           label="状态">
         </el-table-column>
@@ -171,7 +177,7 @@
     },
     mounted () {
       this.$nextTick(() => {
-        this.height = window.innerHeight - 221
+        this.height = window.innerHeight - 172
       })
       // this.autoRoll()
     },