diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js index 646dc0f..01c7349 100644 --- a/src/api/incomePaymentsApi.js +++ b/src/api/incomePaymentsApi.js @@ -154,6 +154,10 @@ const getStardsMemberProjectById = (params) => getAction('/member/tbMemberProjec const memberDrawTicket = (params) => getAction('/member/tbMemberProjectSubitem/ticketCollection', params) // 标协会员单位信息-复制 const memberCopy = (params) => getAction('', params) +// 标协会员-会员统计-曲线图数据获取 +const memberStatisticsLineData = (params) => getAction('', params) +// 标协会员-会员统计-饼状图数据获取 +const memberStatisticsPieData = (params) => getAction('', params) // 工作组成员维护-调账 const workingGroupEditAccount = (param) => getAction('/project/payWorkingGroupSubitem/editAccount', param) @@ -242,6 +246,8 @@ export { getStardsMemberProjectById, memberDrawTicket, memberCopy, + memberStatisticsLineData, + memberStatisticsPieData, workingGroupEditAccount, getAllDraftProjects, diff --git a/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue b/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue index b0d85fc..bf9b6b0 100644 --- a/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue +++ b/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue @@ -380,8 +380,8 @@ export default { }) }, onDateChange (value, dateString) { - this.queryParam.estimatedArrivalStartDate = dateString[0] - this.queryParam.estimatedArrivalEndDate = dateString[1] + this.queryParam.estimatedArrivalDate_begin = dateString[0] + this.queryParam.estimatedArrivalDate_end = dateString[1] }, // 提票 handleDrawTicket (record) { diff --git a/src/views/incomePayments/memberManage/StardsMemberStatistics.vue b/src/views/incomePayments/memberManage/StardsMemberStatistics.vue index 45f6baf..a657259 100644 --- a/src/views/incomePayments/memberManage/StardsMemberStatistics.vue +++ b/src/views/incomePayments/memberManage/StardsMemberStatistics.vue @@ -1,16 +1,93 @@ - \ No newline at end of file diff --git a/src/views/incomePayments/memberManage/modules/StardsMemberStatisticsModal.vue b/src/views/incomePayments/memberManage/modules/StardsMemberStatisticsModal.vue new file mode 100644 index 0000000..941ea13 --- /dev/null +++ b/src/views/incomePayments/memberManage/modules/StardsMemberStatisticsModal.vue @@ -0,0 +1,219 @@ + + + + + \ No newline at end of file