diff --git a/apis/projectFinance.js b/apis/projectFinance.js index f4d354b..9ad2de1 100644 --- a/apis/projectFinance.js +++ b/apis/projectFinance.js @@ -27,3 +27,7 @@ export const queryProjectFinance = params => // 修改任务或项目的预算和奖金信息 export const updateFinance = params => http.post(`${projectFinance}/updateFinance`, params); + +// 时间财务图统计 +export const timeFinancialChart = params => + http.post(`${projectFinance}/timeFinancialChart`, params); diff --git a/components/BarEcharts.vue b/components/BarEcharts.vue index ced2ee3..12d74c7 100644 --- a/components/BarEcharts.vue +++ b/components/BarEcharts.vue @@ -1,113 +1,144 @@ diff --git a/components/Expenditure.vue b/components/Expenditure.vue index 08cf6e6..2251aa7 100644 --- a/components/Expenditure.vue +++ b/components/Expenditure.vue @@ -27,7 +27,7 @@ /> - + @@ -110,9 +110,11 @@ async function handleUpdateBudget(item) { } // 操作,跳转到发起申请界面 -function toApplication() { +function toApplication(item) { const routeValue = router.currentRoute.value; const query = routeValue.query; + query.tn = item.taskName; + // console.log('query: ', query); router.push({ path: '/Initiate-application', query }); } diff --git a/components/FinanceManage.vue b/components/FinanceManage.vue index ded5d81..2dc6a34 100644 --- a/components/FinanceManage.vue +++ b/components/FinanceManage.vue @@ -4,8 +4,8 @@ - - + + diff --git a/pages/applicant.vue b/pages/applicant.vue index 1a16561..5fc4ed2 100644 --- a/pages/applicant.vue +++ b/pages/applicant.vue @@ -9,24 +9,27 @@ title-active-color="#59B4FF" > -
-
历史申请
- - -
- -
- 发起申请 +
+
+
历史申请
+ + +
+ +
+ 发起申请 +
+ -
+
奖金领取记录
-
+
待领取奖金
@@ -61,13 +64,8 @@ import { useRouter } from 'vue-router'; const router = useRouter(); const active = ref(0); -const isShow = ref(true); const isBonus = ref(true); -function onClickLeft() { - console.log('返回上一页'); -} - function toApplication() { const routeValue = router.currentRoute.value; const query = routeValue.query; diff --git a/pages/financial-approval.vue b/pages/financial-approval.vue index b90d81e..98d4221 100644 --- a/pages/financial-approval.vue +++ b/pages/financial-approval.vue @@ -1,9 +1,9 @@
任务名称预算(元)奖金(元)预算(元)奖金(元)
{{item.name}}