[fix]

基础资料 报销单
修改报销单列表页面，合并操作栏按钮；
修改按登录用户角色筛选其查看用户信息service方法，添加人事经理角色；

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<String> users = sysUserlist.stream()
                     .map(SysUser::getLoginName) // 提取每个 SysUser 对象的 name 属性
                     .collect(Collectors.toSet());

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('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i> 编辑</a> ');
-                                actions.push('<a class="btn btn-success btn-xs ' + hrRecordFlag + ' " href="javascript:void(0)" onclick="hrRecord(\'' + row.evectionId + '\')"><i class="fa fa-edit"></i> 出行费用</a> ');
+                                actions.push('<a class="' + hrRecordFlag + ' " href="javascript:void(0)" onclick="hrRecord(\'' + row.evectionId + '\')"><i class="fa fa-edit"></i> 出行费用</a> ');
                             }
                             if(row.auditStatus=="1"&&row.useStatus == "1"&&row.personnelAdministration == "1"){
                                 // 核准
-                                actions.push('<a class="btn btn-success btn-xs ' + hrApproveFlag + ' " href="javascript:void(0)" onclick="hrApprove(\'' + row.evectionId + '\')"><i class="fa fa-edit"></i> 核准</a> ');
+                                actions.push('<a class="' + hrApproveFlag + ' " href="javascript:void(0)" onclick="hrApprove(\'' + row.evectionId + '\')"><i class="fa fa-edit"></i> 核准</a> ');
                             }
                             if(row.auditStatus == "1"&& row.useStatus == "1"){
                                 // 作废
-                                actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="cancel(\'' + row.evectionId + '\')"><i class="fa fa-remove"></i> 作废</a>');
+                                actions.push('<a class="' + cancelFlag + '" href="javascript:void(0)" onclick="cancel(\'' + row.evectionId + '\')"><i class="fa fa-remove"></i> 作废</a>');
                             }
                             // 已作废
                             if(row.useStatus=="2" && !row.restoreInstanceId){
                                 // 恢复
-                                actions.push('<a class="btn btn-success btn-xs ' + restoreFlag + '" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.evectionId + '\')"><i class="fa fa-window-restore"></i> 恢复</a> ');
+                                actions.push('<a class="btn ' + restoreFlag + '" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.evectionId + '\')"><i class="fa fa-window-restore"></i> 恢复</a> ');
                             }
                             // 有流程实例id
                             if (row.instanceId) {
@@ -196,13 +196,14 @@
                                     }
                                 }
                                 // 审批历史
-                                actions.push('<a class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="showHistoryDialog(\'' + row.instanceId + '\')"><i class="fa fa-list"></i> 审批历史</a> ');
+                                actions.push('<a href="javascript:void(0)" onclick="showHistoryDialog(\'' + row.instanceId + '\')"><i class="fa fa-list"></i> 审批历史</a> ');
                                 // 进度查看
-                                actions.push('<a class="btn btn-info btn-xs" href="javascript:void(0)" onclick="showProcessImgDialog(\'' + row.instanceId + '\')"><i class="fa fa-image"></i> 进度查看</a> ');
+                                actions.push('<a href="javascript:void(0)" onclick="showProcessImgDialog(\'' + row.instanceId + '\')"><i class="fa fa-image"></i> 进度查看</a> ');
                             }
                             // 详情
-                            actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.operate.detail(\'' + row.evectionId + '\')"><i class="fa fa-edit"></i>详情</a> ');
+                            actions.push('<a href="javascript:void(0)" onclick="$.operate.detail(\'' + row.evectionId + '\')"><i class="fa fa-edit"></i>详情</a> ');
-                            return actions.join('');
+                            var actionLinks = actions.join('');
+                            return $.table.dropdownToggle(actionLinks);
                         }
                     }
                 ],