From a2299a6d4a6f99e9c11132138f5d3e9ec68f03ea Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 19:19:34 +0800
Subject: [PATCH] 开发更新
---
admin/src/views/contract/components/contractDetail.vue | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/admin/src/views/contract/components/contractDetail.vue b/admin/src/views/contract/components/contractDetail.vue
index 64cb0d9..47292ea 100644
--- a/admin/src/views/contract/components/contractDetail.vue
+++ b/admin/src/views/contract/components/contractDetail.vue
@@ -17,8 +17,8 @@
<el-tag type="info" v-if="info.status === 4">宸查��绉�</el-tag>
</div>
<div>
- <el-button type="primary" @click="$refs.pendingBills.open('寰呭鐞嗚处鍗�')">鏌ョ湅寰呭鐞嗚处鍗�</el-button>
- <el-button @click="$refs.terminationAgreement.open('閫�绉熷崗璁�')">鏌ョ湅閫�绉熷崗璁�</el-button>
+ <el-button type="primary" @click="$refs.pendingBills.open('寰呭鐞嗚处鍗�', id)" v-if="info.status === 3">鏌ョ湅寰呭鐞嗚处鍗�</el-button>
+ <el-button @click="$refs.terminationAgreement.open('閫�绉熷崗璁�', id)" v-if="[3,4].includes(info.status)">鏌ョ湅閫�绉熷崗璁�</el-button>
<el-button plain type="danger" v-if="[0, 1, 2].includes(info.status)" @click="refund">閫�绉�</el-button>
</div>
</div>
@@ -46,7 +46,7 @@
<div class="val">{{ info.creatorName }}</div>
</div>
<div class="item">
- <div class="la">鍚堝悓绉熻祦鏁�</div>
+ <div class="la">鍚堝悓绉熻祦闈㈢Н</div>
<div class="val">{{ info.totalArea }}銕�</div>
</div>
<div class="item">
@@ -81,12 +81,12 @@
<el-table-column prop="buildingName" label="妤煎畤鍚嶇О" show-overflow-tooltip />
<el-table-column prop="" label="妤煎眰/鎴垮彿" show-overflow-tooltip>
<template slot-scope="{row}">
- {{row.floorName}}/{{row.code}}
+ {{row.floorName}}/{{row.roomNum}}
</template>
</el-table-column>
<el-table-column prop="area" label="闈㈢Н" show-overflow-tooltip>
<template slot-scope="{row}">
- {{row.area}}銕�
+ {{row.rentArea}}銕�
</template>
</el-table-column>
</el-table>
@@ -196,6 +196,13 @@
border
v-loading="loading"
style="width: 100%">
+ <el-table-column
+ width="150"
+ label="璐﹀崟缂栧彿">
+ <template slot-scope="{row}">
+ <el-button type="text" @click="openBill(row.id)">{{row.code}}</el-button>
+ </template>
+ </el-table-column>
<el-table-column
label="璐圭敤绫诲瀷">
<template slot-scope="{row}">
@@ -327,6 +334,8 @@
<PendingBills ref="pendingBills" />
<!-- 閫�绉熷崗璁� -->
<TerminationAgreement ref="terminationAgreement" />
+ <!-- 璐﹀崟璇︽儏 -->
+ <BullDetail ref="bullDetail" />
</GlobalWindow>
</template>
@@ -336,6 +345,7 @@
import TerminateLease from './terminateLease'
import PendingBills from './pendingBills'
import TerminationAgreement from './terminationAgreement'
+import BullDetail from '../../finance/components/bullDetail'
import { getById } from '@/api/contract'
import { fetchList } from '@/api/bill'
export default {
@@ -343,7 +353,8 @@
GlobalWindow,
TerminateLease,
PendingBills,
- TerminationAgreement
+ TerminationAgreement,
+ BullDetail
},
extends: BaseOpera,
data() {
@@ -375,6 +386,9 @@
xiazai (url) {
window.open(url)
},
+ openBill(id) {
+ this.$refs.bullDetail.open('璐﹀崟璇︽儏', id)
+ },
returnUnit (type) {
switch (type) {
case 0:
--
Gitblit v1.9.3