From 62e8b7d51ecb749c3f38452af88c703ac86db9cd Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 09 一月 2025 09:08:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
admin/src/views/contract/components/contractDetail.vue | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/admin/src/views/contract/components/contractDetail.vue b/admin/src/views/contract/components/contractDetail.vue
index 3b49554..64cb0d9 100644
--- a/admin/src/views/contract/components/contractDetail.vue
+++ b/admin/src/views/contract/components/contractDetail.vue
@@ -16,7 +16,11 @@
<el-tag type="info" v-if="info.status === 3">閫�绉熺粨绠椾腑</el-tag>
<el-tag type="info" v-if="info.status === 4">宸查��绉�</el-tag>
</div>
- <el-button plain type="danger" v-if="[0, 1, 2].includes(info.status)" @click="refund">閫�绉�</el-button>
+ <div>
+ <el-button type="primary" @click="$refs.pendingBills.open('寰呭鐞嗚处鍗�')">鏌ョ湅寰呭鐞嗚处鍗�</el-button>
+ <el-button @click="$refs.terminationAgreement.open('閫�绉熷崗璁�')">鏌ョ湅閫�绉熷崗璁�</el-button>
+ <el-button plain type="danger" v-if="[0, 1, 2].includes(info.status)" @click="refund">閫�绉�</el-button>
+ </div>
</div>
<div class="remark" v-if="info">{{info.remark}}</div>
<div class="remark" v-if="info && info.status === 3">{{info.btRemark}}</div>
@@ -319,6 +323,10 @@
</div>
<!-- 閫�绉� -->
<TerminateLease ref="terminateLease" @success="getData" />
+ <!-- 寰呭鐞嗚处鍗� -->
+ <PendingBills ref="pendingBills" />
+ <!-- 閫�绉熷崗璁� -->
+ <TerminationAgreement ref="terminationAgreement" />
</GlobalWindow>
</template>
@@ -326,12 +334,16 @@
import GlobalWindow from '@/components/common/GlobalWindow'
import BaseOpera from '@/components/base/BaseOpera'
import TerminateLease from './terminateLease'
+import PendingBills from './pendingBills'
+import TerminationAgreement from './terminationAgreement'
import { getById } from '@/api/contract'
import { fetchList } from '@/api/bill'
export default {
components: {
GlobalWindow,
- TerminateLease
+ TerminateLease,
+ PendingBills,
+ TerminationAgreement
},
extends: BaseOpera,
data() {
--
Gitblit v1.9.3