From 486d0d28d8a3426e58368f9ade6a9a4e9519748b Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Mon, 23 Jun 2025 18:21:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E6=B3=A8=E8=B0=83=E6=95=B4=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=90=8E6=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/emis/emisWaybill/centerWaybillList.vue   | 12 ++++++++++--
 src/views/emis/emisWaybill/dispatchWaybillList.vue | 12 ++++++++++--
 src/views/emis/emisWaybill/sendWaybillList.vue     | 12 ++++++++++--
 src/views/emis/emisWaybill/sendWaybillListNew.vue  | 12 ++++++++++--
 4 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/src/views/emis/emisWaybill/centerWaybillList.vue b/src/views/emis/emisWaybill/centerWaybillList.vue
index 834ee62b..cc62b38a 100644
--- a/src/views/emis/emisWaybill/centerWaybillList.vue
+++ b/src/views/emis/emisWaybill/centerWaybillList.vue
@@ -558,7 +558,7 @@
         <el-table-column :label="$t('录单网点')" align="center" prop="registerSiteName" min-width="80" :show-overflow-tooltip="true" />
         <el-table-column :label="$t('录单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true" >
           <template slot-scope="scope">
-              {{scope.row.remark }}{{ scope.row.remark && scope.row.remark.trim()!=='' && scope.row.virtualRemark && scope.row.virtualRemark.trim()!==''?',':'' }}<span v-if="scope.row.blVirtual==0 && scope.row.virtualRemark!=='' && scope.row.virtualRemark!== null ">该运单为主单，对应虚拟单为{{ scope.row.virtualRemark }}
+              {{scope.row.remark }}{{ scope.row.remark && scope.row.remark.trim()!=='' && scope.row.virtualRemark && scope.row.virtualRemark.trim()!==''?',':'' }}<span v-if="scope.row.blVirtual==0 && scope.row.virtualRemark!=='' && scope.row.virtualRemark!== null ">该运单为主单，对应虚拟单为{{ conCatVirtualRemark(scope.row.virtualRemark) }}
               </span>
             </template>
           </el-table-column>
@@ -581,7 +581,7 @@
           </template>
         </el-table-column>
         <el-table-column :label="$t('主单号')" align="center" prop="masterBillCode" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('虚拟单备注')" align="center" prop="virtualRemark" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('主单对应的虚拟单')" align="center" prop="virtualRemark" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('始发网点')" align="center" prop="startSiteName" min-width="80" :show-overflow-tooltip="true"/>
     </XdTable>
 
