diff --git a/apis/axios.js b/apis/axios.js index ba04463..c5488db 100644 --- a/apis/axios.js +++ b/apis/axios.js @@ -1,7 +1,7 @@ import Axios from 'axios'; import { Toast } from 'vant'; -// import store from 'store'; import { createApp } from 'vue'; +import { useToken } from '../composables/state' const app = createApp(); app.use(Toast); @@ -13,12 +13,13 @@ const instance = Axios.create({ timeout: 20000, }); + // request instance.interceptors.request.use( config => { - const token = sessionStorage.getItem('token') || ''; - if (token) { - config.headers.Authorization = `Bearer ${token}`; + const token = useToken() + if (token.value) { + config.headers.Authorization = `Bearer ${token.value}`; } // config.headers.deviceId = store.state.systemInfo.deviceId; config.headers.deviceId = '1'; diff --git a/apis/finance.js b/apis/finance.js index 4e74a91..df55123 100644 --- a/apis/finance.js +++ b/apis/finance.js @@ -3,7 +3,6 @@ import http from 'apis/axios'; const apiUrl = import.meta.env.VITE_API_URL; const ptccsens = `${apiUrl}/ptccsens/v1.0`; const finance = `${ptccsens}/finance`; -const projectFinance = `${ptccsens}/projectFinance`; // 发起申请 export const apply = params => http.post(`${finance}/apply`, params); @@ -17,21 +16,8 @@ export const getApplyDetail = params => http.post(`${finance}/getApplyDetail`, p // 通过任务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 addBudget = params => http.post(`${projectFinance}/addBudget`, params); - -// 查看项目下的财务信息 -export const queryFinanceOfProject = params => http.post(`${projectFinance}/queryFinanceOfProject`, params); - -// 查看项目下的所有任务对应的财务信息 -export const queryProjectFinance = params => http.post(`${projectFinance}/queryProjectFinance`, params); - -// 修改任务或项目的预算和奖金信息 -export const updateFinance = params => http.post(`${projectFinance}/updateFinance`, params); - -// 查看自己需要审批的申请 -export const queryNeedCheckByMe = params => http.post(`${projectFinance}/queryNeedCheckByMe`, params); diff --git a/apis/member.js b/apis/member.js new file mode 100644 index 0000000..6c56500 --- /dev/null +++ b/apis/member.js @@ -0,0 +1,8 @@ +import http from 'apis/axios'; + +const apiUrl = import.meta.env.VITE_API_URL; +const ptccsens = `${apiUrl}/ptccsens/v1.0`; +const member = `${ptccsens}/member`; + +// 查询所有成员 +export const queryChecker = params => http.post(`${member}/queryChecker`, params); diff --git a/apis/projectFinance.js b/apis/projectFinance.js new file mode 100644 index 0000000..c597b1f --- /dev/null +++ b/apis/projectFinance.js @@ -0,0 +1,23 @@ +import http from 'apis/axios'; + +const apiUrl = import.meta.env.VITE_API_URL; +const ptccsens = `${apiUrl}/ptccsens/v1.0`; +const projectFinance = `${ptccsens}/projectFinance`; + +// 追加预算 +export const addBudget = params => http.post(`${projectFinance}/addBudget`, params); + +// 查看所有的费用申请 +export const queryAllMoneyApply = params => http.post(`${projectFinance}/queryAllMoneyApply`, params); + +// 查看项目下的财务信息 +export const queryFinanceOfProject = params => http.post(`${projectFinance}/queryFinanceOfProject`, params); + +// 查看自己需要审批的申请 +export const queryNeedCheckByMe = params => http.post(`${projectFinance}/queryNeedCheckByMe`, params); + +// 查看项目下的所有任务对应的财务信息 +export const queryProjectFinance = params => http.post(`${projectFinance}/queryProjectFinance`, params); + +// 修改任务或项目的预算和奖金信息 +export const updateFinance = params => http.post(`${projectFinance}/updateFinance`, params); diff --git a/app.vue b/app.vue index af56958..2a98fbd 100644 --- a/app.vue +++ b/app.vue @@ -5,49 +5,25 @@ diff --git a/components/FinanceExamine.vue b/components/FinanceExamine.vue index 47b4a33..8690621 100644 --- a/components/FinanceExamine.vue +++ b/components/FinanceExamine.vue @@ -14,15 +14,9 @@