From 46d57bec594030513e2d698e064ad03ae8e08d60 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Thu, 19 Jun 2025 14:56:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BE=E4=BB=B6=E8=BF=90=E5=8D=95=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emis/emisWaybill/dispatchWaybillList.vue      | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/views/emis/emisWaybill/dispatchWaybillList.vue b/src/views/emis/emisWaybill/dispatchWaybillList.vue
index 5e95fd64..d1b90075 100644
--- a/src/views/emis/emisWaybill/dispatchWaybillList.vue
+++ b/src/views/emis/emisWaybill/dispatchWaybillList.vue
@@ -33,6 +33,9 @@
               <el-form-item label="" prop="queryExpireNotSign">
                 <el-checkbox style="font-size:400;margin-right:10px;" v-model="queryParams.params.expireNotSign" :true-label="'1'" :false-label="'0'">超时未签收</el-checkbox>
               </el-form-item>
+              <el-form-item label="" prop="blVirtual">
+                <el-checkbox style="font-size:400;margin-right:10px;" v-model="queryParams.blVirtual" :true-label="'1'" :false-label="'0'">虚拟单</el-checkbox>
+              </el-form-item>
             </el-col>
           </el-row>
         </el-col>
@@ -552,8 +555,12 @@
         <el-table-column :label="$t('派件网点')" align="center" prop="dispatchSiteName" min-width="80" :show-overflow-tooltip="true"/>
 
         <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" />
-
+        <el-table-column :label="$t('录单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true" >
+         <template slot-scope="scope">
+            {{scope.row.remark }}<span v-if="scope.row.blVirtual==0 && scope.row.virtualRemark!=='' && scope.row.virtualRemark!== null ">该运单为主单，对应虚拟单为{{ scope.row.virtualRemark }}
+            </span>
+          </template>
+        </el-table-column>  
         <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />
 
         <el-table-column :label="$t('图片上传')" align="center" prop="blUploadPic" min-width="100" >
@@ -567,7 +574,8 @@
         <el-table-column :label="$t('目的港')" align="center" prop="destinationPortName" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('箱量')" align="center" prop="boxQuantity" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('贵司编号')" align="center" prop="companyCode" min-width="80" :show-overflow-tooltip="true"/>
-
+        <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"/>
 
     </XdTable>
 
@@ -835,6 +843,7 @@ export default {
         delFlag: null,
         remark: null,
         paymentStatus:null,
+        blVirtual:null,
         params:{
           blSign:null,
           expireNotSign:null,