From 77946261ec663aa1fe7f6f97e550532ed879f982 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 13:47:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

---
 admin/src/views/contract/components/terminationAgreement.vue |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/admin/src/views/contract/components/terminationAgreement.vue b/admin/src/views/contract/components/terminationAgreement.vue
index 835fe12..d870309 100644
--- a/admin/src/views/contract/components/terminationAgreement.vue
+++ b/admin/src/views/contract/components/terminationAgreement.vue
@@ -18,10 +18,14 @@
                     <el-table-column prop="buildingName" label="妤煎畤鍚嶇О" show-overflow-tooltip />
                     <el-table-column label="妤煎眰/鎴垮彿" show-overflow-tooltip>
                         <template slot-scope="{row}">
-                            {{row.floorName}}{{row.roomNum}}
+                            {{row.floorName}}/{{row.roomNum}}
                         </template>
                     </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.rentArea}}銕�
+                        </template>
+                    </el-table-column>
                 </el-table>
             </div>
             <div class="title">閫�绉熶俊鎭�</div>
@@ -43,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