From 45051ebff630119f88d76d7d2b8280839636ea77 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Mon, 23 Dec 2024 19:27:19 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E5=88=B6=E7=A8=8B=E7=B1=BB=E5=88=AB=E6=98=8E=E7=BB=86=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2=E3=80=81=E5=B7=A5=E5=BA=8F=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E3=80=81=E6=88=90?=
 =?UTF-8?q?=E5=93=81SOP=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E3=80=81?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E3=80=81=E7=94=9F=E4=BA=A7=E5=85=A5=E5=BA=93=E5=8D=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E3=80=81=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E9=80=80=E6=A3=80=E5=8D=95=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E6=93=8D=E4=BD=9C=E6=A0=8F=E7=9B=AE=E6=8C=89=E7=85=A7?=
 =?UTF-8?q?=E5=85=A8=E5=B1=80=E7=BB=9F=E4=B8=80=E6=A0=B7=E5=BC=8F=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/erp/inboundOrder/inboundOrder.html |  5 +++--
 .../materialReturnInspection.html                |  9 +++++----
 .../templates/system/makeorder/makeorder.html    | 16 ++++++++--------
 .../templates/system/procedure/procedure.html    | 15 +++++----------
 .../system/processCategory/processCategory.html  | 16 +++++-----------
 .../main/resources/templates/system/sop/sop.html |  9 +++++----
 6 files changed, 31 insertions(+), 39 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/inboundOrder.html b/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/inboundOrder.html
index 9958c74d..7d40b791 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/inboundOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/inboundOrder.html
@@ -45,7 +45,7 @@
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-warning" onclick="exportExcel()" shiro:hasPermission="erp:inboundOrder:export">
+                <a class="btn btn-success" onclick="exportExcel()" shiro:hasPermission="erp:inboundOrder:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
             </div>
@@ -167,7 +167,8 @@
                         title: '操作', align: 'center',formatter: function(value, row, index) {
                             var actions = [];
                             actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="storageMakeDetail(\'' + row.warehouseStorageId + '\')"><i class="fa fa-edit"></i>详情</a> ');
-                            return actions.join('');
+                            var actionLinks = actions.join('');
+                            return $.table.dropdownToggle(actionLinks);
                         }
                     }
                 ]
diff --git a/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/materialReturnInspection.html b/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/materialReturnInspection.html
index 175b546d..1c11c481 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/materialReturnInspection.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/materialReturnInspection.html
@@ -56,7 +56,7 @@
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="erp:materialReturnInspection:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-                <a class="btn btn-warning" onclick="exportExcel()" shiro:hasPermission="erp:materialReturnInspection:export">
+                <a class="btn btn-success" onclick="exportExcel()" shiro:hasPermission="erp:materialReturnInspection:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
             </div>
@@ -127,10 +127,11 @@
                     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-success btn-xs " href="javascript:void(0)" onclick="detail(\'' + row.id + '\')"><i class="fa fa-edit"></i>详情</a> ');
+                        actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a  href="javascript:void(0)" onclick="detail(\'' + row.id + '\')"><i class="fa fa-edit"></i>详情</a> ');
 
-                        return actions.join('');
+                        var actionLinks = actions.join('');
+                        return $.table.dropdownToggle(actionLinks);
                     }
                 }]
             };
diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html
index 9045e958..5c99baa7 100644
--- a/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/makeorder.html
@@ -261,38 +261,38 @@
                         // 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> ');
                         //详情页面 工程审核为详情页面
                         // actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-edit"></i>详情</a> ');
