diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java
index 2ac28d4e..a719ad53 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java
@@ -1,6 +1,8 @@
 package com.ruoyi.warehouse.service.impl;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -1829,109 +1831,120 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS
             //      新增采购入库库存历史记录
             String purchasePlanCode = purchaseOrderMapper.selectPurchasePlanCodeByCode(correlationCode);
 
-            PurchasePlan purchasePlan = purchasePlanMapper.selectPurchasePlanByPlanCode(purchasePlanCode);
-            if ("2".equals(purchasePlan.getPurchasePlanType())){ //来源为请购单
-                List<PurchaseOrderChild> purchaseOrderChildList = purchaseOrderChildMapper.selectPurchaseOrderChildByOrderCode(correlationCode);
-                for (PurchaseOrderChild purchaseOrderChild : purchaseOrderChildList) {
-                    if(purchaseOrderChild.getMaterialNo().equals(materialNo)){
-
-                        WarehouseInventoryInquiry oldWarehouseInventoryInquiry = warehouseInventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(materialNo);
-                        Integer historicalTotal = oldWarehouseInventoryInquiry.getHistoricalTotal();
-                        historicalTotal += storageNum;
-                        oldWarehouseInventoryInquiry.setHistoricalTotal(historicalTotal);
-
-                        Integer availableStockNum = oldWarehouseInventoryInquiry.getAvailableStockNum();
-                        if (availableStockNum == null || availableStockNum == 0){
-                            availableStockNum = storageNum;
-                        }else {
-                            availableStockNum += storageNum;
-                        }
+            List<String> purchasePlanCodes = new ArrayList<>();
+            if (StringUtils.isEmpty(purchasePlanCode)){
+                throw new BusinessException("找不到与采购单号关联的采购计划号");
+            }
 
-                        oldWarehouseInventoryInquiry.setAvailableStockNum(availableStockNum);
+            if (StringUtils.isNotEmpty(purchasePlanCode)){
+                String[] splitPurchasePlanCode = purchasePlanCode.split(",");
+                purchasePlanCodes = Arrays.asList(splitPurchasePlanCode);
+            }
+
+            List<PurchasePlan> purchasePlans = purchasePlanMapper.selectPurchaseOrderByPlanCodeList(purchasePlanCodes);
+            for (PurchasePlan purchasePlan : purchasePlans) {
+                if ("2".equals(purchasePlan.getPurchasePlanType())){ //来源为请购单
+                    List<PurchaseOrderChild> purchaseOrderChildList = purchaseOrderChildMapper.selectPurchaseOrderChildByOrderCode(correlationCode);
+                    for (PurchaseOrderChild purchaseOrderChild : purchaseOrderChildList) {
+                        if(purchaseOrderChild.getMaterialNo().equals(materialNo)){
+
+                            WarehouseInventoryInquiry oldWarehouseInventoryInquiry = warehouseInventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(materialNo);
+                            Integer historicalTotal = oldWarehouseInventoryInquiry.getHistoricalTotal();
+                            historicalTotal += storageNum;
+                            oldWarehouseInventoryInquiry.setHistoricalTotal(historicalTotal);
+
+                            Integer availableStockNum = oldWarehouseInventoryInquiry.getAvailableStockNum();
+                            if (availableStockNum == null || availableStockNum == 0){
+                                availableStockNum = storageNum;
+                            }else {
+                                availableStockNum += storageNum;
+                            }
+
+                            oldWarehouseInventoryInquiry.setAvailableStockNum(availableStockNum);
 //                        Integer oldAvailableStockNum = warehouseInventoryInquiryService.calculateAvailableStockNum(materialNo);
 //                        oldWarehouseInventoryInquiry.setAvailableStockNum(oldAvailableStockNum + storageNum); //加上本次入库的数量
-                        Integer sharedAvailableStockNum = oldWarehouseInventoryInquiry.getSharedAvailableStockNum();//共享可用库存
-                        if (sharedAvailableStockNum == null || sharedAvailableStockNum == 0){
-                            sharedAvailableStockNum = storageNum;
-                        }else {
-                            sharedAvailableStockNum += storageNum;
-                        }
-                        oldWarehouseInventoryInquiry.setSharedAvailableStockNum(sharedAvailableStockNum);
-
-                        int updateResult = warehouseInventoryInquiryService.updateWarehouseInventoryInquiry(oldWarehouseInventoryInquiry);
-                        if (updateResult <= 0){
-                            throw new BusinessException("更新库存查询记录失败！");
-                        }
-
-                        remindService.warehouseSafetyStockRemind(oldWarehouseInventoryInquiry);
-
-                        WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail();
-                        inquiryDetail.setMaterialNo(materialNo);
-                        inquiryDetail.setInquiryWarehouseType("0");//采购入库
-                        inquiryDetail.setInventoryHistoricalTime(DateUtils.getNowDate());
-                        inquiryDetail.setInquiryOrderType("0");
-                        inquiryDetail.setInquiryBusinessType("0");
-                        inquiryDetail.setCorrelationCode(storageCode);
-                        inquiryDetail.setIncreaseDecreaseNum(warehouseStorageOrderDetail.getStorageNum());
-                        inquiryDetail.setInventoryIncreaseDecrease("1");
-                        int insertDetailResult = inventoryInquiryDetailMapper.insertWarehouseInventoryInquiryDetail(inquiryDetail);
-                        if (insertDetailResult <= 0){
-                            throw new BusinessException("新增库存履历失败！");
+                            Integer sharedAvailableStockNum = oldWarehouseInventoryInquiry.getSharedAvailableStockNum();//共享可用库存
+                            if (sharedAvailableStockNum == null || sharedAvailableStockNum == 0){
+                                sharedAvailableStockNum = storageNum;
+                            }else {
+                                sharedAvailableStockNum += storageNum;
+                            }
+                            oldWarehouseInventoryInquiry.setSharedAvailableStockNum(sharedAvailableStockNum);
+
+                            int updateResult = warehouseInventoryInquiryService.updateWarehouseInventoryInquiry(oldWarehouseInventoryInquiry);
+                            if (updateResult <= 0){
+                                throw new BusinessException("更新库存查询记录失败！");
+                            }
+
+                            remindService.warehouseSafetyStockRemind(oldWarehouseInventoryInquiry);
+
+                            WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail();
+                            inquiryDetail.setMaterialNo(materialNo);
+                            inquiryDetail.setInquiryWarehouseType("0");//采购入库
+                            inquiryDetail.setInventoryHistoricalTime(DateUtils.getNowDate());
+                            inquiryDetail.setInquiryOrderType("0");
+                            inquiryDetail.setInquiryBusinessType("0");
+                            inquiryDetail.setCorrelationCode(storageCode);
+                            inquiryDetail.setIncreaseDecreaseNum(warehouseStorageOrderDetail.getStorageNum());
+                            inquiryDetail.setInventoryIncreaseDecrease("1");
+                            int insertDetailResult = inventoryInquiryDetailMapper.insertWarehouseInventoryInquiryDetail(inquiryDetail);
+                            if (insertDetailResult <= 0){
+                                throw new BusinessException("新增库存履历失败！");
+                            }
                         }
                     }
-                }
-            }else if ("1".equals(purchasePlan.getPurchasePlanType())){ //生产订单
-                List<PurchaseOrderChild> purchaseOrderChildList = purchaseOrderChildMapper.selectPurchaseOrderChildByOrderCode(correlationCode);
-                for (PurchaseOrderChild purchaseOrderChild : purchaseOrderChildList) {
-                    if (purchaseOrderChild.getMaterialNo().equals(materialNo)) {
-
-                        WarehouseInventoryInquiry oldWarehouseInventoryInquiry = warehouseInventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(materialNo);
-                        Integer historicalTotal = oldWarehouseInventoryInquiry.getHistoricalTotal();
-                        historicalTotal += storageNum;
-                        oldWarehouseInventoryInquiry.setHistoricalTotal(historicalTotal);
-                        Integer availableStockNum = oldWarehouseInventoryInquiry.getAvailableStockNum();
-                        if (availableStockNum == null || availableStockNum == 0){
-                            availableStockNum = storageNum;
-                        }else {
-                            availableStockNum += storageNum;
-                        }
-
-                        oldWarehouseInventoryInquiry.setAvailableStockNum(availableStockNum);
+                }else if ("1".equals(purchasePlan.getPurchasePlanType())){ //生产订单
+                    List<PurchaseOrderChild> purchaseOrderChildList = purchaseOrderChildMapper.selectPurchaseOrderChildByOrderCode(correlationCode);
+                    for (PurchaseOrderChild purchaseOrderChild : purchaseOrderChildList) {
+                        if (purchaseOrderChild.getMaterialNo().equals(materialNo)) {
+
+                            WarehouseInventoryInquiry oldWarehouseInventoryInquiry = warehouseInventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(materialNo);
+                            Integer historicalTotal = oldWarehouseInventoryInquiry.getHistoricalTotal();
+                            historicalTotal += storageNum;
+                            oldWarehouseInventoryInquiry.setHistoricalTotal(historicalTotal);
+                            Integer availableStockNum = oldWarehouseInventoryInquiry.getAvailableStockNum();
+                            if (availableStockNum == null || availableStockNum == 0){
+                                availableStockNum = storageNum;
+                            }else {
+                                availableStockNum += storageNum;
+                            }
+
+                            oldWarehouseInventoryInquiry.setAvailableStockNum(availableStockNum);
 //                      Integer oldAvailableStockNum = warehouseInventoryInquiryService.calculateAvailableStockNum(materialNo);
 
-                        Integer fixedAvailableStockNum = oldWarehouseInventoryInquiry.getFixedAvailableStockNum();//固定可用库存
-                        if (fixedAvailableStockNum == null || fixedAvailableStockNum == 0){
-                            fixedAvailableStockNum = storageNum;
-                        }else {
-                            fixedAvailableStockNum += storageNum;
-                        }
-                        oldWarehouseInventoryInquiry.setFixedAvailableStockNum(fixedAvailableStockNum);
-
-
-                        int updateResult = warehouseInventoryInquiryService.updateWarehouseInventoryInquiry(oldWarehouseInventoryInquiry);
-                        if (updateResult <= 0) {
-                            throw new BusinessException("更新库存查询记录失败！");
-                        }
-
-                        remindService.warehouseSafetyStockRemind(oldWarehouseInventoryInquiry);
-
-                        WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail();
-                        inquiryDetail.setMaterialNo(materialNo);
-                        inquiryDetail.setInquiryWarehouseType("0");//采购入库
-                        inquiryDetail.setInventoryHistoricalTime(DateUtils.getNowDate());
-                        inquiryDetail.setInquiryOrderType("0");
-                        inquiryDetail.setInquiryBusinessType("0");
-                        inquiryDetail.setCorrelationCode(storageCode);
-                        inquiryDetail.setIncreaseDecreaseNum(warehouseStorageOrderDetail.getStorageNum());
-                        inquiryDetail.setInventoryIncreaseDecrease("1");
-                        int insertDetailResult = inventoryInquiryDetailMapper.insertWarehouseInventoryInquiryDetail(inquiryDetail);
-                        if (insertDetailResult <= 0) {
-                            throw new BusinessException("新增库存履历失败！");
+                            Integer fixedAvailableStockNum = oldWarehouseInventoryInquiry.getFixedAvailableStockNum();//固定可用库存
+                            if (fixedAvailableStockNum == null || fixedAvailableStockNum == 0){
+                                fixedAvailableStockNum = storageNum;
+                            }else {
+                                fixedAvailableStockNum += storageNum;
+                            }
+                            oldWarehouseInventoryInquiry.setFixedAvailableStockNum(fixedAvailableStockNum);
+
+
+                            int updateResult = warehouseInventoryInquiryService.updateWarehouseInventoryInquiry(oldWarehouseInventoryInquiry);
+                            if (updateResult <= 0) {
+                                throw new BusinessException("更新库存查询记录失败！");
+                            }
+
+                            remindService.warehouseSafetyStockRemind(oldWarehouseInventoryInquiry);
+
+                            WarehouseInventoryInquiryDetail inquiryDetail = new WarehouseInventoryInquiryDetail();
+                            inquiryDetail.setMaterialNo(materialNo);
+                            inquiryDetail.setInquiryWarehouseType("0");//采购入库
+                            inquiryDetail.setInventoryHistoricalTime(DateUtils.getNowDate());
+                            inquiryDetail.setInquiryOrderType("0");
+                            inquiryDetail.setInquiryBusinessType("0");
+                            inquiryDetail.setCorrelationCode(storageCode);
+                            inquiryDetail.setIncreaseDecreaseNum(warehouseStorageOrderDetail.getStorageNum());
+                            inquiryDetail.setInventoryIncreaseDecrease("1");
+                            int insertDetailResult = inventoryInquiryDetailMapper.insertWarehouseInventoryInquiryDetail(inquiryDetail);
+                            if (insertDetailResult <= 0) {
+                                throw new BusinessException("新增库存履历失败！");
+                            }
                         }
                     }
                 }
             }
-
         }else if(warehouseStorageType.equals("5")){//新增生产入库库存历史记录
 
             WarehouseInventoryInquiry oldWarehouseInventoryInquiry = warehouseInventoryInquiryMapper.selectWarehouseInventoryInquiryByMaterialNo(materialNo);
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/developModifyOrder/developModifyOrder.html b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html
index 0896c3fa..38635647 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html
@@ -109,6 +109,8 @@
                 restoreUrl: prefix + "/restore/{id}",
                 exportUrl: prefix + "/export",
                 modalName: "开发修改单",
+                fixedColumns: true, // 启用冻结列
+                fixedRightNumber: 1, // 冻结右列个数
                 columns: [
                     {checkbox: true},
                     {title: '开发修改单ID',field: 'developOrderId',visible: false},
diff --git a/ruoyi-admin/src/main/resources/templates/erp/developModifyorderPicking/developModifyorderPicking.html b/ruoyi-admin/src/main/resources/templates/erp/developModifyorderPicking/developModifyorderPicking.html
index 673a07d8..814fd0c7 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/developModifyorderPicking/developModifyorderPicking.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/developModifyorderPicking/developModifyorderPicking.html
@@ -45,7 +45,7 @@
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="erp:developModifyorderPicking:export">
+                <a class="btn btn-success" onclick="$.table.exportExcel()" shiro:hasPermission="erp:developModifyorderPicking:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
             </div>
@@ -79,6 +79,8 @@
                 restoreUrl: prefix + "/restore/{id}",
                 exportUrl: prefix + "/export",
                 modalName: "开发修改单领料",
+                fixedColumns: true, // 启用冻结列
+                fixedRightNumber: 1, // 冻结右列个数
                 columns: [{
                     checkbox: true
                 },
@@ -222,7 +224,7 @@
                             // 审核状态-审核通过
                             if(row.auditStatus=="1"){
                                 // 编辑
-                                actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.developOrderPickingId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                                actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.developOrderPickingId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                             }
                             // 有流程实例id
                             if (row.instanceId) {
@@ -231,17 +233,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.developOrderPickingId + '\')"><i class="fa fa-edit"></i>详情</a> ');
-                            return actions.join('');
+                            actions.push('<a href="javascript:void(0)" onclick="detail(\'' + row.developOrderPickingId + '\')"><i class="fa fa-edit"></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/companyBankInfo/companyBankInfo.html b/ruoyi-admin/src/main/resources/templates/system/companyBankInfo/companyBankInfo.html
index 82604897..15877a37 100644
--- a/ruoyi-admin/src/main/resources/templates/system/companyBankInfo/companyBankInfo.html
+++ b/ruoyi-admin/src/main/resources/templates/system/companyBankInfo/companyBankInfo.html
@@ -118,9 +118,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> ');
-                        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/dept/dept.html b/ruoyi-admin/src/main/resources/templates/system/dept/dept.html
index a189d73e..2e09ec97 100644
--- a/ruoyi-admin/src/main/resources/templates/system/dept/dept.html
+++ b/ruoyi-admin/src/main/resources/templates/system/dept/dept.html
@@ -32,10 +32,10 @@
 		        <a class="btn btn-success" onclick="$.operate.add(100)" shiro:hasPermission="system:dept:add">
                     <i class="fa fa-plus"></i> 新增
                 </a>
-                <a class="btn btn-primary" onclick="$.operate.edit()" shiro:hasPermission="system:dept:edit">
+                <a class="btn btn-success" onclick="$.operate.edit()" shiro:hasPermission="system:dept:edit">
 		            <i class="fa fa-edit"></i> 修改
 		        </a>
-                <a class="btn btn-info" id="expandAllBtn">
+                <a class="btn btn-success" id="expandAllBtn">
                     <i class="fa fa-exchange"></i> 展开/折叠
                 </a>
 	        </div>
@@ -100,10 +100,11 @@
 		            formatter: function(value, row, index) {
 		                if (row.parentId != 0) {
 		                    var actions = [];
-		                    actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.deptId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-		                    actions.push('<a class="btn btn-info  btn-xs ' + addFlag + '" href="javascript:void(0)" onclick="$.operate.add(\'' + row.deptId + '\')"><i class="fa fa-plus"></i>新增</a> ');
-		                    actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.deptId + '\')"><i class="fa fa-trash"></i>删除</a>');
-		                    return actions.join('');
+		                    actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.deptId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+		                    actions.push('<a class=" ' + addFlag + '" href="javascript:void(0)" onclick="$.operate.add(\'' + row.deptId + '\')"><i class="fa fa-plus"></i>新增</a> ');
+		                    actions.push('<a class=" ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.deptId + '\')"><i class="fa fa-trash"></i>删除</a>');
+							var actionLinks = actions.join('');
+							return $.table.dropdownToggle(actionLinks);
 		                } else {
 		                    return "";
 		                }
diff --git a/ruoyi-admin/src/main/resources/templates/system/model/model.html b/ruoyi-admin/src/main/resources/templates/system/model/model.html
index 171345e0..f0ec190b 100644
--- a/ruoyi-admin/src/main/resources/templates/system/model/model.html
+++ b/ruoyi-admin/src/main/resources/templates/system/model/model.html
@@ -55,7 +55,7 @@
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:model:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-                <a class="btn btn-warning" onclick="exportExcel()" shiro:hasPermission="system:model:export">
+                <a class="btn btn-success" onclick="exportExcel()" shiro:hasPermission="system:model:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
             </div>
@@ -124,9 +124,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.pid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="detail(\'' + row.pid + '\')"><i class="fa fa-edit"></i>详情</a> ');
-                            return actions.join('');
+                            actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.pid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                            actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="detail(\'' + row.pid + '\')"><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/outsource_plan/outsource_plan.html b/ruoyi-admin/src/main/resources/templates/system/outsource_plan/outsource_plan.html
index 7b4dde4f..55ba42ff 100644
--- a/ruoyi-admin/src/main/resources/templates/system/outsource_plan/outsource_plan.html
+++ b/ruoyi-admin/src/main/resources/templates/system/outsource_plan/outsource_plan.html
@@ -150,8 +150,9 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-info btn-xs ' + detailFlag + '" href="javascript:;" onclick="$.operate.detail(\'' + row.outsourcePlanId + '\')"><i class="fa fa-search"></i>详情</a> ');
-                        return actions.join('');
+                        actions.push('<a class=" ' + detailFlag + '" href="javascript:;" onclick="$.operate.detail(\'' + row.outsourcePlanId + '\')"><i class="fa fa-search"></i>详情</a> ');
+                        var actionLinks = actions.join('');
+                        return $.table.dropdownToggle(actionLinks);
                     }
                 }]
             };
diff --git a/ruoyi-admin/src/main/resources/templates/system/outsource_process/outsource_process.html b/ruoyi-admin/src/main/resources/templates/system/outsource_process/outsource_process.html
index eaa5b672..df66bbf1 100644
--- a/ruoyi-admin/src/main/resources/templates/system/outsource_process/outsource_process.html
+++ b/ruoyi-admin/src/main/resources/templates/system/outsource_process/outsource_process.html
@@ -103,9 +103,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.outsourceProcessId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-info btn-xs ' + detailFlag + '" href="javascript:;" onclick="$.operate.detail(\'' + row.outsourceProcessId + '\')"><i class="fa fa-search"></i>详情</a> ');
-                        return actions.join('');
+                        actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.outsourceProcessId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class=" ' + detailFlag + '" href="javascript:;" onclick="$.operate.detail(\'' + row.outsourceProcessId + '\')"><i class="fa fa-search"></i>详情</a> ');
+                        var actionLinks = actions.join('');
+                        return $.table.dropdownToggle(actionLinks);
                     }
                 }]
             };
diff --git a/ruoyi-admin/src/main/resources/templates/system/outsource_storage/storage.html b/ruoyi-admin/src/main/resources/templates/system/outsource_storage/storage.html
index 9020a295..c2bd34bb 100644
--- a/ruoyi-admin/src/main/resources/templates/system/outsource_storage/storage.html
+++ b/ruoyi-admin/src/main/resources/templates/system/outsource_storage/storage.html
@@ -48,7 +48,7 @@
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:storage:export">
+                <a class="btn btn-success" onclick="$.table.exportExcel()" shiro:hasPermission="system:storage:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
             </div>
@@ -77,6 +77,8 @@
                 removeUrl: prefix + "/remove",
                 exportUrl: prefix + "/export",
                 modalName: "委外入库",
+                fixedColumns: true, // 启用冻结列
+                fixedRightNumber: 1, // 冻结右列个数
                 columns: [{
                     checkbox: true
                 },
@@ -214,8 +216,9 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-info btn-xs ' + detailFlag + '" href="javascript:;" onclick="$.operate.detail(\'' + row.warehouseStorageCode + '\')"><i class="fa fa-search"></i>详情</a> ');
-                        return actions.join('');
+                        actions.push('<a class=" ' + detailFlag + '" href="javascript:;" onclick="$.operate.detail(\'' + row.warehouseStorageCode + '\')"><i class="fa fa-search"></i>详情</a> ');
+                        var actionLinks = actions.join('');
+                        return $.table.dropdownToggle(actionLinks);
                     }
                 }]
             };
