diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceQuoteServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceQuoteServiceImpl.java
index 306d2703..47ccad2c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceQuoteServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/OutsourceQuoteServiceImpl.java
@@ -354,7 +354,7 @@ public class OutsourceQuoteServiceImpl implements IOutsourceQuoteService
variables.put("authority",1);
}else if(roleKeys.contains("wwjlRole")){
variables.put("authority",2);
- }else if(roleKeys.contains("wwzgRole")){
+ }else if(roleKeys.contains("wwzgRole")||roleKeys.contains("admin")){
variables.put("authority",3);
}
}
diff --git a/ruoyi-admin/src/main/resources/templates/system/outsource_quote/outsource_quote.html b/ruoyi-admin/src/main/resources/templates/system/outsource_quote/outsource_quote.html
index ad6d1652..11c7b8a5 100644
--- a/ruoyi-admin/src/main/resources/templates/system/outsource_quote/outsource_quote.html
+++ b/ruoyi-admin/src/main/resources/templates/system/outsource_quote/outsource_quote.html
@@ -62,7 +62,7 @@
添加
-
+
导出
@@ -243,16 +243,17 @@
var todoUserIdList = row.todoUserId.split(",");
if(todoUserIdList.includes(loginName) || loginName == 'admin'){
var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批';
- actions.push(' '+nodeName+' ');
+ actions.push(' '+nodeName+' ');
}
}
// 审批历史
- actions.push(' 审批历史 ');
+ actions.push(' 审批历史 ');
// 进度查看
- actions.push(' 进度查看 ');
+ actions.push(' 进度查看 ');
}
- actions.push('详情 ');
- return actions.join('');
+ actions.push('详情 ');
+ var actionLinks = actions.join('');
+ return $.table.dropdownToggle(actionLinks);
}
}],
rowStyle: function (row, index) {