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/terminateLease.vue | 125 +++++++++++++++++++----------------------
1 files changed, 58 insertions(+), 67 deletions(-)
diff --git a/admin/src/views/contract/components/terminateLease.vue b/admin/src/views/contract/components/terminateLease.vue
index 23f9b2f..3748d6f 100644
--- a/admin/src/views/contract/components/terminateLease.vue
+++ b/admin/src/views/contract/components/terminateLease.vue
@@ -68,7 +68,7 @@
</div>
</div>
<div class="title">
- <span>閫�绉熶俊鎭�</span>
+ <span>璐﹀崟缁撶畻</span>
<div style="display: flex; align-items: center;">
<el-button type="primary" @click="addZD">娣诲姞鏀舵</el-button>
<el-button type="primary" @click="addFK">娣诲姞浠樻</el-button>
@@ -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>
@@ -119,7 +121,7 @@
<div style="display: flex; align-items: center;">
<el-tag type="success" v-if="row.billType === 0">鏀�</el-tag>
<el-tag type="warning" v-if="row.billType === 1">浠�</el-tag>
- <span style="margin-left: 10px;">{{row.price}}</span>
+ <span style="margin-left: 10px;">{{Math.abs(row.price)}}</span>
</div>
</template>
</el-table-column>
@@ -153,9 +155,12 @@
{{row.startDate}} ~ {{row.endDate}}
</template>
</el-table-column>
+<!-- prop="receivableFee"-->
<el-table-column
- prop="receivableFee"
label="搴旀敹閲戦">
+ <template slot-scope="{row}">
+ 0
+ </template>
</el-table-column>
<el-table-column
prop="actReceivableFee"
@@ -179,7 +184,7 @@
</el-table-column>
</el-table>
<div class="footer">
- 鍚堣搴旀敹锛�<span>{{receivable.toFixed(2)}}</span>鍏冿紝 鍚堣搴斾粯锛�<span>{{meet.toFixed(2)}}</span>鍏�
+ 鍚堣搴旀敹锛�<span>{{receivable}}</span>鍏冿紝 鍚堣搴斾粯锛�<span>{{meet}}</span>鍏�
</div>
</div>
<!-- 鍒涘缓鏀舵璐﹀崟 -->
@@ -195,7 +200,7 @@
import AddCollectionBill from './addCollectionBill'
import AddPaymentBill from './addPaymentBill'
import { getUserList } from '@/api/system/user'
- import { backRent, getCanBackBill } from '@/api/contract'
+ import { backRent, getCanBackBill, findForBills } from '@/api/contract'
import { mapState } from 'vuex'
export default {
name: "terminateLease",
@@ -247,62 +252,30 @@
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
this.info = info
this.form.id = info.id
this.form.btSignDate = this.getDay()
- console.log(this.userInfo)
this.form.btUserId = this.userInfo.id
this.$nextTick(() => {
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, 'price', item.needReceivableFee)
- }
- })
- this.info.terminateList = this.info.canBackRentBills.filter(item => {
- if ([0,1,4,5,6].includes(item.costType)) {
- item.billTypeCopy = JSON.parse(JSON.stringify(item.billType))
- return item
- }
- })
- this.info.depositList = this.info.canBackRentBills.filter(item => {
- if ([2,3,7].includes(item.costType)) {
- item.billTypeCopy = JSON.parse(JSON.stringify(item.billType))
- return item
- }
- })
+ this.info.terminateList = []
+ this.info.depositList = []
+ this.form.btDate = this.getDay()
this.countData()
this.getUser()
+ this.changeBtDate(this.form.btDate)
this.visible = true
+ },
+ getDayTime () {
+ const today = new Date();
+ const year = today.getFullYear();
+ const month = today.getMonth() + 1;
+ const day = today.getDate();
+ return `${year}-${month < 10 ? '0' + month : month}-${day < 10 ? '0' + day : day}`;
},
countData () {
const arr = [...this.info.terminateList, ...this.info.depositList]
@@ -310,18 +283,18 @@
let total2 = 0
arr.forEach(item => {
if (item.billType === 0) {
- total1 += Number(item.price)
+ total1 += Math.abs(Number(item.price))
} else if (item.billType === 1) {
- total2 += Number(item.price)
+ total2 += Math.abs(Number(item.price))
}
})
- this.receivable = total1
- this.meet = total2
+ this.receivable = total1.toFixed(2)
+ this.meet = total2.toFixed(2)
},
getDay () {
const today = new Date();
const year = today.getFullYear();
- const month = today.getMonth() + 1; // 鏈堜唤鏄粠 0 寮�濮嬬殑锛屽洜姝ら渶瑕佸姞 1
+ const month = today.getMonth() + 1;
const day = today.getDate();
return `${year}-${month < 10 ? '0' + month : month}-${day < 10 ? '0' + day : day}`;
},
@@ -349,19 +322,33 @@
billTypeCopy: 1
}, { startDate: this.info.startDate, endDate: this.form.btDate })
},
- changeBtDate (planPayDateEnd) {
+ changeBtDate (btDate) {
this.loading = true
- getCanBackBill({
- contractId: this.info.id,
- planPayDateEnd
+ findForBills({
+ id: this.info.id,
+ btDate
}).then(res => {
- res.forEach(item => {
- this.$set(item, 'receivableFeeCopy', item.receivableFee)
- this.$set(item, 'receivableFee', item.needReceivableFee)
- this.$set(item, 'price', item.needReceivableFee)
+ res.canBackRentBills.forEach(item => {
+ 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 - item.actReceivableFee).toFixed(2))
+ }
})
- this.info.terminateList = res.filter(item => {
+ this.info.terminateList = res.canBackRentBills.filter(item => {
if ([0,1,4,5,6].includes(item.costType)) {
+ item.billTypeCopy = JSON.parse(JSON.stringify(item.billType))
+ if (Number(item.price) < 0) {
+ item.billType = 1
+ }
+ return item
+ }
+ })
+ this.info.depositList = res.canBackRentBills.filter(item => {
+ if ([2,3,7].includes(item.costType)) {
item.billTypeCopy = JSON.parse(JSON.stringify(item.billType))
return item
}
@@ -372,11 +359,10 @@
})
},
getObjS (obj) {
+ console.log(obj)
+ obj.startDate = obj.startDate.substring(0, 10)
+ obj.endDate = obj.endDate.substring(0, 10)
this.info.terminateList.push(obj)
- // this.info.terminateList.forEach(item => {
- // item.receivableFee = Number(item.receivableFee) + 1
- // item.receivableFee = Number(item.receivableFee) - 1
- // })
this.countData()
},
confirm () {
@@ -477,6 +463,11 @@
flex-direction: column;
border-bottom: 1px solid #ececec;
margin-bottom: 15px;
+ position: sticky;
+ top: 0;
+ left: 0;
+ z-index: 999;
+ background: #ffffff;
span {
color: black;
font-size: 16px;
--
Gitblit v1.9.3