From ca1b62671b7e6c56101d5dab41a59e0a47061196 Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Mon, 2 Feb 2026 15:11:02 +0800 Subject: [PATCH] commit --- .../reimbursement/apply/index.html | 27 +++++-------------- 1 file changed, 6 insertions(+), 21 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 158cd71..1a1efd1 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 @@ -367,30 +367,15 @@ layout("/layouts/platform.html"){ }, methods: { hasUnionRole() { - return this.$auth.hasRoleOr([ - "UNION_REIMBURSEMENT_MANAGER", - "BRANCH_UNION_CHAIRMAN", - "BRANCH_UNION_WENTI_SPORTS", - "BRANCH_UNION_XJSHAN_PROMOTION", - "BRANCH_UNION_ADMIN", - "BRANCH_UNION_VICE_CHAIRMAN" - ]); + return this.$auth.hasPermission('activityReimbursement.apply.unionHas') }, hasClubRole() { - return this.$auth.hasRoleOr([ - "CLUB_REIMBURSEMENT_MANAGER", - "CLUB_PRESIDENT" - ]); + return this.$auth.hasPermission('activityReimbursement.apply.clubHas') }, hasSchoolLevelRole() { - return this.$auth.hasRoleOr([ - "SYSADMIN", - "SCHOOL_UNION_ADMIN", - "SCHOOL_UNION_CHAIRMAN", - "SCHOOL_UNION_VICE_CHAIRMAN" - ]); + return this.$auth.hasPermission('activityReimbursement.apply.schoolHas') }, clubIdChange() { @@ -592,7 +577,7 @@ layout("/layouts/platform.html"){ budgetTypeCloseOption.push(typeOneOption) } - if (this.$auth.hasRoleOr(["SYSADMIN", "SCHOOL_UNION_ADMIN","SCHOOL_UNION_CHAIRMAN","SCHOOL_UNION_VICE_CHAIRMAN"])) { + if (this.$auth.hasPermission('activityReimbursement.apply.schoolHas')) { const allCodes = [ "ACTIVITY_BUDGET_TYPE_TWO", "ACTIVITY_BUDGET_TYPE_THREE"] allCodes.forEach(code => { const option = resp.find(v => v.code === code) @@ -601,13 +586,13 @@ layout("/layouts/platform.html"){ } }) } else { - 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"])) { + if (this.$auth.hasPermission('activityReimbursement.apply.unionHas')) { 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) } } - if (this.$auth.hasRoleOr(["CLUB_REIMBURSEMENT_MANAGER", "CLUB_PRESIDENT"])) { + if (this.$auth.hasPermission('activityReimbursement.apply.clubHas')) { const typeThreeOption = resp.find(v => v.code === "ACTIVITY_BUDGET_TYPE_THREE") if (typeThreeOption && !budgetTypeCloseOption.some(existing => existing.code === "ACTIVITY_BUDGET_TYPE_THREE")) { budgetTypeCloseOption.push(typeThreeOption)