From 17d7043f10d55429db919238fe639bff1b51ec0e Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 07 二月 2025 15:59:37 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1
---
admin/src/views/contract/components/contractDetail.vue | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/admin/src/views/contract/components/contractDetail.vue b/admin/src/views/contract/components/contractDetail.vue
index a9c43db..5683288 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('寰呭鐞嗚处鍗�', 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>
<div class="remark" v-if="info">{{info.remark}}</div>
<div class="remark" v-if="info && info.status === 3">{{info.btRemark}}</div>
@@ -193,6 +197,13 @@
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}">
<span v-if="row.costType === 0">绉熻祦璐�</span>
@@ -235,7 +246,7 @@
label="璐﹀崟鏉ユ簮">
<template slot-scope="{row}">
<span v-if="row.type === 0">鍚堝悓璐﹀崟</span>
- <span v-if="row.type === 1">鑷缓璐﹀崟</span>
+ <span v-else>鑷缓璐﹀崟</span>
</template>
</el-table-column>
<el-table-column
@@ -319,6 +330,12 @@
</div>
<!-- 閫�绉� -->
<TerminateLease ref="terminateLease" @success="getData" />
+ <!-- 寰呭鐞嗚处鍗� -->
+ <PendingBills ref="pendingBills" />
+ <!-- 閫�绉熷崗璁� -->
+ <TerminationAgreement ref="terminationAgreement" />
+ <!-- 璐﹀崟璇︽儏 -->
+ <BullDetail ref="bullDetail" />
</GlobalWindow>
</template>
@@ -326,12 +343,18 @@
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 BullDetail from '../../finance/components/bullDetail'
import { getById } from '@/api/contract'
import { fetchList } from '@/api/bill'
export default {
components: {
GlobalWindow,
- TerminateLease
+ TerminateLease,
+ PendingBills,
+ TerminationAgreement,
+ BullDetail
},
extends: BaseOpera,
data() {
@@ -345,7 +368,7 @@
page: 1,
total: 0,
tableData: [],
-
+
loading: false
}
},
@@ -363,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