From dc37e15a53c548b7610e9413f8b2f45d3f408add Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Mon, 25 Nov 2024 09:11:54 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=85=A5=E5=BA=93=E5=8D=95=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=EF=BC=8C=E8=A1=A8=E5=A4=B4?=
 =?UTF-8?q?=E9=87=87=E7=94=A8=E7=BB=9F=E4=B8=80=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=EF=BC=8C=E6=93=8D=E4=BD=9C=E6=A0=8F=E6=8C=89=E7=85=A7?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouse/storageOrder/storageOrder.html         | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html
index 72299ab3..7206cc20 100644
--- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html
@@ -60,7 +60,7 @@
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="warehouse:storageOrder:export">
+                <a class="btn btn-success" onclick="$.table.exportExcel()" shiro:hasPermission="warehouse:storageOrder:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
             </div>
@@ -111,13 +111,15 @@
                 createUrl: prefix + "/add",
                 updateUrl: prefix + "/edit/{id}",
                 exportUrl: prefix + "/export",
-                fixedColumns:true,
-                fixedRightNumber:1,
                 modalName: "仓库入库单",
                 detailView: true,
+                fixedColumns: true, // 启用冻结列
+                fixedRightNumber: 1, // 冻结右列个数
+                sortable:true,
                 onExpandRow : function(index, row, $detail) {
                     initChildTable(index, row, $detail);
                 },
+
                 columns: [{
                     checkbox: true
                 },
@@ -238,6 +240,7 @@
                 {
                     title: '录入时间',
                     field: 'createTime',
+                    sortable:true
                 },
                 {
                     title: '更新人',
@@ -342,7 +345,8 @@
                             actions.push('<a class="btn btn-success btn-xs ' + storageRefundsExchangesDetailFlag + '" href="javascript:void(0)" onclick="storageRefundsExchangesDetail(\'' + row.warehouseStorageId + '\')"><i class="fa fa-edit"></i>详情</a> ');
                         }
 
-                        return actions.join('');
+                        var actionLinks = actions.join('');
+                        return $.table.dropdownToggle(actionLinks);
                     }
                 }]
             };