diff --git a/apis/finance.js b/apis/finance.js index df55123..be5f1f6 100644 --- a/apis/finance.js +++ b/apis/finance.js @@ -1,23 +1,36 @@ -import http from 'apis/axios'; - -const apiUrl = import.meta.env.VITE_API_URL; -const ptccsens = `${apiUrl}/ptccsens/v1.0`; -const finance = `${ptccsens}/finance`; - -// 发起申请 -export const apply = params => http.post(`${finance}/apply`, params); - -// 审批 -export const audit = params => http.post(`${finance}/audit`, params); - -// 查询申请详情 -export const getApplyDetail = params => http.post(`${finance}/getApplyDetail`, params); - -// 通过任务id查看任务关联的财务信息 -export const getByTask = params => http.post(`${finance}/getByTask`, params); - -// 查看当前用户的费用申请历史信息(奖金) -export const personalHistory = params => http.post(`${finance}/personalHistory`, params); - -// 查询费用申请类型 -export const queryType = params => http.post(`${finance}/queryType`, params); +import http from 'apis/axios'; + +const apiUrl = import.meta.env.VITE_API_URL; +const ptccsens = `${apiUrl}/ptccsens/v1.0`; +const finance = `${ptccsens}/finance`; + +// 发起申请 +export const apply = params => http.post(`${finance}/apply`, params); + +// 审批 +export const audit = params => http.post(`${finance}/audit`, params); + +// 查询申请详情 +export const getApplyDetail = params => + http.post(`${finance}/getApplyDetail`, params); + +// 通过任务id查看任务关联的财务信息 +export const getByTask = params => http.post(`${finance}/getByTask`, params); + +// 查看当前用户的费用申请历史信息(奖金) +export const personalHistory = params => + http.post(`${finance}/personalHistory`, params); + +// 查询费用申请类型 +export const queryType = params => http.post(`${finance}/queryType`, params); + +// 任务支出统计 +export const taskExpense = params => + http.post(`${finance}/taskExpense`, params); + +// 名目支出统计 +export const rowExpense = params => http.post(`${finance}/rowExpense`, params); + +// 成员财务统计 +export const memberFinance = params => + http.post(`${finance}/memberFinance`, params); diff --git a/components/BarEcharts.vue b/components/BarEcharts.vue index ea31046..ced2ee3 100644 --- a/components/BarEcharts.vue +++ b/components/BarEcharts.vue @@ -1,5 +1,5 @@ + + diff --git a/components/RingEcharts.vue b/components/RingEcharts.vue index 781c268..0f940ad 100644 --- a/components/RingEcharts.vue +++ b/components/RingEcharts.vue @@ -1,148 +1,198 @@ - - + diff --git a/pages/financial-approval.vue b/pages/financial-approval.vue index d82c212..b90d81e 100644 --- a/pages/financial-approval.vue +++ b/pages/financial-approval.vue @@ -9,12 +9,77 @@ -
-
- 财务统计 财务明细统计查看 +
+
+ 财务统计 + 财务明细统计查看 +
+ +
+
+
+ + 任务支出统计 +
+
+ 图表 + 表格 +
+
+ +
+ + +
+ +
+ +
+
+ +
+
+
+ + 名目支出统计 +
+
+ 图表 + 表格 +
+
+ +
+ + +
+ +
+ +
+
+ +
+
+ + 成员财务图 +
+ +
+ +
+
+ + 时间财务图 +
+ + + + +
- -
+ +
- +
- + 任务支出统计
- 图表 - 表格 + 图表 + 表格
- +
- +
- +
-
-
- - 名目支出统计 -
-
- 图表 - 表格 -
-
- -
- - +
+
+ + 名目支出统计
- -
- +
+ 图表 + 表格
+
+ +
+ + +
+ +
+ +
- + 成员财务图
- +
-
- - 时间财务图 -
- +
+ + 时间财务图 +
+
@@ -115,6 +143,7 @@ export default {