From a80fcaaf130286f215a35aa62450421b480b4d5a Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 07 二月 2025 11:41:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
admin/src/views/contract/components/terminationAgreement.vue | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/contract/components/terminationAgreement.vue b/admin/src/views/contract/components/terminationAgreement.vue
index d9d9280..e9ed052 100644
--- a/admin/src/views/contract/components/terminationAgreement.vue
+++ b/admin/src/views/contract/components/terminationAgreement.vue
@@ -16,8 +16,16 @@
<el-table :data="info.roomList" stripe>
<el-table-column prop="projectName" label="椤圭洰鍚嶇О" show-overflow-tooltip />
<el-table-column prop="buildingName" label="妤煎畤鍚嶇О" show-overflow-tooltip />
- <el-table-column prop="buildingName" label="妤煎眰/鎴垮彿" show-overflow-tooltip></el-table-column>
- <el-table-column prop="area" label="闈㈢Н" show-overflow-tooltip></el-table-column>
+ <el-table-column label="妤煎眰/鎴垮彿" show-overflow-tooltip>
+ <template slot-scope="{row}">
+ {{row.floorName}}/{{row.roomNum}}
+ </template>
+ </el-table-column>
+ <el-table-column label="闈㈢Н" show-overflow-tooltip>
+ <template slot-scope="{row}">
+ {{row.area}}銕�
+ </template>
+ </el-table-column>
</el-table>
</div>
<div class="title">閫�绉熶俊鎭�</div>
@@ -39,7 +47,7 @@
</div>
<div class="item">
<div class="la">鍗忚绛捐鏃ユ湡</div>
- <div class="val">{{ info.signDate }}銕�</div>
+ <div class="val">{{ info.signDate }}</div>
</div>
<div class="item">
<div class="la">閫�绉熷師鍥�</div>
--
Gitblit v1.9.3