From 61ebb65965882cc93bb7ac79c7c97c795759999d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Tue, 22 Oct 2024 13:50:44 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=9F=BA=E7=A1=80=E8=B5=84=E6=96=99=20?= =?UTF-8?q?=E6=8A=A5=E9=94=80=E5=8D=95=20=E4=BF=AE=E6=94=B9=E6=8A=A5?= =?UTF-8?q?=E9=94=80=E5=8D=95=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=93=8D=E4=BD=9C=E6=A0=8F=E6=8C=89=E9=92=AE?= =?UTF-8?q?=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E6=8C=89=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=A7=92=E8=89=B2=E7=AD=9B=E9=80=89=E5=85=B6?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AFservice?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=BA=BA=E4=BA=8B?= =?UTF-8?q?=E7=BB=8F=E7=90=86=E8=A7=92=E8=89=B2=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BaseExpenseAccountServiceImpl.java | 2 +- .../baseEvectionForm/baseEvectionForm.html | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseExpenseAccountServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseExpenseAccountServiceImpl.java index 465134b4..edd3a5ca 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseExpenseAccountServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseExpenseAccountServiceImpl.java @@ -530,7 +530,7 @@ public class BaseExpenseAccountServiceImpl implements IBaseExpenseAccountService if(roleKeys.contains("zjlRole") || roleKeys.contains("zozjRole") || roleKeys.contains("fzjlRole") || roleKeys.contains("admin") - || roleKeys.contains("cwshRole")){ + || roleKeys.contains("cwshRole")|| roleKeys.contains("hrjlRole")){ Set users = sysUserlist.stream() .map(SysUser::getLoginName) // 提取每个 SysUser 对象的 name 属性 .collect(Collectors.toSet()); diff --git a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/baseEvectionForm.html b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/baseEvectionForm.html index 672d69d1..86a2a2f9 100644 --- a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/baseEvectionForm.html +++ b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/baseEvectionForm.html @@ -170,20 +170,20 @@ if(row.auditStatus=="1"&&row.useStatus == "1"&&row.personnelAdministration == "0"){ // 编辑 // actions.push(' 编辑 '); - actions.push(' 出行费用 '); + actions.push(' 出行费用 '); } if(row.auditStatus=="1"&&row.useStatus == "1"&&row.personnelAdministration == "1"){ // 核准 - actions.push(' 核准 '); + actions.push(' 核准 '); } if(row.auditStatus == "1"&& row.useStatus == "1"){ // 作废 - actions.push(' 作废'); + actions.push(' 作废'); } // 已作废 if(row.useStatus=="2" && !row.restoreInstanceId){ // 恢复 - actions.push(' 恢复 '); + actions.push(' 恢复 '); } // 有流程实例id if (row.instanceId) { @@ -196,13 +196,14 @@ } } // 审批历史 - actions.push(' 审批历史 '); + actions.push(' 审批历史 '); // 进度查看 - actions.push(' 进度查看 '); + actions.push(' 进度查看 '); } // 详情 - actions.push('详情 '); - return actions.join(''); + actions.push('详情 '); + var actionLinks = actions.join(''); + return $.table.dropdownToggle(actionLinks); } } ],