-                        actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.modal.open(\'详情\',\'' + prefix+"/detail/"+row.id + '\')"><i class="fa fa-info"></i>详情</a> ');
+                        actions.push('<a  href="javascript:void(0)" onclick="$.modal.open(\'详情\',\'' + prefix+"/detail/"+row.id + '\')"><i class="fa fa-info"></i>详情</a> ');
                         // 评审
                         if(row.makeStatus == '0'){
-                            actions.push('<a class="btn btn-success btn-xs ' + reviewFlag + '" href="javascript:void(0)" onclick="$.modal.open(\'部门评审\',\'' + prefix+"/bmps/"+row.id + '\')"><i class="fa fa-edit"></i>评审</a> ');
+                            actions.push('<a class=" ' + reviewFlag + '" href="javascript:void(0)" onclick="$.modal.open(\'部门评审\',\'' + prefix+"/bmps/"+row.id + '\')"><i class="fa fa-edit"></i>评审</a> ');
                         }
                         // 部门主管确认
                         if(row.deptLeaderConfirmStatus == '0'){
-                            actions.push('<a class="btn btn-success btn-xs ' + confirmFlag + '" href="javascript:void(0)" onclick="$.modal.open(\'部门主管确认\',\'' + prefix+"/bmzgqr/"+row.id + '\')"><i class="fa fa-edit"></i>确认时间</a> ');
+                            actions.push('<a class=" ' + confirmFlag + '" href="javascript:void(0)" onclick="$.modal.open(\'部门主管确认\',\'' + prefix+"/bmzgqr/"+row.id + '\')"><i class="fa fa-edit"></i>确认时间</a> ');
                         }
                         // 工程审核
                         if(row.makeStatus == '2'){
-                            actions.push('<a class="btn btn-success btn-xs ' + engineerFlag + '" href="javascript:void(0)" onclick="$.modal.open(\'工程审核\',\'' + prefix+"/gcsh/"+row.id + '\')"><i class="fa fa-edit"></i>工程审核</a> ');
+                            actions.push('<a class=" ' + engineerFlag + '" href="javascript:void(0)" onclick="$.modal.open(\'工程审核\',\'' + prefix+"/gcsh/"+row.id + '\')"><i class="fa fa-edit"></i>工程审核</a> ');
                         }
                         // 采购审核：生产状态-待采购审核，采购上级确认状态-已确认
                         if(row.makeStatus == '7'&&row.purchaseStatus == '1'){
-                            actions.push('<a class="btn btn-success btn-xs ' + purchaseFlag + '" href="javascript:void(0)" onclick="$.modal.open(\'采购审核\',\'' + prefix+"/cgsh/"+row.id + '\')"><i class="fa fa-edit"></i>采购审核</a> ');
+                            actions.push('<a class="' + purchaseFlag + '" href="javascript:void(0)" onclick="$.modal.open(\'采购审核\',\'' + prefix+"/cgsh/"+row.id + '\')"><i class="fa fa-edit"></i>采购审核</a> ');
                         }
                         // 领料
                         if((row.makeStatus == '3' || row.makeStatus == '4' || row.makeStatus == '5') &&
                             (row.eceiptStatus == '7' || row.eceiptStatus == '8')){
-                            actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.modal.open(\'添加领料单\',\'' + prefix+"/addpick/"+row.id + '\')"><i class="fa fa-edit"></i>领料</a> ');
+                            actions.push('<a  href="javascript:void(0)" onclick="$.modal.open(\'添加领料单\',\'' + prefix+"/addpick/"+row.id + '\')"><i class="fa fa-edit"></i>领料</a> ');
                         }
                         // 委外计划
                         if((row.makeStatus == '3' || row.makeStatus == '4' || row.makeStatus == '5') &&
                             (row.eceiptStatus == '3' || row.eceiptStatus == '4'|| row.eceiptStatus == '5'|| row.eceiptStatus == '6'|| row.eceiptStatus == '7'
                                 || row.eceiptStatus == '8')){
-                            actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.modal.open(\'添加委外计划\',\'' + prefix+"/addOutsourcePlan/"+row.id + '\')"><i class="fa fa-edit"></i>委外计划</a> ');
+                            actions.push('<a  href="javascript:void(0)" onclick="$.modal.open(\'添加委外计划\',\'' + prefix+"/addOutsourcePlan/"+row.id + '\')"><i class="fa fa-edit"></i>委外计划</a> ');
                         }
                         // 委内入库 对应生产中
                         if(row.makeStatus == '4' || row.makeStatus == '5'){
                             // actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.modal.open(\'创建委内入库单\',\'' + prefix+"/addProcessInbound/"+row.id + '\')">委内入库</a> ');
-                            actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.modal.open(\'创建生产入库和设备履历设置\',\'' + prefix+"/addProduceInbound/"+row.id + '\')"><i class="fa fa-edit"></i>生产入库</a> ');
+                            actions.push('<a  href="javascript:void(0)" onclick="$.modal.open(\'创建生产入库和设备履历设置\',\'' + prefix+"/addProduceInbound/"+row.id + '\')"><i class="fa fa-edit"></i>生产入库</a> ');
                         }
 
 
