From c7d99f5e11c4cf0667f67b8170e1c585db2e2016 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期六, 08 二月 2025 15:34:15 +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/finance/payments.vue | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/admin/src/views/finance/payments.vue b/admin/src/views/finance/payments.vue
index 037813b..2be18ee 100644
--- a/admin/src/views/finance/payments.vue
+++ b/admin/src/views/finance/payments.vue
@@ -2,7 +2,7 @@
<div class="main_app">
<QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear" />
<div class="mt20">
-<!-- <el-button v-permissions="['business:ywpatrolline:create']">瀵煎嚭</el-button>-->
+ <!-- <el-button v-permissions="['business:ywpatrolline:create']">瀵煎嚭</el-button>-->
</div>
<el-table v-loading="loading" :data="list" stripe>
<el-table-column prop="customerName" label="瀹㈡埛鍚嶇О" min-width="100" show-overflow-tooltip />
@@ -10,7 +10,7 @@
<el-table-column label="鎴垮彿" min-width="100" show-overflow-tooltip>
<template slot-scope="{row}">
<div style="display: flex; flex-direction: column;" v-if="row.roomPathName">
- <span v-for="(item, index) in row.roomPathName.split(';')" :key="index">{{item}}</span>
+ <span v-for="(item, index) in row.roomPathName.split(';')" :key="index">{{ item }}</span>
</div>
</template>
</el-table-column>
@@ -45,7 +45,7 @@
<el-table-column label="鎿嶄綔" min-width="190" fixed="right">
<template slot-scope="{row}">
<el-button type="text" @click="$refs.details.open('鏀舵敮娴佹按璇︽儏', row.id)">鏌ョ湅璇︽儏</el-button>
- <el-button type="text" @click="closeDW(row.id)" v-if="row.status !== 1 || !['3','4'].includes(row.contractStatus)">鍏抽棴娴佹按</el-button>
+ <el-button type="text" @click="closeDW(row.id)" v-if="isShow(row.status, row.contractStatus)">鍏抽棴娴佹按</el-button>
</template>
</el-table-column>
</el-table>
@@ -123,6 +123,11 @@
this.getList()
},
methods: {
+ isShow(status, contractStatus) {
+ if (status === 1) return false
+ if (contractStatus === '3' || contractStatus === '4') return false
+ return true
+ },
getList(page) {
const { pagination, filters } = this
let form = JSON.parse(JSON.stringify(filters))
@@ -145,7 +150,7 @@
this.loading = false
})
},
- closeDW (id) {
+ closeDW(id) {
this.$confirm('纭鍏抽棴姝ゆ祦姘村悧?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -156,8 +161,8 @@
this.getList()
})
}).catch(() => {
-
- });
+
+ })
},
handleDel(row) {
let message = `纭鍒犻櫎璇ヨ褰曞悧?`
@@ -180,6 +185,7 @@
},
handleSizeChange(capacity) {
this.pagination.pageSize = capacity
+ this.getList()
}
}
}
--
Gitblit v1.9.3