From 4b3bf67505b0ecd38c432dc0fb2036fdd4d3c1e4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 05 十二月 2024 18:49:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/contract/components/contractDetail.vue | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/admin/src/views/contract/components/contractDetail.vue b/admin/src/views/contract/components/contractDetail.vue
index 730f2c2..a9c43db 100644
--- a/admin/src/views/contract/components/contractDetail.vue
+++ b/admin/src/views/contract/components/contractDetail.vue
@@ -113,12 +113,17 @@
</div>
<div class="item">
<div class="la">鍏嶇鏈�</div>
- <div class="val">{{ info.zlFreeStartDate }} ~ {{ info.zlFreeEndDate }}</div>
+ <div class="val" v-if="info.zlFreeStartDate && info.zlFreeEndDate">
+ {{ info.zlFreeStartDate }} ~ {{ info.zlFreeEndDate }}
+ </div>
+ <div class="val" v-else>
+ -
+ </div>
</div>
</div>
<el-table :data="info.zlDetailList" stripe style="margin-bottom: 20px;" v-if="info.type === 2 || info.type === 0">
- <el-table-column prop="startDate" label="寮�濮嬫棩鏈�" min-width="100" show-overflow-tooltip />
- <el-table-column prop="endDate" label="缁撴潫鏃ユ湡" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="startDate" label="寮�濮嬫棩鏈�" :key="Date.now()" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="endDate" label="缁撴潫鏃ユ湡" :key="Date.now()" min-width="100" show-overflow-tooltip />
<el-table-column label="鍚堝悓鍗曚环" min-width="100" show-overflow-tooltip>
<template slot-scope="{row}">
{{row.price}} {{returnUnit(row.circleType)}}
@@ -126,7 +131,9 @@
</el-table-column>
<el-table-column label="浠樻鎻愬墠澶╂暟" min-width="100" show-overflow-tooltip>
<template slot-scope="{row}">
- {{row.advanceDays}}澶�
+ <template v-if="row.advanceDays">
+ {{row.advanceDays}}澶�
+ </template>
</template>
</el-table-column>
</el-table>
@@ -149,8 +156,8 @@
</div>
</div>
<el-table :data="info.wyDetailList" stripe style="margin-bottom: 20px;" v-if="info.type === 1 || info.type === 0">
- <el-table-column prop="startDate" label="寮�濮嬫棩鏈�" min-width="100" show-overflow-tooltip />
- <el-table-column prop="endDate" label="缁撴潫鏃ユ湡" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="startDate" label="寮�濮嬫棩鏈�" :key="Date.now()" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="endDate" label="缁撴潫鏃ユ湡" :key="Date.now()" min-width="100" show-overflow-tooltip />
<el-table-column label="鍚堝悓鍗曚环" min-width="100" show-overflow-tooltip>
<template slot-scope="{row}">
{{row.price}} {{returnUnit(row.circleType)}}
@@ -402,7 +409,6 @@
})
},
changeType (e) {
- console.log(e)
this.type = e
this.page = 1
this.pageSize = 10
--
Gitblit v1.9.3