diff --git a/ruoyi-admin/src/main/resources/templates/system/procedure/procedure.html b/ruoyi-admin/src/main/resources/templates/system/procedure/procedure.html
index 99e41d68..6087ef72 100644
--- a/ruoyi-admin/src/main/resources/templates/system/procedure/procedure.html
+++ b/ruoyi-admin/src/main/resources/templates/system/procedure/procedure.html
@@ -52,12 +52,6 @@
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:procedure:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-<!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:procedure:edit">-->
-<!--                    <i class="fa fa-edit"></i> 修改-->
-<!--                </a>-->
-<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:procedure:remove">-->
-<!--                    <i class="fa fa-remove"></i> 删除-->
-<!--                </a>-->
 <!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:procedure:export">-->
 <!--                    <i class="fa fa-download"></i> 导出-->
 <!--                </a>-->
@@ -104,10 +98,11 @@
                     {field: 'updateTime', title: '上次更新时间'},
                     {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="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                            actions.push('<a class="btn btn-primary btn-xs " href="javascript:void(0)" onclick="$.operate.detail(\'' + 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>');
-                            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  href="javascript:void(0)" onclick="$.operate.detail(\'' + 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/processCategory/processCategory.html b/ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html
index 334de092..7eb2051e 100644
--- a/ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html
+++ b/ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html
@@ -31,12 +31,6 @@
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:processCategory:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:processCategory:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:processCategory:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
 <!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:processCategory:export">-->
 <!--                    <i class="fa fa-download"></i> 导出-->
 <!--                </a>-->
@@ -63,7 +57,6 @@
                 showColumns: false,
                 fixedColumns: true, // 启用冻结列
                 fixedRightNumber: 1, // 冻结右列个数
-                height: $(window).height() - 100,
                 modalName: "制程类别明细",
                 columns: [
                     {checkbox: true},
@@ -79,10 +72,11 @@
                     {field: 'updateTime',title: '上次更新时间'},
                     {title: '操作',align: 'center',formatter: function(value, row, index) {
                             var actions = [];
-                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                            actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
-                            actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="#" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-edit"></i>详情</a> ');
-                            return actions.join('');
+                            actions.push('<a class="' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                            actions.push('<a class="' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                            actions.push('<a class="' + editFlag + '" href="#" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-edit"></i>详情</a> ');
+                            var actionLinks = actions.join('');
+                            return $.table.dropdownToggle(actionLinks);
                         }
                     }
                 ]
diff --git a/ruoyi-admin/src/main/resources/templates/system/sop/sop.html b/ruoyi-admin/src/main/resources/templates/system/sop/sop.html
index 6c1cb0a2..aa8dd0e4 100644
--- a/ruoyi-admin/src/main/resources/templates/system/sop/sop.html
+++ b/ruoyi-admin/src/main/resources/templates/system/sop/sop.html
@@ -213,11 +213,12 @@
                 },
                 {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="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-primary btn-xs " href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-remove"></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>');
+                        actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a  href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-remove"></i>详情</a>');
+                        actions.push('<a class="' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
 
-                        return actions.join('');
+                        var actionLinks = actions.join('');
+                        return $.table.dropdownToggle(actionLinks);
                     }
                 }
             ]