diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js
index 3e7dbed..6df5174 100644
--- a/src/api/incomePaymentsApi.js
+++ b/src/api/incomePaymentsApi.js
@@ -157,9 +157,9 @@ const memberCopy = (params) => postAction('/member/tbMemberProjectSubitem/copy',
// 标协会员单位信息-批量复制
const memberBatchCopy = (params) => postAction('/member/tbMemberProjectSubitem/copyBatch', params)
// 标协会员-会员统计-曲线图数据获取
-const memberStatisticsLineData = (params) => getAction('', params)
+const memberStatisticsLineData = (params) => getAction('/statistics/member/lineChart', params)
// 标协会员-会员统计-饼状图数据获取
-const memberStatisticsPieData = (params) => getAction('', params)
+const memberStatisticsPieData = (params) => getAction('/statistics/member/pieChart', params)
// 工作组成员维护-调账
const workingGroupEditAccount = (param) => getAction('/project/payWorkingGroupSubitem/editAccount', param)
diff --git a/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue b/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue
index f92d608..b6903f3 100644
--- a/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue
+++ b/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue
@@ -182,7 +182,7 @@
-
+
diff --git a/src/views/incomePayments/memberManage/StardsMemberProjectList.vue b/src/views/incomePayments/memberManage/StardsMemberProjectList.vue
index 57542a3..b1868c7 100644
--- a/src/views/incomePayments/memberManage/StardsMemberProjectList.vue
+++ b/src/views/incomePayments/memberManage/StardsMemberProjectList.vue
@@ -153,7 +153,6 @@ export default {
* 标协会议维护
* */
handleStandardMeeting(record){
- console.log(123)
this.$router.push({
path:'/projectManagement/CommitteeMeetingStard',
query:{
diff --git a/src/views/incomePayments/memberManage/StardsMemberProjectMeetingApplyInfo.vue b/src/views/incomePayments/memberManage/StardsMemberProjectMeetingApplyInfo.vue
index f37ed2b..0c889a0 100644
--- a/src/views/incomePayments/memberManage/StardsMemberProjectMeetingApplyInfo.vue
+++ b/src/views/incomePayments/memberManage/StardsMemberProjectMeetingApplyInfo.vue
@@ -151,8 +151,8 @@
-
-
+
+
@@ -298,8 +298,8 @@ export default {
title: '确收',
align: 'center',
width: 100,
- dataIndex: 'confirmGet',
- scopedSlots: { customRender: 'status-confirm-get' }
+ dataIndex: 'affirmIncome',
+ scopedSlots: { customRender: 'status-mail' }
},
{
title: '操作',
diff --git a/src/views/incomePayments/memberManage/StardsMemberStatistics.vue b/src/views/incomePayments/memberManage/StardsMemberStatistics.vue
index f721b3d..2e57d35 100644
--- a/src/views/incomePayments/memberManage/StardsMemberStatistics.vue
+++ b/src/views/incomePayments/memberManage/StardsMemberStatistics.vue
@@ -62,18 +62,25 @@ export default {
}
},
mounted() {
- // this.getLineEchartsData()
- // this.getPieEchartsData()
- this.initLineEcharts()
- this.initPieEcharts()
+ this.getLineEchartsData()
+ this.getPieEchartsData()
},
methods: {
formatMoney,
// 获取曲线图数据
getLineEchartsData () {
- memberStatisticsLineData().then(res => {
+ const param = {}
+ const currentYear = Number(new Date().getFullYear())
+ param.startYear = currentYear - 2
+ param.endYear = currentYear
+ memberStatisticsLineData(param).then(res => {
if (res.success) {
- this.lineData = res.result
+ this.lineData = []
+ for (const index in res.result.year) {
+ this.lineData.push(
+ { year: res.result.year[index], data: res.result.value[index] }
+ )
+ }
this.initLineEcharts()
}
})
@@ -82,7 +89,9 @@ export default {
getPieEchartsData () {
memberStatisticsPieData().then(res => {
if (res.success) {
- this.pieData = res.result
+ this.pieData = res.result.map(item => {
+ return { ...item, name: item.memberNature_dictText }
+ })
this.initPieEcharts()
}
})
@@ -241,12 +250,10 @@ export default {
chartClickFunc(params) {
console.log(params)
// 获取当前点击的饼状图的名字
- // let queryData = {
- // name: params.data.name, // 名字
- // type: params.dataIndex + 1, // 序号
- // departCode: this.queryParam.departCode, // 部门code
- // }
- this.$refs.stardsMemberStatisticsModal.show()
+ let queryData = {
+ memberNature: params.data.memberNature // 会员性质
+ }
+ this.$refs.stardsMemberStatisticsModal.show(queryData)
},
}
}
diff --git a/src/views/incomePayments/memberManage/StardsStandardStatistics.vue b/src/views/incomePayments/memberManage/StardsStandardStatistics.vue
index 3994424..25f3028 100644
--- a/src/views/incomePayments/memberManage/StardsStandardStatistics.vue
+++ b/src/views/incomePayments/memberManage/StardsStandardStatistics.vue
@@ -54,52 +54,55 @@ export default {
{
title: '会议名称',
align: 'center',
- dataIndex: 'memberNo',
+ dataIndex: 'meetingName',
scopedSlots: { customRender: 'text' },
},
{
title: '标准编号',
align: 'center',
- dataIndex: 'memberNo',
+ dataIndex: 'standardNo',
scopedSlots: { customRender: 'text' },
},
{
title: '标准名称',
align: 'center',
- dataIndex: 'memberNo',
+ dataIndex: 'standardName',
scopedSlots: { customRender: 'text' },
},
{
title: '标准类别',
align: 'center',
- dataIndex: 'memberNo',
+ dataIndex: 'standardType_dictText',
scopedSlots: { customRender: 'text' },
},
{
title: '制修订',
align: 'center',
- dataIndex: 'memberNo',
+ dataIndex: 'preparationAndRevision_dictText',
scopedSlots: { customRender: 'text' },
},
{
title: '宣贯人',
align: 'center',
- dataIndex: 'memberNo',
+ dataIndex: 'promoter_dictText',
scopedSlots: { customRender: 'text' },
},
{
title: '宣贯时间',
align: 'center',
- dataIndex: 'memberNo',
+ dataIndex: 'promotionTime',
scopedSlots: { customRender: 'text' },
},
{
title: '宣贯地点',
align: 'center',
- dataIndex: 'memberNo',
+ dataIndex: 'promotionLocation',
scopedSlots: { customRender: 'text' },
}
- ]
+ ],
+ url: {
+ list: '/statistics/standard/standardProjectPage'
+ }
}
}
}
diff --git a/src/views/incomePayments/memberManage/modules/StardsMemberStatisticsModal.vue b/src/views/incomePayments/memberManage/modules/StardsMemberStatisticsModal.vue
index 150b53f..eab7dfb 100644
--- a/src/views/incomePayments/memberManage/modules/StardsMemberStatisticsModal.vue
+++ b/src/views/incomePayments/memberManage/modules/StardsMemberStatisticsModal.vue
@@ -49,50 +49,32 @@
{{ formatMoney(text) }}
-
-
-
-
+
+
-
+
+
+
+
-
+
+
+
@@ -101,15 +83,16 @@