From 37926bbc6a660245630cae0424c65cb1661c33df Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 12 十月 2024 14:11:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/platform/components/PlatformSign.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/admin/src/views/platform/components/PlatformSign.vue b/admin/src/views/platform/components/PlatformSign.vue
index 42d5007..1ff8326 100644
--- a/admin/src/views/platform/components/PlatformSign.vue
+++ b/admin/src/views/platform/components/PlatformSign.vue
@@ -19,13 +19,13 @@
<div class="status" :class="{ red: item.status == 0 }">{{ statusMap[item.status] }}</div>
</div>
<div class="info">
- <div v-if="item.type == 4" class="ite">
- <span>鍚堝悓鍗曞彿锛�</span>
- <span>{{ item.contractNum }}</span>
- </div>
- <div v-else class="ite">
+ <div v-if="item.billCode" class="ite">
<span>杩愯緭鍗曞彿锛�</span>
<span>{{ item.billCode }}</span>
+ </div>
+ <div v-else class="ite">
+ <span>鍚堝悓鍗曞彿锛�</span>
+ <span>{{ item.contractNum }}</span>
</div>
<div class="ite">
<span>椹鹃┒鍛橈細</span>
@@ -100,7 +100,7 @@
getList() {
const { activePlat, pagination, carCodeFront } = this
platformJobPage({
- model: { platformGroupId: activePlat.id, queryStatus: '0,1' },
+ model: { platformGroupId: activePlat.id, queryStatus: '0,1', carCodeFront },
page: pagination.page,
capacity: pagination.pageSize
}).then(res => {
--
Gitblit v1.9.3