From 8ada05120f4eb0d8d6f1346566fabdbd9d257083 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Thu, 26 Dec 2024 21:05:27 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E7=BB=A9=E6=95=88=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E7=BB=A9=E6=95=88=E7=AE=A1=E7=90=86=E5=9B=9B=E4=B8=AA=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E9=87=87=E7=94=A8?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/erp/ctc/ctc.html  | 14 +++++---------
 .../src/main/resources/templates/erp/utb/utb.html  | 12 ++++--------
 .../system/technicalMerits/technicalMerits.html    | 11 ++++++-----
 .../system/technicalTeam/technicalTeam.html        |  7 ++++---
 4 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/erp/ctc/ctc.html b/ruoyi-admin/src/main/resources/templates/erp/ctc/ctc.html
index 9b3d8236..568c4cd7 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/ctc/ctc.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/ctc/ctc.html
@@ -54,7 +54,7 @@
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="erp:ctc:remove">
                   <i class="fa fa-remove"></i> 删除
                 </a>-->
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="erp:ctc:export">
+                <a class="btn btn-success" onclick="$.table.exportExcel()" shiro:hasPermission="erp:ctc:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
             </div>
@@ -182,14 +182,10 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a> ');
-                        if(row.delFlag == '0'){
-                            actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.id + '\')"><i class="fa fa-remove"></i>作废</a> ');
-                        }else{
-                            actions.push('<a class="btn btn-success btn-xs ' + restoreFlag + '" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i>恢复</a> ');
-                        }
-                        return actions.join('');
+                        actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class=" ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a> ');
+                        var actionLinks = actions.join('');
+                        return $.table.dropdownToggle(actionLinks);
                     }
                 }]
             };
diff --git a/ruoyi-admin/src/main/resources/templates/erp/utb/utb.html b/ruoyi-admin/src/main/resources/templates/erp/utb/utb.html
index 63f5bcf2..bd3577ce 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/utb/utb.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/utb/utb.html
@@ -142,14 +142,10 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a> ');
-                        if(row.delFlag == '0'){
-                            actions.push('<a class="btn btn-danger btn-xs ' + cancelFlag + '" href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.id + '\')"><i class="fa fa-remove"></i>作废</a> ');
-                        }else{
-                            actions.push('<a class="btn btn-success btn-xs ' + restoreFlag + '" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i>恢复</a> ');
-                        }
-                        return actions.join('');
+                        actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class=" ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a> ');
+                        var actionLinks = actions.join('');
+                        return $.table.dropdownToggle(actionLinks);
                     }
                 }]
             };
diff --git a/ruoyi-admin/src/main/resources/templates/system/technicalMerits/technicalMerits.html b/ruoyi-admin/src/main/resources/templates/system/technicalMerits/technicalMerits.html
index d793d22c..1f91d54e 100644
--- a/ruoyi-admin/src/main/resources/templates/system/technicalMerits/technicalMerits.html
+++ b/ruoyi-admin/src/main/resources/templates/system/technicalMerits/technicalMerits.html
@@ -40,10 +40,10 @@
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:technicalMerits:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-                <a class="btn btn-warning">
+                <a class="btn btn-success">
                     <i class="fa fa-download"></i> 导入已发放绩效
                 </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:technicalMerits:export">
+                <a class="btn btn-success" onclick="$.table.exportExcel()" shiro:hasPermission="system:technicalMerits:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
             </div>
@@ -151,9 +151,10 @@
                 {title: '操作',align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="showFa(\'' + row+ '\')"><i class="fa fa-edit"></i>发放绩效</a> ');
-                        actions.push('<a class="btn btn-warning btn-xs ' + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-save"></i>详情</a> ');
-                        return actions.join('');
+                        actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="showFa(\'' + row+ '\')"><i class="fa fa-edit"></i>发放绩效</a> ');
+                        actions.push('<a  href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-save"></i>详情</a> ');
+                        var actionLinks = actions.join('');
+                        return $.table.dropdownToggle(actionLinks);
                     }
                 }]
             };
diff --git a/ruoyi-admin/src/main/resources/templates/system/technicalTeam/technicalTeam.html b/ruoyi-admin/src/main/resources/templates/system/technicalTeam/technicalTeam.html
index 09be6cbd..18223939 100644
--- a/ruoyi-admin/src/main/resources/templates/system/technicalTeam/technicalTeam.html
+++ b/ruoyi-admin/src/main/resources/templates/system/technicalTeam/technicalTeam.html
@@ -115,9 +115,10 @@
           align: 'center',
           formatter: function(value, row, index) {
             var actions = [];
-            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-            actions.push('<a class="btn btn-warning btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-remove"></i>详情</a> ');
-            return actions.join('');
+            actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+            actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-remove"></i>详情</a> ');
+            var actionLinks = actions.join('');
+            return $.table.dropdownToggle(actionLinks);
           }
         }
       ]