@@ -905,6 +905,14 @@ export default {
     this.dateTimeRange=[start,end];
   },
   methods: {
+      //拼接虚拟单后6位
+    conCatVirtualRemark(virtualRemark) {
+      if (virtualRemark != null) {
+        return virtualRemark.split(',').map((item) => {
+          return item.substring(item.length - 6);
+        }).join(',');
+      }
+    },
     rowKey (row) {
       return row.id;
     },
diff --git a/src/views/emis/emisWaybill/dispatchWaybillList.vue b/src/views/emis/emisWaybill/dispatchWaybillList.vue
index 16535cd1..2f0ec86c 100644
--- a/src/views/emis/emisWaybill/dispatchWaybillList.vue
+++ b/src/views/emis/emisWaybill/dispatchWaybillList.vue
@@ -557,7 +557,8 @@
         <el-table-column :label="$t('录单网点')" align="center" prop="registerSiteName" min-width="80" :show-overflow-tooltip="true" />
         <el-table-column :label="$t('录单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true" >
          <template slot-scope="scope">
-            {{scope.row.remark }}{{ scope.row.remark && scope.row.remark.trim()!=='' && scope.row.virtualRemark && scope.row.virtualRemark.trim()!==''?',':'' }}<span v-if="scope.row.blVirtual==0 && scope.row.virtualRemark!=='' && scope.row.virtualRemark!== null ">该运单为主单，对应虚拟单为{{ scope.row.virtualRemark }}
+            {{scope.row.remark }}{{ scope.row.remark && scope.row.remark.trim()!=='' && scope.row.virtualRemark && scope.row.virtualRemark.trim()!==''?',':'' }}<span v-if="scope.row.blVirtual==0 && scope.row.virtualRemark!=='' && scope.row.virtualRemark!== null ">该运单为主单，对应虚拟单为{{ conCatVirtualRemark(scope.row.virtualRemark) }}
+
             </span>
           </template>
         </el-table-column>  
@@ -581,7 +582,7 @@
           </template>
         </el-table-column>
         <el-table-column :label="$t('主单号')" align="center" prop="masterBillCode" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('虚拟单备注')" align="center" prop="virtualRemark" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('主单对应的虚拟单')" align="center" prop="virtualRemark" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('始发网点')" align="center" prop="startSiteName" min-width="80" :show-overflow-tooltip="true"/>
     </XdTable>
 
@@ -884,6 +885,13 @@ export default {
 
   },
   methods: {
+     conCatVirtualRemark(virtualRemark) {
+      if (virtualRemark != null) {
+        return virtualRemark.split(',').map((item) => {
+          return item.substring(item.length - 6);
+        }).join(',');
+      }
+    },
     rowKey (row) {
       return row.id;
     },
diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue
index cc6ce913..82f17d31 100644
--- a/src/views/emis/emisWaybill/sendWaybillList.vue
+++ b/src/views/emis/emisWaybill/sendWaybillList.vue
@@ -524,7 +524,7 @@
         <el-table-column :label="$t('录单网点')" align="center" prop="registerSiteName" min-width="80" :show-overflow-tooltip="true" />
         <el-table-column :label="$t('录单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            {{scope.row.remark }}{{ scope.row.remark && scope.row.remark.trim()!=='' && scope.row.virtualRemark && scope.row.virtualRemark.trim()!==''?',':'' }}<span v-if="scope.row.blVirtual==0 && scope.row.virtualRemark!=='' && scope.row.virtualRemark!== null ">该运单为主单，对应虚拟单为{{ scope.row.virtualRemark }}
+            {{scope.row.remark }}{{ scope.row.remark && scope.row.remark.trim()!=='' && scope.row.virtualRemark && scope.row.virtualRemark.trim()!==''?',':'' }}<span v-if="scope.row.blVirtual==0 && scope.row.virtualRemark!=='' && scope.row.virtualRemark!== null ">该运单为主单，对应虚拟单为{{ conCatVirtualRemark(scope.row.virtualRemark)}}
             </span>
           </template>
         </el-table-column>
@@ -547,7 +547,7 @@
           </template>
         </el-table-column>
         <el-table-column :label="$t('主单号')" align="center" prop="masterBillCode" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('虚拟单备注')" align="center" prop="virtualRemark" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('主单对应的虚拟单')" align="center" prop="virtualRemark" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('始发网点')" align="center" prop="startSiteName" min-width="80" :show-overflow-tooltip="true"/>
     </XdTable>
 
@@ -924,6 +924,14 @@ export default {
 
   },
   methods: {
+     //拼接虚拟单后6位
+    conCatVirtualRemark(virtualRemark) {
+      if (virtualRemark != null) {
+        return virtualRemark.split(',').map((item) => {
+          return item.substring(item.length - 6);
+        }).join(',');
+      }
+    },
     rowKey (row) {
       return row.id;
     },
diff --git a/src/views/emis/emisWaybill/sendWaybillListNew.vue b/src/views/emis/emisWaybill/sendWaybillListNew.vue
index 82369f5a..d62ef02e 100644
--- a/src/views/emis/emisWaybill/sendWaybillListNew.vue
+++ b/src/views/emis/emisWaybill/sendWaybillListNew.vue
@@ -530,7 +530,8 @@
         <el-table-column :label="$t('录单网点')" align="center" prop="registerSiteName" min-width="80" :show-overflow-tooltip="true" />
         <el-table-column :label="$t('录单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            {{scope.row.remark }}{{ scope.row.remark && scope.row.remark.trim()!=='' && scope.row.virtualRemark && scope.row.virtualRemark.trim()!==''?',':'' }}<span v-if="scope.row.blVirtual==0 && scope.row.virtualRemark!=='' && scope.row.virtualRemark!== null ">该运单为主单，对应虚拟单为{{ scope.row.virtualRemark }}
+            {{scope.row.remark }}{{ scope.row.remark && scope.row.remark.trim()!=='' && scope.row.virtualRemark && scope.row.virtualRemark.trim()!==''?',':'' }}<span v-if="scope.row.blVirtual==0 && scope.row.virtualRemark!=='' && scope.row.virtualRemark!== null ">该运单为主单，对应虚拟单为{{ conCatVirtualRemark(scope.row.virtualRemark) }}
+
             </span>
           </template>
         </el-table-column>
@@ -553,7 +554,7 @@
           </template>
         </el-table-column>
         <el-table-column :label="$t('主单号')" align="center" prop="masterBillCode" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('虚拟单备注')" align="center" prop="virtualRemark" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('主单对应的虚拟单')" align="center" prop="virtualRemark" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('始发网点')" align="center" prop="startSiteName" min-width="80" :show-overflow-tooltip="true"/>
     </XdTable>
 
@@ -875,6 +876,13 @@ export default {
 
   },
   methods: {
+     conCatVirtualRemark(virtualRemark) {
+      if (virtualRemark != null) {
+        return virtualRemark.split(',').map((item) => {
+          return item.substring(item.length - 6);
+        }).join(',');
+      }
+    },
     rowKey (row) {
       return row.id;
     },