From dd3c199966931639b53abc17d9b097e8eda7adac Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Wed, 24 Jan 2024 17:56:07 +0800
Subject: [PATCH] =?UTF-8?q?0412=20=E6=96=B0=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/board/SeqNoForLiuHua.vue    | 18 +++++------
 .../modules/board/SeqNoForLiuHuaJiChu.vue     | 18 +++++------
 .../modules/board/thisWeekShipmentBoard.vue   | 22 +++++++-------
 .../modules/production/searchDailyPlan.vue    | 30 +++++++++++++++++--
 .../modules/production/soscheduleRouting.vue  | 14 +++++++++
 5 files changed, 69 insertions(+), 33 deletions(-)

diff --git a/src/views/modules/board/SeqNoForLiuHua.vue b/src/views/modules/board/SeqNoForLiuHua.vue
index 8d7aabe..24f4704 100644
--- a/src/views/modules/board/SeqNoForLiuHua.vue
+++ b/src/views/modules/board/SeqNoForLiuHua.vue
@@ -14,19 +14,11 @@
         border
         :row-class-name="tableRowClassName"
         style="width: 100%;">
-        <el-table-column
-          prop="site"
-          header-align="center"
-          align="left"
-          min-width="20"
-          style="font-size: 20px"
-          label="工厂">
-        </el-table-column>
         <el-table-column
           prop="seqNo"
           header-align="center"
           align="left"
-          min-width="20"
+          min-width="40"
           style="font-size: 20px"
           label="派工单号">
         </el-table-column>
