diff --git a/kehui-oa-front/src/pages/projectManagements/weekly/projectBudget/ProjectBudgetApply.vue b/kehui-oa-front/src/pages/projectManagements/weekly/projectBudget/ProjectBudgetApply.vue index 7d867d2..bc0e90e 100644 --- a/kehui-oa-front/src/pages/projectManagements/weekly/projectBudget/ProjectBudgetApply.vue +++ b/kehui-oa-front/src/pages/projectManagements/weekly/projectBudget/ProjectBudgetApply.vue @@ -99,6 +99,7 @@ export default { id: dataList[i].id, projectNo: dataList[i].projectNo, projectName: dataList[i].projectName, + deptName: dataList[i].deptName, week: dataList[i].week, budget: dataList[i].budget, execute: dataList[i].execute, @@ -172,6 +173,11 @@ export default { prop: 'projectName', show: true }, + { + label: "执行部门", + prop: 'deptName', + show: true + }, { label: '周数', prop: 'week', diff --git a/kehui-oa-front/src/pages/projectManagements/wholeFirmWeekly/WholeFirmWeeklyEdit.vue b/kehui-oa-front/src/pages/projectManagements/wholeFirmWeekly/WholeFirmWeeklyEdit.vue index 69cca89..31da2bc 100644 --- a/kehui-oa-front/src/pages/projectManagements/wholeFirmWeekly/WholeFirmWeeklyEdit.vue +++ b/kehui-oa-front/src/pages/projectManagements/wholeFirmWeekly/WholeFirmWeeklyEdit.vue @@ -105,6 +105,7 @@ export default { expandRight: false, app: app, reimburseId: '', + flag: '', actionUrl: `${baseUrl}/api/common/file-upload`, // 上传路径 baseUrl: baseUrl, formAll: [], @@ -173,12 +174,13 @@ export default { methods: { init () { this.reimburseId = this.$route.params.id + this.flag = this.$route.params.flag this.getWeekly() - }, getWeekly () { let ProjectWeekly = { - id: this.reimburseId + id: this.reimburseId, + flag: this.flag } Api.ProjectManagements.getDepartmentWeekly(ProjectWeekly).then(result => { this.tableRowsData = [] diff --git a/kehui-oa-front/src/pages/projectManagements/wholeFirmWeekly/WholeFirmWeeklyList.vue b/kehui-oa-front/src/pages/projectManagements/wholeFirmWeekly/WholeFirmWeeklyList.vue index 97ca988..ffec8b3 100644 --- a/kehui-oa-front/src/pages/projectManagements/wholeFirmWeekly/WholeFirmWeeklyList.vue +++ b/kehui-oa-front/src/pages/projectManagements/wholeFirmWeekly/WholeFirmWeeklyList.vue @@ -294,7 +294,10 @@ export default { updateById (id) { this.$router.push({ name: "WholeFirmWeeklyEdit", - params: {id} + params: { + id, + flag: '1' + } }) }, updateWorkload (id) {