From 432a83c6436e1a65220507c3dd06014a970369df Mon Sep 17 00:00:00 2001 From: zty <1048209592@qq.com> Date: Mon, 8 Jul 2024 16:47:03 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=91=A8=E6=8A=A5=E5=A1=AB=E6=8A=A5=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= =?UTF-8?q?id=EF=BC=8C=E6=96=B9=E4=BE=BF=E6=96=B0=E5=A2=9E/=E7=BC=96?= =?UTF-8?q?=E8=BE=91=202.=E6=96=B0=E5=A2=9E=E9=A1=B9=E7=9B=AE=E9=A2=84?= =?UTF-8?q?=E7=AE=97=E6=89=A7=E8=A1=8C=E7=8E=87=E7=9B=91=E6=8E=A7=E5=91=A8?= =?UTF-8?q?=E6=8A=A5=20=E9=A1=B5=E9=9D=A2/=E8=B7=AF=E7=94=B1/=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weekly/ExpenseClaimApply.vue | 7 ++-- .../weekly/ExpenseClaimApplyAdd.vue | 4 +-- .../weekly/ExpenseClaimApplyDetail.vue | 7 ++-- kehui-oa-front/src/router/index.js | 34 ++++++++++++++++++- .../src/server/projectManagements/index.js | 11 ++++-- 5 files changed, 53 insertions(+), 10 deletions(-) diff --git a/kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApply.vue b/kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApply.vue index af4babe..c8f816b 100644 --- a/kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApply.vue +++ b/kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApply.vue @@ -59,9 +59,9 @@ //table单选操作 tableShowSingleOperation: { show: true, - showEdit: false, - showDelete: false, - showCheck: true, + showEdit: true, + showDelete: true, + showCheck: true }, //分页 pageNo: 1, @@ -97,6 +97,7 @@ let dataList = result.data.ls; for (let i=0; i { this.isSave = true if (result.status === 0) { - this.$message.info('添加成功！') + this.$message.success('添加成功！') this.$router.push({name: 'WeeklyClaimApply'}) } else { this.$message.error(result.data) diff --git a/kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApplyDetail.vue b/kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApplyDetail.vue index c2aa9a3..7fc332d 100644 --- a/kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApplyDetail.vue +++ b/kehui-oa-front/src/pages/projectManagements/weekly/ExpenseClaimApplyDetail.vue @@ -213,7 +213,7 @@ export default { if (this.$route.name === 'ExpenseClaimApplyEdit') { this.isEdit = true this.flowId = this.$route.params.id - console.log("路由ID为",this.$route.params.id) + console.log('路由ID为', this.$route.params.id) this.checkOrVerify = true } else if (this.$route.name === 'ExpenseClaimApplyVerify') { this.isVerify = true @@ -278,7 +278,10 @@ export default { // }) }, getWeekly () { - Api.ProjectManagements.getWeekly().then(result => { + let ProjectWeekly = { + id: this.reimburseId + } + Api.ProjectManagements.getWeekly(ProjectWeekly).then(result => { this.tableRowsData = [] this.pageLoading = false if (result.status === 0) { diff --git a/kehui-oa-front/src/router/index.js b/kehui-oa-front/src/router/index.js index 4763943..f3b050e 100644 --- a/kehui-oa-front/src/router/index.js +++ b/kehui-oa-front/src/router/index.js @@ -318,7 +318,9 @@ const DispatchDetails = r => require.ensure([], () => r(require('../pages/projec const WeeklyClaimApply = r => require.ensure([], () => r(require('../pages/projectManagements/weekly/ExpenseClaimApply.vue')), 'WeeklyClaimApply') const AddClaimApply = r => require.ensure([], () => r(require('../pages/projectManagements/weekly/ExpenseClaimApplyAdd.vue')), 'AddClaimApply') const ClaimApplyDetail = r => require.ensure([], () => r(require('../pages/projectManagements/weekly/ExpenseClaimApplyDetail.vue')), 'ClaimApplyDetail') - +const ProjectBudgetApply = r => require.ensure([], () => r(require('../pages/projectManagements/weekly/projectBudget/ProjectBudgetApply.vue')), 'ProjectBudgetApply') +const ProjectBudgetApplyAdd = r => require.ensure([], () => r(require('../pages/projectManagements/weekly/projectBudget/ProjectBudgetApplyAdd.vue')), 'ProjectBudgetApplyAdd') +const ProjectBudgetApplyDetail = r => require.ensure([], () => r(require('../pages/projectManagements/weekly/projectBudget/ProjectBudgetApplyDetail.vue')), 'ProjectBudgetApplyDetail') //财务管理 const ExpenseReceipteManagement = r => require.ensure([], () => r(require('../pages/financialManagement/expenseReceipteManagement/ExpenseReceipteManagement.vue')), 'ExpenseReceipteManagement') const ExpenseReceipteDetail = r => require.ensure([], () => r(require('../pages/financialManagement/expenseReceipteManagement/ExpenseReceipteDetail.vue')), 'ExpenseReceipteDetail') @@ -2295,6 +2297,36 @@ export default new Router({ module: 'finance' } }, + { + //项目管理-->周报填报-->项目预算执行率监控周报 + name: 'ProjectBudgetApply', + path: '/project/managements/weekly/budget/expenses/claim/apply', + component: ProjectBudgetApply, + meta: { + info: 'ProjectBudgetApply', + module: 'project' + } + }, + { + //项目管理-->周报填报-->新增项目预算执行率监控周报 + name: 'ProjectBudgetApplyAdd', + path: '/project/managements/weekly/budget/expenses/claim/apply/add', + component: ProjectBudgetApplyAdd, + meta: { + info: 'ProjectBudgetApplyAdd', + module: 'project' + } + }, + { + //项目管理-->周报填报-->项目预算执行率监控周报详情 + name: 'ProjectBudgetApplyDetail', + path: '/project/managements/weekly/budget/expenses/claim/apply/edit/:id', + component: ProjectBudgetApplyDetail, + meta: { + info: 'ProjectBudgetApplyDetail', + module: 'finance' + } + }, // // { // //项目管理-->项目立项 diff --git a/kehui-oa-front/src/server/projectManagements/index.js b/kehui-oa-front/src/server/projectManagements/index.js index 301ee2f..d5b9097 100644 --- a/kehui-oa-front/src/server/projectManagements/index.js +++ b/kehui-oa-front/src/server/projectManagements/index.js @@ -42,8 +42,15 @@ export default { getOrgNames:(param) => Ax('post', `/api/common/orgs/getName`,param), /** - * 周报填报管理 + * 个人周报填报管理 */ addWeekly: (param) => Ax('post', '/api/project/weekly/add', param), - getWeekly: (param) => Ax('post', '/api/project/weekly', param) + getWeekly: (param) => Ax('post', '/api/project/weekly', param), + /** + * 项目预算执行率监控周报管理 + * + */ + getBudget:(param) => Ax('post', '/api/project/weekly/budget', param), + addBudget:(param) => Ax('post', '/api/project/weekly/budget/add', param), + delBudget:(param) => Ax('delete', '/api/project/weekly/budget/del', param), }