From af7344df96145370c9b919e6beb8f819f190f781 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 30 九月 2024 17:04:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/platform/LogisticsRecord/leaveAuth.vue | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/admin/src/views/platform/LogisticsRecord/leaveAuth.vue b/admin/src/views/platform/LogisticsRecord/leaveAuth.vue
index 5bfab7f..5a0dfa0 100644
--- a/admin/src/views/platform/LogisticsRecord/leaveAuth.vue
+++ b/admin/src/views/platform/LogisticsRecord/leaveAuth.vue
@@ -16,7 +16,11 @@
</div>
<el-table class="mb20" v-loading="loading" :data="list" stripe>
<el-table-column type="index" label="搴忓彿" width="70" show-overflow-tooltip />
- <el-table-column prop="billCode" label="杩愬崟鍙�" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="billCode" label="杩愬崟鍙�/鍚堝悓鍙�" min-width="100" show-overflow-tooltip>
+ <template v-slot="scope">
+ <span>{{ scope.row.billCode || scope.row.contractNum }}</span>
+ </template>
+ </el-table-column>
<!-- <el-table-column prop="totalNum" label="鎬讳綔涓氶噺(涓囨敮)" min-width="100" show-overflow-tooltip /> -->
<el-table-column prop="carCodeFront" label="杞︾墝鍙�" min-width="100" show-overflow-tooltip />
<el-table-column prop="carCodeBack" label="鐢靛瓙閿佺姸鎬�" min-width="100" show-overflow-tooltip>
@@ -100,7 +104,7 @@
label: '鍚堝悓鍙�'
},
{
- filed: 'code',
+ filed: 'billCode',
type: 'input',
label: '杩愬崟鍙�'
},
--
Gitblit v1.9.3