diff --git a/ruoyi-admin/src/main/resources/templates/system/post/post.html b/ruoyi-admin/src/main/resources/templates/system/post/post.html
index 3c3fc42d..13dd41f0 100644
--- a/ruoyi-admin/src/main/resources/templates/system/post/post.html
+++ b/ruoyi-admin/src/main/resources/templates/system/post/post.html
@@ -35,13 +35,13 @@
 				<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:post:add">
 	                <i class="fa fa-plus"></i> 新增
 	            </a>
-				<a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:post:edit">
+				<a class="btn btn-success single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:post:edit">
 		            <i class="fa fa-edit"></i> 修改
 		        </a>
-				<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:post:remove">
+				<a class="btn btn-success multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:post:remove">
 		            <i class="fa fa-remove"></i> 删除
 		        </a>
-				<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:post:export">
+				<a class="btn btn-success" onclick="$.table.exportExcel()" shiro:hasPermission="system:post:export">
 		            <i class="fa fa-download"></i> 导出
 		        </a>
 	        </div>
@@ -107,9 +107,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.postId + '\')"><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.postId + '\')"><i class="fa fa-remove"></i>删除</a>');
-		                return actions.join('');
+		                actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.postId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+		                actions.push('<a class=" ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.postId + '\')"><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/role/authUser.html b/ruoyi-admin/src/main/resources/templates/system/role/authUser.html
index 7d080401..8b2d370f 100644
--- a/ruoyi-admin/src/main/resources/templates/system/role/authUser.html
+++ b/ruoyi-admin/src/main/resources/templates/system/role/authUser.html
@@ -30,10 +30,10 @@
 				<a class="btn btn-success" onclick="selectUser()" shiro:hasPermission="system:role:add">
 	                <i class="fa fa-plus"></i> 添加用户
 	            </a>
-				<a class="btn btn-danger multiple disabled" onclick="cancelAuthUserAll()" shiro:hasPermission="system:role:remove">
+				<a class="btn btn-success multiple disabled" onclick="cancelAuthUserAll()" shiro:hasPermission="system:role:remove">
 		            <i class="fa fa-remove"></i> 批量取消授权
 		        </a>
-		        <a class="btn btn-warning" onclick="closeItem()">
+		        <a class="btn btn-success" onclick="closeItem()">
 		            <i class="fa fa-reply-all"></i> 关闭
 		        </a>
 	        </div>
@@ -105,8 +105,9 @@
 		            align: 'center',
 		            formatter: function(value, row, index) {
 		                var actions = [];
-		                actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="cancelAuthUser(\'' + row.userId + '\')"><i class="fa fa-remove"></i>取消授权</a> ');
-		                return actions.join('');
+		                actions.push('<a class="' + removeFlag + '" href="javascript:void(0)" onclick="cancelAuthUser(\'' + row.userId + '\')"><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/role/role.html b/ruoyi-admin/src/main/resources/templates/system/role/role.html
index 7cbc4880..f155e56e 100644
--- a/ruoyi-admin/src/main/resources/templates/system/role/role.html
+++ b/ruoyi-admin/src/main/resources/templates/system/role/role.html
@@ -41,16 +41,16 @@
 				<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:role:add">
 	                <i class="fa fa-plus"></i> 新增
 	            </a>
-	            <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:role:edit">
+	            <a class="btn btn-success single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:role:edit">
 		            <i class="fa fa-edit"></i> 修改
 		        </a>
-				<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:role:remove">
+				<a class="btn btn-success multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:role:remove">
 		            <i class="fa fa-remove"></i> 删除
 		        </a>
-		        <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:role:export">
+		        <a class="btn btn-success" onclick="$.table.exportExcel()" shiro:hasPermission="system:role:export">
 		            <i class="fa fa-download"></i> 导出
 		        </a>
-				<a class="btn btn-warning" onclick="exportRoleMenu()" shiro:hasPermission="system:role:export">
+				<a class="btn btn-success" onclick="exportRoleMenu()" shiro:hasPermission="system:role:export">
 					<i class="fa fa-download"></i> 导出角色权限
 				</a>
 
@@ -117,13 +117,14 @@
 		            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.roleId + '\')"><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.roleId + '\')"><i class="fa fa-remove"></i>删除</a> ');
+		                actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.roleId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+		                actions.push('<a class=" ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.roleId + '\')"><i class="fa fa-remove"></i>删除</a> ');
 		                var more = [];
-		                more.push("<a class='btn btn-default btn-xs " + editFlag + "' href='javascript:void(0)' onclick='authDataScope(" + row.roleId + ")'><i class='fa fa-check-square-o'></i>数据权限</a> ");
-		                more.push("<a class='btn btn-default btn-xs " + editFlag + "' href='javascript:void(0)' onclick='authUser(" + row.roleId + ")'><i class='fa fa-user'></i>分配用户</a>");
-		                actions.push('<a tabindex="0" class="btn btn-info btn-xs" role="button" data-container="body" data-placement="left" data-toggle="popover" data-html="true" data-trigger="hover" data-content="' + more.join('') + '"><i class="fa fa-chevron-circle-right"></i>更多操作</a>');
-		                return actions.join('');
+		                more.push("<a class=' " + editFlag + "' href='javascript:void(0)' onclick='authDataScope(" + row.roleId + ")'><i class='fa fa-check-square-o'></i>数据权限</a> ");
+		                more.push("<a class=' " + editFlag + "' href='javascript:void(0)' onclick='authUser(" + row.roleId + ")'><i class='fa fa-user'></i>分配用户</a>");
+		                actions.push('<a tabindex="0"  role="button" data-container="body" data-placement="left" data-toggle="popover" data-html="true" data-trigger="hover" data-content="' + more.join('') + '"><i class="fa fa-chevron-circle-right"></i>更多操作</a>');
+						var actionLinks = actions.join('');
+						return $.table.dropdownToggle(actionLinks);
 		            }
 		        }]
 		    };
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html
index 9caa3d90..1320db08 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html
@@ -461,7 +461,7 @@
                     },
                     format: function (value, row, index) { return value + "天数";}
                 },
