From d492850f1cc64ddcfaf43798af9c76c2505414fd Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 24 一月 2025 18:24:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
admin/src/views/contract/components/terminationAgreement.vue | 55 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/admin/src/views/contract/components/terminationAgreement.vue b/admin/src/views/contract/components/terminationAgreement.vue
index 9b02d5c..835fe12 100644
--- a/admin/src/views/contract/components/terminationAgreement.vue
+++ b/admin/src/views/contract/components/terminationAgreement.vue
@@ -8,40 +8,47 @@
@confirm="confirm">
<div class="main">
<div class="main_head">
- <span>绉熷锛氫箳涔撶悆淇变箰閮�</span>
- <span>鍚堝悓缂栧彿锛� 2024-04-001-202405-0019</span>
+ <span>绉熷锛歿{info.renterName}}</span>
+ <span>鍚堝悓缂栧彿锛� {{info.code}}</span>
+ </div>
+ <div class="title">鎴挎簮淇℃伅</div>
+ <div class="list">
+ <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 label="妤煎眰/鎴垮彿" show-overflow-tooltip>
+ <template slot-scope="{row}">
+ {{row.floorName}}{{row.roomNum}}
+ </template>
+ </el-table-column>
+ <el-table-column prop="area" label="闈㈢Н" show-overflow-tooltip></el-table-column>
+ </el-table>
</div>
<div class="title">閫�绉熶俊鎭�</div>
<div class="list">
<div class="item">
<div class="la">閫�绉熺被鍨�</div>
- <div class="val">{{ info.code }}</div>
+ <div class="val" v-if="info.btType === 0">鍒版湡閫�绉�</div>
+ <div class="val" v-if="info.btType === 1">鎹㈡埧閫�绉�</div>
+ <div class="val" v-if="info.btType === 2">杩濈害閫�绉�</div>
+ <div class="val" v-if="info.btType === 3">鍗忓晢閫�绉�</div>
</div>
<div class="item">
<div class="la">閫�绉熸棩鏈�</div>
- <div class="val">{{ info.userName }}</div>
+ <div class="val">{{ info.btDate }}</div>
</div>
<div class="item">
<div class="la">缁忓姙浜�</div>
- <div class="val">{{ info.creatorName }}</div>
+ <div class="val">{{ info.userName }}</div>
</div>
<div class="item">
<div class="la">鍗忚绛捐鏃ユ湡</div>
- <div class="val">{{ info.totalArea }}銕�</div>
+ <div class="val">{{ info.signDate }}銕�</div>
</div>
<div class="item">
<div class="la">閫�绉熷師鍥�</div>
- <div class="val">{{ info.companyName }}</div>
+ <div class="val">{{ info.btInfo }}</div>
</div>
- </div>
- <div class="title">鎴挎簮淇℃伅</div>
- <div class="list">
- <el-table :data="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>
</div>
</div>
</GlobalWindow>
@@ -50,6 +57,7 @@
<script>
import GlobalWindow from '@/components/common/GlobalWindow'
import BaseOpera from '@/components/base/BaseOpera'
+ import { getById } from '@/api/contract'
export default {
name: "terminationAgreement",
components: {
@@ -58,12 +66,23 @@
extends: BaseOpera,
data() {
return {
- roomList: [],
+ id: null,
info: {}
}
},
methods: {
-
+ open (title, id) {
+ this.title = title
+ this.id = id
+ this.getData()
+ },
+ getData () {
+ getById(this.id)
+ .then(res => {
+ this.info = res
+ this.visible = true
+ })
+ },
}
}
</script>
--
Gitblit v1.9.3