diff --git a/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyList.vue b/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyList.vue index 7cdd929..c077241 100644 --- a/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyList.vue +++ b/kehui-oa-front/src/pages/projectManagements/departmentWeekly/DepartmentWeeklyList.vue @@ -53,7 +53,9 @@ @@ -123,6 +125,8 @@ showDelete: false, showCheck: true, }, + sum: false, + buttonText: '汇总', searchForm: { projectName: '', week: '' @@ -280,15 +284,14 @@ params: {id} }) }, - summary (id) { - Api.ProjectManagements.insertPermission(id).then(result => { + summary (row) { + Api.ProjectManagements.insertPermission(row.id).then(result => { if (result.status === 0) { this.$message.success(result.data) this.$router.push({name: 'DepartmentWeeklyList'}) - } else { - this.$message.error(result.data) } }) + row.summarized = true; }, updateWorkload (id) { this.$router.push({ @@ -313,4 +316,9 @@ .page-content { padding: 15px; } + + .el-table .summarized-row { + background-color: #f0f9eb; /* 修改行背景色 */ + color: #67c23a; /* 修改行文本颜色 */ + } diff --git a/kehui-oa-front/src/pages/projectManagements/weekly/projectBudget/ProjectBudgetApplyDetail.vue b/kehui-oa-front/src/pages/projectManagements/weekly/projectBudget/ProjectBudgetApplyDetail.vue index 45baaaa..c3b9a5d 100644 --- a/kehui-oa-front/src/pages/projectManagements/weekly/projectBudget/ProjectBudgetApplyDetail.vue +++ b/kehui-oa-front/src/pages/projectManagements/weekly/projectBudget/ProjectBudgetApplyDetail.vue @@ -76,7 +76,7 @@
取消 - 保存 + 保存
@@ -108,6 +108,7 @@ export default { thisWeek: '', nextWeek: '', userId: '', + roleUserId: [], workload: '', projectName: '', week: '', @@ -118,6 +119,7 @@ export default { reimburseId: '', actionUrl: `${baseUrl}/api/common/file-upload`, // 上传路径 baseUrl: baseUrl, + formAll: [], formModel: { userInfoId: '', witness: '', @@ -238,7 +240,9 @@ export default { this.pageLoading = false console.log('预算执行率', result) if (result.status === 0) { + let dataAll = result.data let dataList = result.data.ls[0] + this.formAll = dataAll this.formModel = dataList // this.tableRowsData.push({ // id: dataList.id, @@ -412,6 +416,14 @@ export default { cancel () { this.$router.go(-1) }, + shouldDisable () { + const roleUserIds = this.formAll.roleUserId; + const userId = this.formAll.userId + for (let i = 0; i < roleUserIds.length; i++) { + this.isSave = roleUserIds[i] !== userId; + } + return this.isSave + }, save (formName) { console.log('formName', formName) this.$refs[formName].validate((valid) => {