From e1552a4eb2699eb84c4e1419cb76b7beb4951c4a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 十二月 2024 18:34:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/finance/components/bullEdit.vue | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/admin/src/views/finance/components/bullEdit.vue b/admin/src/views/finance/components/bullEdit.vue
index 0d77432..acf1da2 100644
--- a/admin/src/views/finance/components/bullEdit.vue
+++ b/admin/src/views/finance/components/bullEdit.vue
@@ -18,14 +18,14 @@
</el-select>
</el-form-item>
<el-form-item label="浠樻鏂�" prop="renterName">
- <el-input v-model="form.renterName" disabled placeholder="璇疯緭鍏ュ簲鏀堕噾棰�" v-trim />
+ <el-input v-model="form.renterName" disabled placeholder="浠樻鏂�" v-trim />
</el-form-item>
<el-form-item label="鎴挎簮" prop="ywContractRoomList">
- <el-select v-model="form.ywContractRoomList" multiple placeholder="璇烽�夋嫨">
+ <el-select v-model="form.ywContractRoomList" @click="clickHouse" multiple placeholder="璇烽�夋嫨">
<el-option
v-for="(item, index) in houseList"
:key="index"
- :value="item.id"
+ :value="item.roomId"
:label="item.projectName + item.buildingName + item.floorName + item.roomName" />
</el-select>
</el-form-item>
@@ -149,6 +149,7 @@
methods: {
open (title, target) {
this.title = title
+ this.form.feeType = 0
this.form.multifileList = []
this.getListAll()
this.getCompanyList()
@@ -167,6 +168,11 @@
this.form[key] = target[key]
}
})
+ },
+ clickHouse () {
+ if (!this.form.contractId) {
+ return this.$message.warning('璇峰厛閫夋嫨鍚堝悓')
+ }
},
changeContract (e) {
this.form.renterName = this.contract.filter(item => {
@@ -213,7 +219,7 @@
this.$refs.selectHouse.open('閫夋嫨鎴挎簮', { contractId: this.form.contractId, type: 0 })
},
getCompanyList () {
- companyList({})
+ companyList({ type: 2, status: 0 })
.then(res => {
this.comparyList = res
})
--
Gitblit v1.9.3