From 16217be9c85f95cb236e639da6e546bb38cdc53d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 05 十二月 2024 14:45:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/views/contract/contractList.vue |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/admin/src/views/contract/contractList.vue b/admin/src/views/contract/contractList.vue
index 13a9176..089e6f5 100644
--- a/admin/src/views/contract/contractList.vue
+++ b/admin/src/views/contract/contractList.vue
@@ -15,14 +15,8 @@
         <el-table-column prop="zlFirstPrice" label="绉熻祦鍗曚环" min-width="100" show-overflow-tooltip>
             <template slot-scope="{row}">
                 <div style="display: flex; align-items: center;">
-                    <span>{{row.zlFirstPrice}}</span>
-                    <span v-if="row.zlFirstCircle === 0">鍏�/m虏路澶�</span>
-                    <span v-if="row.zlFirstCircle === 1">鍏�/m虏路鏈�</span>
-                    <span v-if="row.zlFirstCircle === 2">鍏�/澶�</span>
-                    <span v-if="row.zlFirstCircle === 3">鍏�/鏈�</span>
-                    <span v-if="row.zlFirstCircle === 4">鍏�/骞�</span>
-                    <span v-if="row.zlFirstCircle === 5">鍏�/m虏路骞�</span>
-                    <span v-if="row.zlFirstCircle === 6">鍏�/鍦�</span>
+                    <span>{{row.zlFirstPrice || row.wyFirstPrice}}</span>
+                    <span>{{row.zlFirstCircleStr || row.wyFirstCircleStr}}</span>
                 </div>
             </template>
         </el-table-column>

--
Gitblit v1.9.3