From 02837f83e4c248820d3853192670388b6257bad3 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Wed, 23 Oct 2024 16:56:58 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=9F=BA=E7=A1=80=E8=B5=84=E6=96=99?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=20=E6=8C=89=E7=85=A7=E4=B8=87=E6=9D=90?=
 =?UTF-8?q?=E8=A6=81=E6=B1=82=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=85=AC=E5=8F=B8?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=B4=E7=9A=84=E6=8C=89=E9=92=AE=EF=BC=8C=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E4=B9=8B=E5=89=8D=E7=9A=84=E4=BF=AE=E6=94=B9=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=EF=BC=8C=E9=87=87=E7=94=A8=E7=BB=9F=E4=B8=80=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=EF=BC=9B=E6=96=B0=E5=A2=9E=E5=88=97=E8=A1=A8=E5=9B=BA=E5=AE=9A?=
 =?UTF-8?q?=E5=8F=B3=E5=88=97=EF=BC=9B=E6=96=B0=E5=A2=9E=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E6=A0=8F=EF=BC=8C=E6=93=8D=E4=BD=9C=E6=A0=8F=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?$.table.dropdownToggle=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../companyInformation.html                   | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/companyInformation/companyInformation.html b/ruoyi-admin/src/main/resources/templates/system/companyInformation/companyInformation.html
index 55817818..1b28a25c 100644
--- a/ruoyi-admin/src/main/resources/templates/system/companyInformation/companyInformation.html
+++ b/ruoyi-admin/src/main/resources/templates/system/companyInformation/companyInformation.html
@@ -23,13 +23,13 @@
                 </form>
             </div>
 
-            <div class="btn-group-sm" id="toolbar" role="group">
+<!--            <div class="btn-group-sm" id="toolbar" role="group">-->
 <!--                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:companyInformation:add">-->
 <!--                    <i class="fa fa-plus"></i> 添加-->
 <!--                </a>-->
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:companyInformation:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
+<!--                <a class="btn btn-success single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:companyInformation:edit">-->
+<!--                    <i class="fa fa-edit"></i> 修改-->
+<!--                </a>-->
 <!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:companyInformation:remove">-->
 <!--                    <i class="fa fa-remove"></i> 删除-->
 <!--                </a>-->
@@ -39,9 +39,9 @@
 <!--                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:companyInformation:export">-->
 <!--                    <i class="fa fa-download"></i> 导出-->
 <!--                </a>-->
-            </div>
+<!--            </div>-->
             <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table" style="white-space:nowrap"></table>
+                <table id="bootstrap-table"></table>
             </div>
         </div>
     </div>
@@ -66,6 +66,8 @@
                 importUrl: prefix + "/importData",
                 importTemplateUrl: prefix + "/importTemplate",
                 clickToSelect: true,
+                fixedColumns:true,
+                fixedRightNumber:1,
                 modalName: "公司信息",
                 columns: [{
                     checkbox: true
@@ -216,18 +218,18 @@
                             return vArr[0];
                         }
                     }
-                }
+                },
 
-                    // {
-                //     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.companyId + '\')"><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.companyId + '\')"><i class="fa fa-remove"></i>删除</a>');
-                //         return actions.join('');
-                //     }
-                // }
+                {
+                    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.companyId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        var actionLinks = actions.join('');
+                        return $.table.dropdownToggle(actionLinks);
+                    }
+                }
                 ]
             };
             $.table.init(options);