From 1b6e8bf2c8ab9a08220c65e929a5561aeb699108 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, 24 Dec 2024 14:38:11 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=A7=94=E5=A4=96=E5=8A=A0=E5=B7=A5=20?=
 =?UTF-8?q?=E5=A7=94=E5=A4=96=E6=8A=A5=E4=BB=B7=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=A7=94=E5=A4=96=E6=8A=A5=E4=BB=B7=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E5=90=88=E5=B9=B6=E8=A1=A8=E6=A0=BC=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E6=A0=8F=E6=8C=89=E9=92=AE=EF=BC=9B=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=AE=BE=E7=BD=AE=E8=8A=82=E7=82=B9=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?service=E6=96=B9=E6=B3=95=EF=BC=8C=E6=96=B0=E5=A2=9E=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/OutsourceQuoteServiceImpl.java     |  2 +-
 .../system/outsource_quote/outsource_quote.html     | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

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 @@
                 <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> ');
-                        return actions.join('');
+                        actions.push('<a class="' + detailFlag + '" href="javascript:;" onclick="$.operate.detail(\'' + row.outsourceQuoteId + '\')"><i class="fa fa-search"></i>详情</a> ');
+                        var actionLinks = actions.join('');
+                        return $.table.dropdownToggle(actionLinks);
                     }
                 }],
                 rowStyle: function (row, index) {