From 8a7a5daac34c6d498e5f4541742bf4e665b88830 Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Fri, 29 Dec 2023 14:07:24 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91-=E8=B0=83=E8=AF=951?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/incomePaymentsApi.js | 8 ++++---- src/views/dashboard/SingleMonthEcharts.vue | 8 ++++---- src/views/dashboard/SingleMonthTotalEcharts.vue | 8 ++++---- src/views/statisticalReport/MeetingPackStatistics.vue | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js index c5c40cc..e5f15ad 100644 --- a/src/api/incomePaymentsApi.js +++ b/src/api/incomePaymentsApi.js @@ -126,10 +126,10 @@ const addPayConfirm = (param) => postAction('/payConfirmPaymentRecord/add', para const editPayConfirm = (param) => postAction('/payConfirmPaymentRecord/edit', param) -// 撤销开票 todo -const revokeInvoice = (params) => postAction(`/paymentRecord/payPaymentRecord/revoke?id=${params}`) -// 撤销确认来款信息 todo -const revokeConfirm = (params) => postAction(`/paymentRecord/payPaymentRecord/revoke?id=${params}`) +// 撤销开票 +const revokeInvoice = (params) => postAction(`/paymentRecord/payPaymentRecord/backInvoice?id=${params}`) +// 撤销确认来款信息 +const revokeConfirm = (params) => postAction(`/payConfirmPaymentRecord/backIncoming?id=${params}`) //2023-07-13 工作组相关功能的接口 diff --git a/src/views/dashboard/SingleMonthEcharts.vue b/src/views/dashboard/SingleMonthEcharts.vue index d860720..a47e971 100644 --- a/src/views/dashboard/SingleMonthEcharts.vue +++ b/src/views/dashboard/SingleMonthEcharts.vue @@ -149,8 +149,8 @@ export default { let keyItem = MonthData.find(ele => Number(ele.value) === (index + 1)) if (keyItem) { let key = keyItem.key - // tableData[3][key] = item.estimatedArrivalMoney // todo 需要替换字段 预计到账金额--也可能放在第一条 - tableData[0][key] = Number(item.comeAllMoney) + 100000 // todo 需要替换字段 预计到账金额--也可能放在第一条 + tableData[0][key] = item.estimatedArrivalMoney // todo 需要替换字段 预计到账金额--也可能放在第一条 + // tableData[0][key] = Number(item.comeAllMoney) + 100000 // todo 需要替换字段 预计到账金额--也可能放在第一条 // tableData[0][key] = item.allMoney // 年度待确收金额 tableData[1][key] = item.confirmAmount // 确认收入金额 tableData[2][key] = item.billMoney // 开票金额 @@ -185,9 +185,9 @@ export default { this.echartsData.confirmAmount.push(item.confirmAmount) this.echartsData.billMoney.push(item.billMoney) this.echartsData.comeAllMoney.push(item.comeAllMoney) - // this.echartsData.estimatedArrivalMoney.push(item.estimatedArrivalMoney) + this.echartsData.estimatedArrivalMoney.push(item.estimatedArrivalMoney) // todo 后端开发完以后替换掉 - this.echartsData.estimatedArrivalMoney.push(Number(item.comeAllMoney) + 100000) + // this.echartsData.estimatedArrivalMoney.push(Number(item.comeAllMoney) + 100000) }) }, diff --git a/src/views/dashboard/SingleMonthTotalEcharts.vue b/src/views/dashboard/SingleMonthTotalEcharts.vue index 51293bf..248d0e0 100644 --- a/src/views/dashboard/SingleMonthTotalEcharts.vue +++ b/src/views/dashboard/SingleMonthTotalEcharts.vue @@ -142,8 +142,8 @@ export default { let keyItem = MonthDataTotal.find(ele => Number(ele.value) === (index + 1)) if (keyItem) { let key = keyItem.key - // tableData[0][key] = item.estimatedArrivalMoney // todo 需要替换字段 预计到账金额--也可能放在第一条 - tableData[0][key] = Number(item.comeAllMoney) + 100000 // todo 需要替换字段 预计到账金额--也可能放在第一条 + tableData[0][key] = item.estimatedArrivalMoney // todo 需要替换字段 预计到账金额--也可能放在第一条 + // tableData[0][key] = Number(item.comeAllMoney) + 100000 // todo 需要替换字段 预计到账金额--也可能放在第一条 // tableData[0][key] = item.allMoney // 年度待确收金额 tableData[1][key] = item.confirmAmount // 确认收入金额 tableData[2][key] = item.billMoney // 开票金额 @@ -171,9 +171,9 @@ export default { this.echartsData.confirmAmount.push(item.confirmAmount) this.echartsData.billMoney.push(item.billMoney) this.echartsData.comeAllMoney.push(item.comeAllMoney) - // this.echartsData.estimatedArrivalMoney.push(item.estimatedArrivalMoney) + this.echartsData.estimatedArrivalMoney.push(item.estimatedArrivalMoney) // todo 后端开发完以后替换掉 - this.echartsData.estimatedArrivalMoney.push(Number(item.comeAllMoney) + 100000) + // this.echartsData.estimatedArrivalMoney.push(Number(item.comeAllMoney) + 100000) }) }, initEcharts() { diff --git a/src/views/statisticalReport/MeetingPackStatistics.vue b/src/views/statisticalReport/MeetingPackStatistics.vue index ca038ea..59cdbab 100644 --- a/src/views/statisticalReport/MeetingPackStatistics.vue +++ b/src/views/statisticalReport/MeetingPackStatistics.vue @@ -229,8 +229,8 @@ export default { }, // todo 需要替换掉 url: { - list: '/statistics/principalPeople/list', - exportXlsUrl: '/statistics/principalPeople/excel' + list: '/statistics/meetingPackStatistics/page', + exportXlsUrl: '/statistics/meetingPackStatistics/excelMeetingPackStatistics' } } },