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 @@ @@ -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 @@ @@ -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 @@