From a4057a4ccd9d0da5f7dc7b5f75b552a06ce8bb30 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 15 四月 2026 16:23:32 +0800
Subject: [PATCH] fix:发货分批发货
---
src/views/customerService/feedbackRegistration/components/formDia.vue | 9 +++++++--
src/views/salesManagement/salesLedger/index.vue | 9 +++++++--
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/views/customerService/feedbackRegistration/components/formDia.vue b/src/views/customerService/feedbackRegistration/components/formDia.vue
index 2af71da..4ca2d0f 100644
--- a/src/views/customerService/feedbackRegistration/components/formDia.vue
+++ b/src/views/customerService/feedbackRegistration/components/formDia.vue
@@ -318,6 +318,9 @@
if (row.shippingDate || row.shippingCarNumber) {
return '宸插彂璐�'
}
+ if (row.shippingStatus === '鍙戣揣涓�') {
+ return '鍙戣揣涓�'
+ }
const status = row.shippingStatus
if (status === null || status === undefined || status === '') {
return '寰呭彂璐�'
@@ -328,7 +331,8 @@
'瀹℃牳涓�': '瀹℃牳涓�',
'瀹℃牳鎷掔粷': '瀹℃牳鎷掔粷',
'瀹℃牳閫氳繃': '瀹℃牳閫氳繃',
- '宸插彂璐�': '宸插彂璐�'
+ '宸插彂璐�': '宸插彂璐�',
+ '鍙戣揣涓�': '鍙戣揣涓�'
}
return map[String(status).trim()] || '寰呭彂璐�'
}
@@ -348,7 +352,8 @@
'瀹℃牳涓�': 'warning',
'瀹℃牳鎷掔粷': 'danger',
'瀹℃牳閫氳繃': 'success',
- '宸插彂璐�': 'success'
+ '宸插彂璐�': 'success',
+ '鍙戣揣涓�': 'success'
}
return map[String(status).trim()] || 'info'
}
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 3044402..569cdb1 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -2202,6 +2202,9 @@
*/
const getShippingStatusText = (row) => {
// 濡傛灉宸插彂璐э紙鏈夊彂璐ф棩鏈熸垨杞︾墝鍙凤級锛屾樉绀�"宸插彂璐�"
+ if(row.shippingStatus === '鍙戣揣涓�') {
+ return '鍙戣揣涓�';
+ }
if (row.shippingDate || row.shippingCarNumber) {
return '宸插彂璐�';
}
@@ -2222,7 +2225,8 @@
'瀹℃牳涓�': '瀹℃牳涓�',
'瀹℃牳鎷掔粷': '瀹℃牳鎷掔粷',
'瀹℃牳閫氳繃': '瀹℃牳閫氳繃',
- '宸插彂璐�': '宸插彂璐�'
+ '宸插彂璐�': '宸插彂璐�',
+ '鍙戣揣涓�': '鍙戣揣涓�'
};
return statusTextMap[statusStr] || '寰呭彂璐�';
};
@@ -2253,7 +2257,8 @@
'瀹℃牳涓�': 'warning',
'瀹℃牳鎷掔粷': 'danger',
'瀹℃牳閫氳繃': 'success',
- '宸插彂璐�': 'success'
+ '宸插彂璐�': 'success',
+ '鍙戣揣涓�': 'success',
};
return typeTextMap[statusStr] || 'info';
};
--
Gitblit v1.9.3