From 16217be9c85f95cb236e639da6e546bb38cdc53d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 05 十二月 2024 14:45:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/contract/components/terminateLease.vue | 32 +++++++-------------------------
1 files changed, 7 insertions(+), 25 deletions(-)
diff --git a/admin/src/views/contract/components/terminateLease.vue b/admin/src/views/contract/components/terminateLease.vue
index 6bb8929..83108ee 100644
--- a/admin/src/views/contract/components/terminateLease.vue
+++ b/admin/src/views/contract/components/terminateLease.vue
@@ -84,6 +84,7 @@
label="璐﹀崟缂栧彿">
</el-table-column>
<el-table-column
+ width="100"
label="璐圭敤绫诲瀷">
<template slot-scope="{row}">
<span v-if="row.costType === 0">绉熻祦璐�</span>
@@ -103,13 +104,14 @@
label="搴旀敹浠橀噾棰�/鍘熷搴旀敹浠�">
<template v-slot="{row}">
<div style="display: flex; align-items: center;">
- <el-input v-model="row.receivableFee" @input="changeReceivableFee($event, row)" placeholder="璇疯緭鍏ュ唴瀹�" style="width: 90px;"></el-input>
+ <el-input v-model="row.receivableFee" @input="changeReceivableFee($event, row)" placeholder="璇疯緭鍏ュ唴瀹�" style="flex: 1;"></el-input>
<span style="margin: 0 10px;">/</span>
{{row.receivableFeeCopy}}
</div>
</template>
</el-table-column>
<el-table-column
+ width="120"
prop="actReceivableFee"
label="瀹炴敹/浠橀噾棰�">
</el-table-column>
@@ -247,26 +249,6 @@
loading: false
}
},
- watch: {
- // info: {
- // deep: true,
- // immediate: true,
- // handler(news, olds) {
- // const arr = [...this.info.terminateList, ...this.info.depositList]
- // let total1 = 0
- // let total2 = 0
- // arr.forEach(item => {
- // if (item.billType === 0) {
- // total1 += Number(item.price)
- // } else if (item.billType === 1) {
- // total2 += Number(item.price)
- // }
- // })
- // this.receivable = total1
- // this.meet = total2
- // }
- // }
- },
methods: {
open (title, info) {
this.title = title
@@ -279,12 +261,12 @@
this.$refs.form.resetFields()
})
this.info.canBackRentBills.forEach(item => {
- this.$set(item, 'receivableFeeCopy', item.receivableFee)
- this.$set(item, 'receivableFee', item.needReceivableFee)
if ([2,3,7].includes(item.costType)) {
this.$set(item, 'billType', 1)
this.$set(item, 'price', item.actReceivableFee)
} else {
+ this.$set(item, 'receivableFeeCopy', item.receivableFee)
+ this.$set(item, 'receivableFee', item.needReceivableFee)
this.$set(item, 'price', item.needReceivableFee)
}
})
@@ -315,8 +297,8 @@
total2 += Number(item.price)
}
})
- this.receivable = total1
- this.meet = total2
+ this.receivable = total1.toFixed(2)
+ this.meet = total2.toFixed(2)
},
getDay () {
const today = new Date();
--
Gitblit v1.9.3