From 1dbf4b8388f647767c038134e0670795c7fc49b8 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Fri, 13 Dec 2024 08:46:44 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E5=B7=A5=E7=A8=8B=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=E4=BF=AE=E6=94=B9=E5=8D=95=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E6=93=8D=E4=BD=9C=E6=A0=8F?=
 =?UTF-8?q?=E5=92=8C=E8=A1=A8=E5=A4=B4=E6=8C=89=E9=92=AE=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E4=B8=BA=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

---
 .../developModifyOrder/developModifyOrder.html  | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html
index 684cad9a..38f8e92c 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html
@@ -65,7 +65,7 @@
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="erp:developModifyOrder:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-                <a class="btn btn-warning" onclick="exportExcel()" shiro:hasPermission="erp:developModifyOrder:export">
+                <a class="btn btn-success" onclick="exportExcel()" shiro:hasPermission="erp:developModifyOrder:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
             </div>
@@ -245,9 +245,9 @@
                             // 审核状态-审核通过
                             if(row.auditStatus=="1"){
                                 // 编辑
-                                actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.developOrderId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                                actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.developOrderId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                                 if (row.purchaseStorageStatus == 7 || row.purchaseStorageStatus == 8){
-                                    actions.push('<a class="btn btn-success btn-xs ' + pickAddFlag + '" href="javascript:void(0)" onclick="pickAdd(\'' + row.developOrderId + '\')"><i class="fa fa-edit"></i>领料</a> ');
+                                    actions.push('<a class=" ' + pickAddFlag + '" href="javascript:void(0)" onclick="pickAdd(\'' + row.developOrderId + '\')"><i class="fa fa-edit"></i>领料</a> ');
                                 }
 
                             }
@@ -258,17 +258,18 @@
                                     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  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  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="detail(\'' + row.developOrderId + '\')"><i class="fa fa-edit"></i>详情</a> ');
-                            return actions.join('');
+                            actions.push('<a  href="javascript:void(0)" onclick="detail(\'' + row.developOrderId + '\')"><i class="fa fa-edit"></i>详情</a> ');
+                            var actionLinks = actions.join('');
+                            return $.table.dropdownToggle(actionLinks);
                         }
                     }
                 ]