From 2f478089f313475bf471a4b0d0045f5a31311677 Mon Sep 17 00:00:00 2001
From: wuteng <419274783@qq.com>
Date: Thu, 19 Jun 2025 10:05:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=84=E4=BB=B6=E8=BF=90=E5=8D=95=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=8A=A0=E8=99=9A=E6=8B=9F=E5=8D=95=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=92=8C=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emis/emisWaybill/sendWaybillList.vue      | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue
index 0fbf4c69..88960052 100644
--- a/src/views/emis/emisWaybill/sendWaybillList.vue
+++ b/src/views/emis/emisWaybill/sendWaybillList.vue
@@ -47,6 +47,12 @@
           <el-form-item label="目的网点" prop="dispatchUnderlingSiteCode">
             <EmisSiteSimplePicker2  v-model="queryParams.dispatchUnderlingSiteCode"  ></EmisSiteSimplePicker2>
           </el-form-item>
+          <el-form-item label="是否为虚拟单" prop="blVirtual">
+            <el-select clearable v-model="queryParams.blVirtual" placeholder="请选择">
+              <el-option label="是" value="1"></el-option>
+              <el-option label="否" value="0"></el-option>
+             </el-select>
+          </el-form-item>
         </el-col>
         <el-col :span="5">
             <el-form-item label="月结客户" prop="custNo">
@@ -519,8 +525,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" >
           <template slot-scope="scope">
@@ -533,7 +543,14 @@
         <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>
@@ -709,6 +726,7 @@ export default {
         sendPostcode: null,
         sendPcd: null,
         paymentType: null,
+        blVirtual: null,
         calcFeeType: null,
         custNo: null,
         transLineType: null,