[fix]

委外加工 委外报价
修改委外报价列表页面，合并表格操作栏按钮；
修改设置节点变量service方法，新增角色；

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);
         }
     }

ruoyi-admin/src/main/resources/templates/system/outsource_quote/outsource_quote.html

@@ -62,7 +62,7 @@
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:outsource_quote:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-                <a class="btn btn-warning" onclick="exportExcel()" shiro:hasPermission="system:outsource_quote:export">
+                <a class="btn btn-success" onclick="exportExcel()" shiro:hasPermission="system:outsource_quote:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
             </div>
@@ -243,16 +243,17 @@
                                 var todoUserIdList = row.todoUserId.split(",");
                                 if(todoUserIdList.includes(loginName) || loginName == 'admin'){
                                     var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批';
-                                    actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> ');
+                                    actions.push('<a class="" href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> ');
                                 }
                             }
                             // 审批历史
-                            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 class="" 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 class="" href="javascript:void(0)" onclick="showProcessImgDialog(\'' + row.instanceId + '\')"><i class="fa fa-image"></i> 进度查看</a> ');
                         }
-                        actions.push('<a class="btn btn-info btn-xs ' + detailFlag + '" href="javascript:;" onclick="$.operate.detail(\'' + row.outsourceQuoteId + '\')"><i class="fa fa-search"></i>详情</a> ');
+                        actions.push('<a class="' + detailFlag + '" href="javascript:;" onclick="$.operate.detail(\'' + row.outsourceQuoteId + '\')"><i class="fa fa-search"></i>详情</a> ');
-                        return actions.join('');
+                        var actionLinks = actions.join('');
+                        return $.table.dropdownToggle(actionLinks);
                     }
                 }],
                 rowStyle: function (row, index) {