From afdf4e71ee7869f0c4dfdf09ed6e49a0dc0d08cd Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 23 May 2024 08:20:39 +0800
Subject: [PATCH] md

---
 src/views/emis/emisWaybill/waybillIsPrinted.vue | 16 ++++++++++++++--
 src/views/emis/emisWaybill/waybillList.vue      |  4 ++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/views/emis/emisWaybill/waybillIsPrinted.vue b/src/views/emis/emisWaybill/waybillIsPrinted.vue
index c7349ce4..19d30232 100644
--- a/src/views/emis/emisWaybill/waybillIsPrinted.vue
+++ b/src/views/emis/emisWaybill/waybillIsPrinted.vue
@@ -297,8 +297,20 @@
 
       <el-table-column :label="$t('销售回款人')" align="center" prop="payee" min-width="100" />
       <el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="100" />
-      <el-table-column :label="$t('操作员')" align="center" prop="operateEmployeeName" min-width="100" />
-      <el-table-column :label="$t('收件业务员')" align="center" prop="takePieceEmployeeName" min-width="100" :show-overflow-tooltip="true"/>
+
+      <el-table-column :label="$t('操作员')"   align="center" prop="operateEmployeeName" min-width="100" >
+        <template slot-scope="scope">
+             <span v-if="scope.row.pickupMethod==1">{{scope.row.operateEmployeeName}}</span>
+             <span v-else></span>
+          </template>
+      </el-table-column>
+
+      <el-table-column :label="$t('收件业务员')"  align="center" prop="takePieceEmployeeName" min-width="100" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+             <span v-if="scope.row.pickupMethod==2">{{scope.row.takePieceEmployeeName}}</span>
+             <span v-else></span>
+          </template>
+      </el-table-column>
       <el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" width="100" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.waybillStatus"/>
diff --git a/src/views/emis/emisWaybill/waybillList.vue b/src/views/emis/emisWaybill/waybillList.vue
index 88891038..d7f3ff39 100644
--- a/src/views/emis/emisWaybill/waybillList.vue
+++ b/src/views/emis/emisWaybill/waybillList.vue
@@ -262,8 +262,8 @@
 
       <el-table-column :label="$t('销售回款人')" align="center" prop="payee" min-width="100" />
       <el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="100" />
-      <el-table-column :label="$t('操作员')" align="center" prop="operateEmployeeName" min-width="100" />
-      <el-table-column :label="$t('收件业务员')" align="center" prop="takePieceEmployeeName" min-width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('操作员')"  v-if="scope.row.pickupMethod==1" align="center" prop="operateEmployeeName" min-width="100" />
+      <el-table-column :label="$t('收件业务员')" v-if="scope.row.pickupMethod==2" align="center" prop="takePieceEmployeeName" min-width="100" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" width="100" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.waybillStatus"/>