-                {field: 'remark',align: 'center',title: '备注',},
+                {field: 'remark',align: 'center',title: '备注',visible: false,},
 
                 {title: '操作', align: 'center',
                     formatter: function (value, row, index) {
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html
index 3eddc232..624d839f 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html
@@ -389,7 +389,7 @@
                 {  title: '计划交付时间',field: 'deliveryTime',align: 'center' },
                 {title: '质保天数',align: 'center',field: 'expiryDay',
                 },
-                {field: 'remark',align: 'center',title: '备注',},
+                {field: 'remark',align: 'center',title: '备注',visible: false,},
                 {field: 'auditStatus',align: 'center',title: '审核状态',visible: false,
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(auditStatusDatas, value);
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html
index c79cc9df..3e0b5539 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html
@@ -389,7 +389,7 @@
                 {  title: '计划交付时间',field: 'deliveryTime',align: 'center' },
                 {title: '质保天数',align: 'center',field: 'expiryDay',
                 },
-                {field: 'remark',align: 'center',title: '备注',},
+                {field: 'remark',align: 'center',title: '备注',visible: false,},
                 {field: 'auditStatus',align: 'center',title: '审核状态',visible: false,
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(auditStatusDatas, value);
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);
           }
         }
       ]
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/user.html b/ruoyi-admin/src/main/resources/templates/system/user/user.html
index 34d815ef..6ea21c72 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/user.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/user.html
@@ -65,16 +65,16 @@
 		        	<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:user:add">
 		                <i class="fa fa-plus"></i> 新增
 		            </a>
