Compare commits

..

No commits in common. "96574778d820e29f3d087c1c03821bfa9c9cebae" and "1a8a946d491b69f8112b5172dd3b643cea112163" have entirely different histories.

3 changed files with 7 additions and 47 deletions

View File

@ -19,8 +19,6 @@ export function queryReportFeeSummary(params) {
})
}
/**
* 查询楼栋费用汇总数据
* @param {Object} params 查询参数

View File

@ -246,52 +246,14 @@ export default {
params.configIds = this.reportFeeSummaryInfo.configIds.join(',');
}
//
const queryTypes = [
'roomCount',
'feeRoomCount',
'oweRoomCount',
'hisOweFee',
'curOweFee',
'curReceivableFee',
'hisReceivedFee',
'preReceivedFee',
'receivedFee'
]
const { data } = await queryReportFeeSummary(params)
this.reportFeeSummaryInfo.fees = data
//
const mergedResult = {}
//
for (const queryType of queryTypes) {
try {
const queryParams = { ...params, queryType }
const { data } = await queryReportFeeSummary(queryParams)
if (data && data.length > 0 && data[0]) {
//
Object.assign(mergedResult, data[0])
}
} catch (error) {
console.error(`Failed to query ${queryType}:`, error)
//
const fieldName = queryType === 'roomCount' || queryType === 'feeRoomCount' || queryType === 'oweRoomCount' ? queryType : queryType
mergedResult[fieldName] = queryType.includes('Count') ? 0 : 0.00
}
}
//
this.reportFeeSummaryInfo.fees = [mergedResult]
//
if (this.$refs.floorFeeSummary) {
this.$refs.floorFeeSummary.notify(params)
}
if (this.$refs.configFeeSummary) {
this.$refs.configFeeSummary.notify(params)
}
// Notify child components
this.$refs.floorFeeSummary.notify(params)
this.$refs.configFeeSummary.notify(params)
} catch (error) {
console.error('Failed to query fee summary:', error)
this.$message.error(this.$t('reportFeeSummary.queryFailed') || '查询失败,请稍后重试')
}
},
async _loadStaffCommunitys() {

View File

@ -44,8 +44,8 @@ export default {
logo: '',
companyName:'',
loginForm: {
username: 'wuxw',
passwd: 'admin',
username: '',
passwd: '',
validateCode: ''
},
captchaUrl: '',