From 23337d86770663b64af9396ff4866fa0e31d5cba Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期四, 29 一月 2026 16:51:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/views/productionManagement/productionOrder/index.vue | 23 +++++++++++++++--------
src/views/salesManagement/salesLedger/index.vue | 24 +++++++++++++++---------
2 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/src/views/productionManagement/productionOrder/index.vue b/src/views/productionManagement/productionOrder/index.vue
index 4c09ac7..ece5ca6 100644
--- a/src/views/productionManagement/productionOrder/index.vue
+++ b/src/views/productionManagement/productionOrder/index.vue
@@ -239,13 +239,16 @@
// 娣诲姞琛ㄨ绫诲悕鏂规硶
const tableRowClassName = ({ row }) => {
- switch (row.deliveryDaysDiff) {
- case 15:
- return 'yellow'
- case 10:
- return 'red'
- case 2:
- return 'purple'
+ const diff = row.deliveryDaysDiff;
+
+ if (diff === 15) {
+ return 'yellow';
+ } else if (diff === 10) {
+ return 'pink';
+ } else if (diff === 2) {
+ return 'purple';
+ } else if (diff < 2) {
+ return 'red';
}
};
@@ -413,10 +416,14 @@
background-color: #FAF0DE;
}
-::v-deep .red {
+::v-deep .pink {
background-color: #FAE1DE;
}
+::v-deep .red {
+ background-color: #f80202;
+}
+
::v-deep .purple{
background-color: #F4DEFA;
}
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 457f0f1..170f8ed 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -1001,13 +1001,16 @@
// 娣诲姞琛ㄨ绫诲悕鏂规硶
const tableRowClassName = ({ row }) => {
- switch (row.deliveryDaysDiff) {
- case 15:
- return 'yellow'
- case 10:
- return 'red'
- case 2:
- return 'purple'
+ const diff = row.deliveryDaysDiff;
+
+ if (diff === 15) {
+ return 'yellow';
+ } else if (diff === 10) {
+ return 'pink';
+ } else if (diff === 2) {
+ return 'purple';
+ } else if (diff < 2) {
+ return 'red';
}
};
// 涓昏〃鍚堣鏂规硶
@@ -2111,14 +2114,17 @@
background-color: #FAF0DE;
}
-::v-deep .red {
+::v-deep .pink {
background-color: #FAE1DE;
+}
+
+::v-deep .red {
+ background-color: #f80202;
}
::v-deep .purple{
background-color: #F4DEFA;
}
-
.table_list {
margin-top: unset;
--
Gitblit v1.9.3