@@ -152,6 +144,10 @@
     },
     methods: {
       tableRowClassName ({row, rowIndex}) {
+        if (row.outWorkFlag == 'N') {
+          return 'success-row'
+        }
+        return ''
       },
       search () {
         let inData= {number:this.pageIndex};
@@ -221,10 +217,12 @@
 
   .board2 .el-table .success-row {
     background: #1bb61b;
+    color: #f2f6fc;
   }
   .board2 .el-table .false-row {
     /*background: #cbcb14;*/
-    background: #db1212;
+    background-color: orangered;
+    color: #f2f6fc;
   }
   .board2 .el-table .yellow-row{
     background: #ffff00;
diff --git a/src/views/modules/board/SeqNoForLiuHuaJiChu.vue b/src/views/modules/board/SeqNoForLiuHuaJiChu.vue
index 396d918..91b65b6 100644
--- a/src/views/modules/board/SeqNoForLiuHuaJiChu.vue
+++ b/src/views/modules/board/SeqNoForLiuHuaJiChu.vue
@@ -14,19 +14,11 @@
         border
         :row-class-name="tableRowClassName"
         style="width: 100%;">
-        <el-table-column
-          prop="site"
-          header-align="center"
-          align="left"
-          min-width="17"
-          style="font-size: 20px"
-          label="工厂">
-        </el-table-column>
         <el-table-column
           prop="seqNo"
           header-align="center"
           align="left"
-          min-width="25"
+          min-width="40"
           style="font-size: 20px"
           label="派工单号">
         </el-table-column>
@@ -180,6 +172,10 @@
     },
     methods: {
       tableRowClassName ({row, rowIndex}) {
+        if (row.outWorkFlag == 'N') {
+          return 'success-row'
+        }
+        return ''
       },
       search () {
         let inData= {number:this.pageIndex};
@@ -249,10 +245,12 @@
 
   .board2 .el-table .success-row {
     background: #1bb61b;
+    color: #f2f6fc;
   }
   .board2 .el-table .false-row {
     /*background: #cbcb14;*/
-    background: #db1212;
+    background-color: orangered;
+    color: #f2f6fc;
   }
   .board2 .el-table .yellow-row{
     background: #ffff00;
diff --git a/src/views/modules/board/thisWeekShipmentBoard.vue b/src/views/modules/board/thisWeekShipmentBoard.vue
index 712e2f6..578374b 100644
--- a/src/views/modules/board/thisWeekShipmentBoard.vue
+++ b/src/views/modules/board/thisWeekShipmentBoard.vue
@@ -3,7 +3,7 @@
     <div style="text-align: center">
       <h1>本周发货看板</h1>
     </div>
-    <div class="board">
+    <div class="boardDel">
       <el-table
         cell-style="cc"
         :height="height"
@@ -17,7 +17,7 @@
           header-align="center"
           align="left"
           min-width="25"
-          label="客户简称">
+          label="客简">
         </el-table-column>
         <el-table-column
           prop="customerPONo"
@@ -39,7 +39,7 @@
           header-align="center"
           align="left"
           min-width="40"
-          label="要求发货日期">
+          label="要求日期">
         </el-table-column>
         <el-table-column
           prop="partSpec"
@@ -61,7 +61,7 @@
           header-align="center"
           align="left"
           min-width="30"
-          label="货运代理">
+          label="货代">
         </el-table-column>
         <el-table-column
           prop="enteredDate"
@@ -205,9 +205,9 @@
 </script>
 
 <style >
-  .board .el-table .cell {
+  .boardDel .el-table .cell {
     line-height: 13px;
-    font-size: 12px;
+    font-size: 14px;
     height: 13px;
     padding: 0px;
   }
@@ -215,13 +215,15 @@
   .el-table .cell, .el-table th div, .el-table--border td:first-child .cell, .el-table--border th:first-child .cell {
     padding-left: 0px;
   }
-  .board .el-table .success-row {
+  .boardDel .el-table .success-row {
     background: #1bb61b;
   }
-  .board .el-table .error-row {
+  .boardDel .el-table .error-row {
     background: #e5b655;
+    color: #f2f6fc;
   }
-  .board .el-table .false-row {
-    background: rgba(234, 99, 99, 0.99);
+  .boardDel .el-table .false-row {
+    background-color: orangered;
+    color: #f2f6fc;
   }
 </style>
diff --git a/src/views/modules/production/searchDailyPlan.vue b/src/views/modules/production/searchDailyPlan.vue
index 90d915c..ee21e30 100644
--- a/src/views/modules/production/searchDailyPlan.vue
+++ b/src/views/modules/production/searchDailyPlan.vue
@@ -106,21 +106,45 @@
         prop="orderQty"
         header-align="center"
         align="right"
-        min-width="50"
+        min-width="60"
+        label="计划数量">
+      </el-table-column>
+      <el-table-column
+        prop="partPlanQty"
+        header-align="center"
+        align="right"
+        min-width="60"
+        label="班产量">
+      </el-table-column>
+      <el-table-column
+        prop="shiftQty"
+        header-align="center"
+        align="right"
+        min-width="60"
+        label="计划班数">
+        <template slot-scope="scope">
+          {{scope.row.partPlanQty<=0?0:(scope.row.orderQty*1.0/scope.row.partPlanQty).toFixed(1)}}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="orderQty"
+        header-align="center"
+        align="right"
+        min-width="60"
         label="计划数量">
       </el-table-column>
       <el-table-column
         prop="weight"
         header-align="center"
         align="right"
-        min-width="50"
+        min-width="60"
         label="参考数量">
       </el-table-column>
       <el-table-column
         prop="qtyfinished"
         header-align="center"
         align="right"
-        min-width="50"
+        min-width="60"
         label="已完工数">
       </el-table-column>
       <el-table-column
diff --git a/src/views/modules/production/soscheduleRouting.vue b/src/views/modules/production/soscheduleRouting.vue
index 79c2883..222f7e5 100644
--- a/src/views/modules/production/soscheduleRouting.vue
+++ b/src/views/modules/production/soscheduleRouting.vue
@@ -219,6 +219,20 @@
         min-width="80"
         label="合格数量">
       </el-table-column>
+      <el-table-column
+        prop="workTime"
+        header-align="center"
+        align="right"
+        min-width="80"
+        label="工作时间(小时)">
+      </el-table-column>
+      <el-table-column
+        prop="efficiency"
+        header-align="center"
+        align="right"
+        min-width="80"
+        label="工作效率">
+      </el-table-column>
       <el-table-column
         prop="closedFlag"
         header-align="center"