From 350e05dc3d4e08e0a2f9056e512275714d325181 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 10 七月 2024 17:20:31 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue
index 058fa8f..44f5408 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue
@@ -254,7 +254,12 @@
const projectArray=[];
for (let i=0;i<selectRecords.length;i++){
customerIdArray.push(selectRecords[i].customerId)
- projectArray.push(selectRecords[i].project)
+ if(selectRecords[i].project.trim.length===0){
+ projectArray.push(selectRecords[i].project.trim)
+ }else{
+ projectArray.push(selectRecords[i].project)
+ }
+
if(i+1===selectRecords.length){
order_id+=selectRecords[i].orderId
}else{
@@ -267,6 +272,7 @@
return
}
//鍒ゆ柇鎵�閫夐」鐩槸鍚︾浉鍚�
+ console.log(projectArray)
if(!isAllEqual(projectArray)){
ElMessage.warning(t('delivery.pleaseSelectTheSameCustomerProject'))
return
--
Gitblit v1.8.0