From 74036ad4190d8ac51c0c6c82cb2f930447bcdd4c Mon Sep 17 00:00:00 2001 From: JyuHsin <729757837@qq.com> Date: Sat, 31 Jan 2026 14:20:06 +0800 Subject: [PATCH] commit --- .../declarereimbursement/reimbursement/apply/index.html | 2 +- .../zhgh/dayofficework/outlay/activityBudget/apply/index.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/index.html b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/index.html index 3f5e4cc..cd188f7 100644 --- a/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/index.html +++ b/src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/apply/index.html @@ -600,7 +600,7 @@ layout("/layouts/platform.html"){ } }) } else { - if (this.$auth.hasRoleOr(["UNION_REIMBURSEMENT_MANAGER", "BRANCH_UNION_CHAIRMAN", "BRANCH_UNION_WENTI_SPORTS","BRANCH_UNION_ADMIN","BRANCH_UNION_VICE_CHAIRMAN"])) { + if (this.$auth.hasRoleOr(["UNION_REIMBURSEMENT_MANAGER", "BRANCH_UNION_CHAIRMAN", "BRANCH_UNION_WENTI_SPORTS","BRANCH_UNION_XJSHAN_PROMOTION","BRANCH_UNION_ADMIN","BRANCH_UNION_VICE_CHAIRMAN"])) { const typeTwoOption = resp.find(v => v.code === "ACTIVITY_BUDGET_TYPE_TWO") if (typeTwoOption && !budgetTypeCloseOption.some(existing => existing.code === "ACTIVITY_BUDGET_TYPE_TWO")) { budgetTypeCloseOption.push(typeTwoOption) diff --git a/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/apply/index.html b/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/apply/index.html index fd49f0e..d16f640 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/apply/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/outlay/activityBudget/apply/index.html @@ -252,14 +252,14 @@ layout("/layouts/platform.html"){ if (this.$auth.hasRoleOr(['SYSADMIN'])) { this.budgetTypeOption = data } else { - if (this.$auth.hasRoleOr(['SCHOOL_UNION_ADMIN'])) { + if (this.$auth.hasRoleOr(['SCHOOL_UNION_ADMIN', 'SCHOOL_UNION_CHAIRMAN', 'SCHOOL_UNION_VICE_CHAIRMAN'])) { data.map(v => { if (["ACTIVITY_BUDGET_TYPE_ONE"].includes(v.code)) { budgetTypeOption.push(v) } }) } - if (this.$auth.hasRoleOr(['BRANCH_UNION_ADMIN', 'BRANCH_UNION_CHAIRMAN'])) { + if (this.$auth.hasRoleOr(['BRANCH_UNION_ADMIN', 'BRANCH_UNION_CHAIRMAN', 'BRANCH_UNION_WENTI_SPORTS', 'BRANCH_UNION_XJSHAN_PROMOTION'])) { data.map(v => { if (["ACTIVITY_BUDGET_TYPE_TWO"].includes(v.code)) { budgetTypeOption.push(v)