From d767b5e68029315c33060eabb38345cf238289d0 Mon Sep 17 00:00:00 2001 From: wuxw <928255095@qq.com> Date: Mon, 20 Oct 2025 13:33:10 +0800 Subject: [PATCH] =?UTF-8?q?v1.9=20=E5=90=88=E5=90=8C=E8=B4=B9=E7=94=A8bug?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/contract/contractDetailFeeApi.js | 17 +++-- src/components/contract/contractDetailFee.vue | 70 +++++++++++-------- .../contract/contractDetailRoom.vue | 9 +-- src/views/contract/contractDetail.vue | 2 + src/views/contract/contractManageList.vue | 4 +- src/views/contract/printContractList.vue | 17 ++--- src/views/fee/carCreateFeeList.vue | 22 +++--- src/views/fee/contractCreateFeeList.vue | 9 +-- 8 files changed, 82 insertions(+), 68 deletions(-) diff --git a/src/api/contract/contractDetailFeeApi.js b/src/api/contract/contractDetailFeeApi.js index d3dc0f8d2..897260fe7 100644 --- a/src/api/contract/contractDetailFeeApi.js +++ b/src/api/contract/contractDetailFeeApi.js @@ -1,9 +1,18 @@ import request from '@/utils/request' +// 查询费用列表 export function listFee(params) { - return request({ - url: '/fee.listFee', - method: 'get', - params + return new Promise((resolve, reject) => { + request({ + url: '/fee.listFee', + method: 'get', + params + }).then(response => { + const res = response.data + resolve(res) + + }).catch(error => { + reject(error) + }) }) } \ No newline at end of file diff --git a/src/components/contract/contractDetailFee.vue b/src/components/contract/contractDetailFee.vue index 71bc0a349..1f1f1b7ff 100644 --- a/src/components/contract/contractDetailFee.vue +++ b/src/components/contract/contractDetailFee.vue @@ -1,5 +1,5 @@  @@ -110,11 +115,20 @@ import { listFee } from '@/api/contract/contractDetailFeeApi' import { getCommunityId } from '@/api/community/communityApi' import TempImportRoomFee from '@/components/fee/tempImportRoomFee' +import contractCreateFeeAdd from '@/components/fee/contractCreateFeeAdd' +import {dateFormat} from '@/utils/dateUtil' +import DeleteFee from '@/components/fee/deleteFee' +import EditFee from '@/components/fee/editFee' +import FinishFee from '@/components/fee/finishFee' export default { name: 'ContractDetailFee', components: { - TempImportRoomFee + TempImportRoomFee, + contractCreateFeeAdd, + DeleteFee, + EditFee, + FinishFee }, data() { return { @@ -135,9 +149,13 @@ export default { methods: { open(data) { this.contractDetailFeeInfo.contractId = data.contractId + this.contractDetailFeeInfo.contractName = data.contractName this._loadContractDetailFeeData(1, this.pagination.pageSize) }, - _loadContractDetailFeeData(page, row) { + _query() { + this._loadContractDetailFeeData(1, this.pagination.pageSize) + }, + async _loadContractDetailFeeData(page, row) { const params = { page: page || 1, row: row || 10, @@ -145,20 +163,19 @@ export default { payerObjId: this.contractDetailFeeInfo.contractId, } - listFee(params).then(response => { - this.contractDetailFeeInfo.total = response.total - this.contractDetailFeeInfo.records = response.records - this.contractDetailFeeInfo.fees = response.fees - this.pagination.total = response.total + const res = await listFee(params) + console.log(res) + this.contractDetailFeeInfo.total = res.total + this.contractDetailFeeInfo.records = res.records + this.contractDetailFeeInfo.fees = res.fees + this.pagination.total = res.total - let totalAmount = 0.0 - response.fees.forEach(item => { - totalAmount += parseFloat(item.amountOwed) - }) - this.contractDetailFeeInfo.totalAmount = totalAmount.toFixed(2) - }).catch(error => { - console.error('请求失败:', error) + let totalAmount = 0.0 + res.fees.forEach(item => { + totalAmount += parseFloat(item.amountOwed) }) + this.contractDetailFeeInfo.totalAmount = totalAmount.toFixed(2) + }, _openTempImportContractFeeModal() { this.$refs.tempImportRoomFee.open({ @@ -169,35 +186,32 @@ export default { }) }, _payContractFee(fee) { - this.$router.push(`/property/payFeeOrder?feeId=${fee.feeId}`) + this.$router.push(`/views/fee/payFeeOrder?feeId=${fee.feeId}`) }, _editContractFee(fee) { - this.$emit('edit-fee', fee) + this.$refs.editFee.open(fee) }, _payContractFeeHis(fee) { fee.builtUpArea = this.contractDetailFeeInfo.builtUpArea - this.$router.push(`/property/propertyFee?${this.objToGetParam(fee)}`) + this.$router.push(`/views/fee/propertyFee?${this.objToGetParam(fee)}`) }, _deleteContractFee(fee) { - this.$emit('delete-fee', { + this.$refs.deleteFee.open({ communityId: this.communityId, feeId: fee.feeId }) }, _finishContractFee(fee) { - this.$emit('finish-fee', { + this.$refs.finishFee.open({ communityId: this.communityId, feeId: fee.feeId }) }, _toContractOwePayFee() { - this.$router.push(`/property/owePayFeeOrder?payObjId=${this.contractDetailFeeInfo.contractId}&payObjType=7777&contractName=${this.contractDetailFeeInfo.contractName}`) + this.$router.push(`/views/fee/owePayFeeOrder?payObjId=${this.contractDetailFeeInfo.contractId}&payObjType=7777&contractName=${this.contractDetailFeeInfo.contractName}`) }, _openContractCreateFeeAddModal() { - this.$emit('create-fee-add', { - isMore: false, - contract: this.contractDetailFeeInfo - }) + this.$refs.contractCreateFeeAdd.open(this.contractDetailFeeInfo, false) }, _getContractAttrValue(attrs, specCd) { let value = "" @@ -216,13 +230,13 @@ export default { if (fee.state == '2009001') { return "-" } - return this.$options.filters.dateFormat(fee.endTime) + return dateFormat(fee.deadlineTime) }, _getContractEndTime(fee) { if (fee.state == '2009001') { return "-" } - return this.$options.filters.dateFormat(fee.endTime) + return dateFormat(fee.endTime) }, handlePageChange(currentPage) { this.pagination.currentPage = currentPage diff --git a/src/components/contract/contractDetailRoom.vue b/src/components/contract/contractDetailRoom.vue index 3be1ed26e..78a20f00b 100644 --- a/src/components/contract/contractDetailRoom.vue +++ b/src/components/contract/contractDetailRoom.vue @@ -1,14 +1,14 @@