From 883b077d6f990011cc840ed988ce5ea24282826b Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Thu, 19 Jun 2025 15:39:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=96=B0?=
 =?UTF-8?q?=E5=8A=A0=E8=99=9A=E6=8B=9F=E5=8D=95=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emis/emisWaybill/sendWaybillListNew.vue   | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/views/emis/emisWaybill/sendWaybillListNew.vue b/src/views/emis/emisWaybill/sendWaybillListNew.vue
index 84efe3ce..a04f91df 100644
--- a/src/views/emis/emisWaybill/sendWaybillListNew.vue
+++ b/src/views/emis/emisWaybill/sendWaybillListNew.vue
@@ -37,6 +37,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>
@@ -525,8 +528,12 @@
 
 
         <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" >
           <template slot-scope="scope">
@@ -539,11 +546,16 @@
         <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="blVirtual" min-width="80" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.blVirtual==1" type="success">是</el-tag>
+            <el-tag v-else type="danger">否</el-tag>
+          </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"/>
     </XdTable>
 
-
     <el-dialog title="快件跟踪" :visible.sync="openTraceInfo" width="70%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
       <TraceWaybillDetailView  :key="resetRefreshId" :scanBillCode="currentTraceBillCode" :billDetail="currentTraceBillItem"></TraceWaybillDetailView>
     </el-dialog>
@@ -720,6 +732,7 @@ export default {
         sendPostcode: null,
         sendPcd: null,
         paymentType: null,
+        blVirtual:null,
         calcFeeType: null,
         custNo: null,
         transLineType: null,