-		             <a class="btn btn-primary single disabled" onclick="$.operate.editTab()" shiro:hasPermission="system:user:edit">
+		             <a class="btn btn-success single disabled" onclick="$.operate.editTab()" shiro:hasPermission="system:user:edit">
 			            <i class="fa fa-edit"></i> 修改
 			        </a>
-		            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
+		            <a class="btn btn-success multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
 		                <i class="fa fa-remove"></i> 删除
 		            </a>
-		            <a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
+		            <a class="btn btn-success" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">
 			            <i class="fa fa-upload"></i> 导入
 			        </a>
-		            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
+		            <a class="btn btn-success" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">
 			            <i class="fa fa-download"></i> 导出
 			        </a>
 		        </div>
@@ -172,13 +172,14 @@
 		            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.editTab(\'' + row.userId + '\')"><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.userId + '\')"><i class="fa fa-remove"></i>删除</a> ');
+		                actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editTab(\'' + row.userId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+		                actions.push('<a class=" ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.userId + '\')"><i class="fa fa-remove"></i>删除</a> ');
 		                var more = [];
-		                more.push("<a class='btn btn-default btn-xs " + resetPwdFlag + "' href='javascript:void(0)' onclick='resetPwd(" + row.userId + ")'><i class='fa fa-key'></i>重置密码</a> ");
-		                more.push("<a class='btn btn-default btn-xs " + editFlag + "' href='javascript:void(0)' onclick='authRole(" + row.userId + ")'><i class='fa fa-check-square-o'></i>分配角色</a>");
-		                actions.push('<a tabindex="0" class="btn btn-info btn-xs" role="button" data-container="body" data-placement="left" data-toggle="popover" data-html="true" data-trigger="hover" data-content="' + more.join('') + '"><i class="fa fa-chevron-circle-right"></i>更多操作</a>');
-		                return actions.join('');
+		                more.push("<a class=' " + resetPwdFlag + "' href='javascript:void(0)' onclick='resetPwd(" + row.userId + ")'><i class='fa fa-key'></i>重置密码</a> ");
+		                more.push("<a class=' " + editFlag + "' href='javascript:void(0)' onclick='authRole(" + row.userId + ")'><i class='fa fa-check-square-o'></i>分配角色</a>");
+		                actions.push('<a tabindex="0"  role="button" data-container="body" data-placement="left" data-toggle="popover" data-html="true" data-trigger="hover" data-content="' + more.join('') + '"><i class="fa fa-chevron-circle-right"></i>更多操作</a>');
+						var actionLinks = actions.join('');
+						return $.table.dropdownToggle(actionLinks);
 		            }
 		        }]
 		    };