From 3218ebb96a5a19807571e55e68e168aeaeeb5ade Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Wed, 27 Nov 2024 19:15:09 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E4=BF=AE=E6=94=B9=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=9A=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=EF=BC=9B=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E6=A0=8F=E6=8C=89=E9=92=AE=EF=BC=8C=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?$.table.dropdownToggle=E6=96=B9=E6=B3=95=EF=BC=9B=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E8=81=94=E7=B3=BB=E4=BA=BAid=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E5=85=B6=E4=BB=96=E6=94=B6?=
 =?UTF-8?q?=E8=B4=A7=E5=9C=B0=E5=9D=80=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=9A=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=EF=BC=9B=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E6=A0=8F=E6=8C=89=E9=92=AE=EF=BC=8C=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?$.table.dropdownToggle=E6=96=B9=E6=B3=95=EF=BC=9B=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E6=94=B6=E8=B4=A7=E4=BA=BAid=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E5=85=B6=E4=BB=96=E5=BC=80?=
 =?UTF-8?q?=E7=A5=A8=E4=BF=A1=E6=81=AF=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=9A=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=EF=BC=9B=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E6=A0=8F=E6=8C=89=E9=92=AE=EF=BC=8C=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?$.table.dropdownToggle=E6=96=B9=E6=B3=95=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/system/contacts/contacts.html | 10 ++++++----
 .../resources/templates/system/invoice/invoice.html   |  9 +++++----
 .../system/shippingaddress/shippingaddress.html       | 11 ++++++-----
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/contacts/contacts.html b/ruoyi-admin/src/main/resources/templates/system/contacts/contacts.html
index 521e71be..8de56471 100644
--- a/ruoyi-admin/src/main/resources/templates/system/contacts/contacts.html
+++ b/ruoyi-admin/src/main/resources/templates/system/contacts/contacts.html
@@ -40,7 +40,7 @@
                     <i class="fa fa-plus"></i> 添加
                 </a>
             </div>
-            <div class="col-sm-12 select-table table-striped" style="white-space: nowrap">
+            <div class="col-sm-12 select-table table-striped">
                 <table id="bootstrap-table"></table>
             </div>
         </div>
@@ -67,6 +67,7 @@
                 {
                     field: 'contactid',
                     title: '联系人id',
+                    visible: false
                 },
                 {
                     field: 'enterpriseCode',
@@ -133,9 +134,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.contactid + '\')"><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.contactid + '\')"><i class="fa fa-remove"></i>删除</a>');
-                        return actions.join('');
+                        actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.contactid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class=" ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.contactid + '\')"><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/invoice/invoice.html b/ruoyi-admin/src/main/resources/templates/system/invoice/invoice.html
index ef2ae43b..90af3f30 100644
--- a/ruoyi-admin/src/main/resources/templates/system/invoice/invoice.html
+++ b/ruoyi-admin/src/main/resources/templates/system/invoice/invoice.html
@@ -110,10 +110,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-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-primary btn-xs ' + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-edge"></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> ');
+                        actions.push('<a class=" ' + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-edge"></i>详情</a> ');
+                        var actionLinks = actions.join('');
+                        return $.table.dropdownToggle(actionLinks);
                     }
                 }]
             };
diff --git a/ruoyi-admin/src/main/resources/templates/system/shippingaddress/shippingaddress.html b/ruoyi-admin/src/main/resources/templates/system/shippingaddress/shippingaddress.html
index 94af2df0..26171e8c 100644
--- a/ruoyi-admin/src/main/resources/templates/system/shippingaddress/shippingaddress.html
+++ b/ruoyi-admin/src/main/resources/templates/system/shippingaddress/shippingaddress.html
@@ -47,7 +47,7 @@
 <!--            </a>-->
         </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>
@@ -70,7 +70,7 @@
             modalName: "送货地址",
             columns: [
                 {checkbox: true},
-                {title: '送货id',field: 'deliveryId'},
+                {title: '送货id',field: 'deliveryId', visible: false},
                 {title: '客户/企业代码',field: 'enterpriseCode'},
                 {title: '客户/企业名称',field: 'enterpriseName'},
                 {title: '联系人电话',field: 'customerPhone'},
@@ -90,9 +90,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.deliveryId + '\')"><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.deliveryId + '\')"><i class="fa fa-remove"></i>删除</a>');
-                        return actions.join('');
+                        actions.push('<a class=" ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.deliveryId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class=" ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.deliveryId + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        var actionLinks = actions.join('');
+                        return $.table.dropdownToggle(actionLinks);
                     }
                 }
             ]