From 46be6eb2f2984f64f7525edbfddf03b03e0770e2 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Tue, 24 Jun 2025 17:58:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../emis/emisWaybill/centerWaybillList.vue | 18 +++++++++++----
.../emis/emisWaybill/dispatchWaybillList.vue | 19 +++++++++++-----
.../emis/emisWaybill/sendWaybillList.vue | 22 +++++++++++--------
.../emis/emisWaybill/sendWaybillListNew.vue | 17 ++++++++++----
.../emisWaybill/waybillDetailReadOnly.vue | 4 ++--
5 files changed, 56 insertions(+), 24 deletions(-)
diff --git a/src/views/emis/emisWaybill/centerWaybillList.vue b/src/views/emis/emisWaybill/centerWaybillList.vue
index cc62b38a..e468c616 100644
--- a/src/views/emis/emisWaybill/centerWaybillList.vue
+++ b/src/views/emis/emisWaybill/centerWaybillList.vue
@@ -1,6 +1,6 @@
-
+
@@ -558,9 +558,8 @@
- {{scope.row.remark }}{{ scope.row.remark && scope.row.remark.trim()!=='' && scope.row.virtualRemark && scope.row.virtualRemark.trim()!==''?',':'' }}该运单为主单，对应虚拟单为{{ conCatVirtualRemark(scope.row.virtualRemark) }}
-
-
+ {{remarkFormat(scope.row)}}
+
@@ -913,6 +912,17 @@ export default {
}).join(',');
}
},
+ //格式化录单备注显示
+ remarkFormat(row){
+ let remark=row.remark;
+ if(row.blVirtual==0 && row.virtualRemark!=='' && row.virtualRemark!== null&& row.transLineType ==='002'&& row.sendDate > '2025-06-23 20:00:00'){
+ if(remark && remark.trim()!==''){
+ remark=remark+','
+ }
+ remark=`${remark}该运单为主单，对应虚拟单为${this.conCatVirtualRemark(row.virtualRemark)}`;
+ }
+ return remark;
+ },
rowKey (row) {
return row.id;
},
diff --git a/src/views/emis/emisWaybill/dispatchWaybillList.vue b/src/views/emis/emisWaybill/dispatchWaybillList.vue
index 2f0ec86c..55a5c210 100644
--- a/src/views/emis/emisWaybill/dispatchWaybillList.vue
+++ b/src/views/emis/emisWaybill/dispatchWaybillList.vue
@@ -1,6 +1,6 @@
-
+
@@ -557,10 +557,8 @@
- {{scope.row.remark }}{{ scope.row.remark && scope.row.remark.trim()!=='' && scope.row.virtualRemark && scope.row.virtualRemark.trim()!==''?',':'' }}该运单为主单，对应虚拟单为{{ conCatVirtualRemark(scope.row.virtualRemark) }}
-
-
-
+ {{ remarkFormat(scope.row) }}
+
@@ -892,6 +890,17 @@ export default {
}).join(',');
}
},
+ //格式化录单备注显示
+ remarkFormat(row){
+ let remark=row.remark;
+ if(row.blVirtual==0 && row.virtualRemark!=='' && row.virtualRemark!== null&& row.transLineType ==='002'&& row.sendDate > '2025-06-23 20:00:00'){
+ if(remark && remark.trim()!==''){
+ remark=remark+','
+ }
+ remark=`${remark}该运单为主单，对应虚拟单为${this.conCatVirtualRemark(row.virtualRemark)}`;
+ }
+ return remark;
+ },
rowKey (row) {
return row.id;
},
diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue
index 82f17d31..b1592c05 100644
--- a/src/views/emis/emisWaybill/sendWaybillList.vue
+++ b/src/views/emis/emisWaybill/sendWaybillList.vue
@@ -1,7 +1,7 @@
-
+
@@ -524,8 +524,7 @@
- {{scope.row.remark }}{{ scope.row.remark && scope.row.remark.trim()!=='' && scope.row.virtualRemark && scope.row.virtualRemark.trim()!==''?',':'' }}该运单为主单，对应虚拟单为{{ conCatVirtualRemark(scope.row.virtualRemark)}}
-
+ {{ remarkFormat(scope.row) }}
@@ -540,12 +539,6 @@
-
-
- 是
- 否
-
-
@@ -932,6 +925,17 @@ export default {
}).join(',');
}
},
+ //格式化录单备注显示
+ remarkFormat(row){
+ let remark=row.remark;
+ if(row.blVirtual==0 && row.virtualRemark!=='' && row.virtualRemark!== null&& row.transLineType ==='002'&& row.sendDate > '2025-06-23 20:00:00'){
+ if(remark && remark.trim()!==''){
+ remark=remark+','
+ }
+ remark=`${remark}该运单为主单，对应虚拟单为${this.conCatVirtualRemark(row.virtualRemark)}`;
+ }
+ return remark;
+ },
rowKey (row) {
return row.id;
},
diff --git a/src/views/emis/emisWaybill/sendWaybillListNew.vue b/src/views/emis/emisWaybill/sendWaybillListNew.vue
index d62ef02e..482237a1 100644
--- a/src/views/emis/emisWaybill/sendWaybillListNew.vue
+++ b/src/views/emis/emisWaybill/sendWaybillListNew.vue
@@ -2,7 +2,7 @@
-
+
@@ -530,9 +530,7 @@
- {{scope.row.remark }}{{ scope.row.remark && scope.row.remark.trim()!=='' && scope.row.virtualRemark && scope.row.virtualRemark.trim()!==''?',':'' }}该运单为主单，对应虚拟单为{{ conCatVirtualRemark(scope.row.virtualRemark) }}
-
-
+ {{ remarkFormat(scope.row) }}
@@ -883,6 +881,17 @@ export default {
}).join(',');
}
},
+ //格式化录单备注显示
+ remarkFormat(row){
+ let remark=row.remark;
+ if(row.blVirtual==0 && row.virtualRemark!=='' && row.virtualRemark!== null&& row.transLineType ==='002'&& row.sendDate > '2025-06-23 20:00:00'){
+ if(remark && remark.trim()!==''){
+ remark=remark+','
+ }
+ remark=`${remark}该运单为主单，对应虚拟单为${this.conCatVirtualRemark(row.virtualRemark)}`;
+ }
+ return remark;
+ },
rowKey (row) {
return row.id;
},
diff --git a/src/views/emis/emisWaybill/waybillDetailReadOnly.vue b/src/views/emis/emisWaybill/waybillDetailReadOnly.vue
index 634ee97d..eac4c130 100644
--- a/src/views/emis/emisWaybill/waybillDetailReadOnly.vue
+++ b/src/views/emis/emisWaybill/waybillDetailReadOnly.vue
@@ -233,8 +233,8 @@
- {{form.remark }} {{ form.remark && form.remark.trim()!=='' && form.virtualRemark && form.virtualRemark.trim()!==''?',':'' }}
- 该运单为主单，对应虚拟单为{{ conCatVirtualRemark(form.virtualRemark) }}
+ {{form.remark }} {{ form.remark && form.remark.trim()!=='' && form.virtualRemark && form.virtualRemark.trim()!=='' && form.transLine==='002' && form.sendDate > '2025-06-23 20:00:00'?',':'' }}
+ 该运单为主单，对应虚拟单为{{ conCatVirtualRemark(form.virtualRemark) }}