From 677259cd253b9734e80626fa6d9fda9074dd908f Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 3 Mar 2025 14:21:47 +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/assets/scss/rq.scss                       |  3 +++
 src/views/modules/print/print_liuhua_card.js  |  6 ++---
 src/views/modules/production/dailyPlan.vue    | 22 ++++++++++++++++---
 .../modules/production/scheduleForSOTask.vue  | 11 +++++++++-
 .../production/scheduleForShopOrder.vue       | 10 +++++++++
 .../production/scheduleForVPShopOrder.vue     | 11 +++++++++-
 6 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/src/assets/scss/rq.scss b/src/assets/scss/rq.scss
index 22c3a3a..2acb4be 100644
--- a/src/assets/scss/rq.scss
+++ b/src/assets/scss/rq.scss
@@ -62,3 +62,6 @@
 .redModel .el-form-item__label {
   font-weight:bold;color:#bd0b06
 }
+.el-table .yellow-row {
+  background: #e7e756;
+}
diff --git a/src/views/modules/print/print_liuhua_card.js b/src/views/modules/print/print_liuhua_card.js
index 35d15fa..a9ebdb4 100644
--- a/src/views/modules/print/print_liuhua_card.js
+++ b/src/views/modules/print/print_liuhua_card.js
@@ -87,7 +87,7 @@ export function printCardLabel(printList) {
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(64,379,80,25,"产品颜色:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(64,539,90,25,"外购件批号:");
+      LODOP.ADD_PRINT_TEXT(64,539,90,25,"催化剂类型:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(86,4,85,25,"原材料型号:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
@@ -235,8 +235,8 @@ export function printCardLabel(printList) {
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(63,462,85,20,printData.cpys);//产品颜色
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      // LODOP.ADD_PRINT_TEXT(63,615,105,25,"外购件批号");//外购件批号
-      // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.ADD_PRINT_TEXT(63,615,105,25,printData.chjlt);//催化剂类型
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(86,82,120,20,printData.yclxh);//原材料型号
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(87,283,105,25,printData.hljyd);//混炼胶硬度
diff --git a/src/views/modules/production/dailyPlan.vue b/src/views/modules/production/dailyPlan.vue
index 52f0b1b..bb0091e 100644
--- a/src/views/modules/production/dailyPlan.vue
+++ b/src/views/modules/production/dailyPlan.vue
@@ -102,6 +102,7 @@
     <el-table
       :height="height"
       :data="tableData"
+      :row-class-name="tableRowClassName"
       border
       style="width: 100%">
       <el-table-column
@@ -118,14 +119,14 @@
         prop="site"
         header-align="center"
         align="left"
-        min-width="60"
+        min-width="40"
         label="工厂编码">
       </el-table-column>
       <el-table-column
         prop="orderNo"
         header-align="center"
         align="left"
-        min-width="60"
+        min-width="70"
         label="订单号">
       </el-table-column>
       <el-table-column
@@ -146,7 +147,7 @@
         prop="partDescription"
         header-align="center"
         align="left"
-        min-width="200"
+        min-width="140"
         label="物料名称">
       </el-table-column>
       <el-table-column
@@ -177,6 +178,13 @@
         min-width="40"
         label="订单数量">
       </el-table-column>
+      <el-table-column
+        prop="weightFactor"
+        header-align="center"
+        align="right"
+        min-width="40"
+        label="产品净重">
+      </el-table-column>
       <el-table-column
         prop="weight"
         header-align="center"
@@ -860,6 +868,14 @@
           this.scheduledingsData.qty=''
         }
       },
+      tableRowClassName ({row, rowIndex}) {
+
+        if (row.orderTypeDesc==='加急订单'||row.orderTypeDesc==='变更订单') {
+          return 'yellow-row'
+        }
+
+        return ''
+      },
     },
     created () {
 
diff --git a/src/views/modules/production/scheduleForSOTask.vue b/src/views/modules/production/scheduleForSOTask.vue
index 91effb1..055834a 100644
--- a/src/views/modules/production/scheduleForSOTask.vue
+++ b/src/views/modules/production/scheduleForSOTask.vue
@@ -285,6 +285,13 @@
         min-width="80"
         label="订单数量">
       </el-table-column>
+      <el-table-column
+        prop="weightFactor"
+        header-align="center"
+        align="right"
+        min-width="80"
+        label="产品净重">
+      </el-table-column>
       <el-table-column
         prop="weight"
         header-align="center"
@@ -989,7 +996,9 @@
         }
       },
       tableRowClassName ({row, rowIndex}) {
-
+        if (row.orderTypeDesc==='加急订单'||row.orderTypeDesc==='变更订单') {
+          return 'yellow-row'
+        }
         if (row.lastStartDate == this.dayjs().format('YYYY-MM-DD')) {
           return 'success-row'
         }
diff --git a/src/views/modules/production/scheduleForShopOrder.vue b/src/views/modules/production/scheduleForShopOrder.vue
index 3604793..e188579 100644
--- a/src/views/modules/production/scheduleForShopOrder.vue
+++ b/src/views/modules/production/scheduleForShopOrder.vue
@@ -251,6 +251,13 @@
         width="80"
         label="订单数量">
       </el-table-column>
+      <el-table-column
+        prop="weightFactor"
+        header-align="center"
+        align="right"
+        min-width="80"
+        label="产品净重">
+      </el-table-column>
       <el-table-column
         prop="weight"
         header-align="center"
@@ -1017,6 +1024,9 @@
       },
       tableRowClassName ({row, rowIndex}) {
 
+        if (row.orderTypeDesc==='加急订单'||row.orderTypeDesc==='变更订单') {
+          return 'yellow-row'
+        }
         if (row.lastStartDate == this.dayjs().format('YYYY-MM-DD')) {
           return 'success-row'
         }
diff --git a/src/views/modules/production/scheduleForVPShopOrder.vue b/src/views/modules/production/scheduleForVPShopOrder.vue
index 9ab8ff0..e39e97d 100644
--- a/src/views/modules/production/scheduleForVPShopOrder.vue
+++ b/src/views/modules/production/scheduleForVPShopOrder.vue
@@ -162,6 +162,13 @@
         min-width="100"
         label="组合件需求数量">
       </el-table-column>
+      <el-table-column
+        prop="weightFactor"
+        header-align="center"
+        align="right"
+        min-width="80"
+        label="组合件净重">
+      </el-table-column>
       <el-table-column
         prop="weight"
         header-align="center"
@@ -813,7 +820,9 @@
 
       },
       tableRowClassName ({row, rowIndex}) {
-
+        if (row.orderTypeDesc==='加急订单'||row.orderTypeDesc==='变更订单') {
+          return 'yellow-row'
+        }
         if (row.lastStartDate == this.dayjs().format('YYYY-MM-DD')) {
           return 'success-row'
         }