From 3c639ba3feb9ab3626114e7e40a03597270cfd93 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Fri, 1 Nov 2024 14:58:25 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=80=E5=94=AE=E4=BC=B0=E4=BB=B7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2=E8=A1=A8=E5=A4=B4=E7=9A=84=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=EF=BC=8C=E6=8C=89=E9=92=AE=E9=87=87=E7=94=A8=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E6=A0=B7=E5=BC=8F=EF=BC=9B=E4=BF=AE=E6=94=B9=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E6=A0=8F=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E7=BB=9F=E4=B8=80=EF=BC=8C=E6=93=8D=E4=BD=9C=E6=A0=8F?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8$.table.dropdownToggle=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/sales/estimate/estimate.html    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/sales/estimate/estimate.html b/ruoyi-admin/src/main/resources/templates/sales/estimate/estimate.html
index bab98ce2..0eb49ba6 100644
--- a/ruoyi-admin/src/main/resources/templates/sales/estimate/estimate.html
+++ b/ruoyi-admin/src/main/resources/templates/sales/estimate/estimate.html
@@ -57,7 +57,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>
@@ -88,7 +88,6 @@
                 exportUrl: prefix + "/export",
                 sortStable: true,                                   // 设置为 true 将获得稳定的排序
                 fixedColumns: true, // 启用冻结列
-                rightFixedColumns:1,
                 fixedRightNumber: 1, // 冻结右列个数
                 showFooter: true,
                 modalName: "销售估价",
@@ -219,28 +218,29 @@
                     formatter: function(value, row, index) {
                         var actions = [];
                         if (row.estimateStatus != '1' && row.estimateStatus != '2' && row.estimateStatus != '3') {
-                            actions.push('<a class="btn btn-success btn-xs ' + addDetailFlag + '" href="javascript:void(0)" onclick="addDetail(\'' + row.salesEstimateId + '\')"><i class="fa fa-edit"></i>详情</a> ');
+                            actions.push('<a class="' + addDetailFlag + '" href="javascript:void(0)" onclick="addDetail(\'' + row.salesEstimateId + '\')"><i class="fa fa-edit"></i>详情</a> ');
                         }
                         if (row.estimateStatus != '0' && row.estimateStatus != '2' && row.estimateStatus != '3') {
-                            actions.push('<a class="btn btn-success btn-xs ' + engineeringAddDetailFlag + '" href="javascript:void(0)" onclick="engineeringAddDetail(\'' + row.salesEstimateId + '\')"><i class="fa fa-edit"></i>详情</a> ');
+                            actions.push('<a class=" ' + engineeringAddDetailFlag + '" href="javascript:void(0)" onclick="engineeringAddDetail(\'' + row.salesEstimateId + '\')"><i class="fa fa-edit"></i>详情</a> ');
                         }
                         if (row.estimateStatus != '0' && row.estimateStatus != '1' && row.estimateStatus != '3') {
-                            actions.push('<a class="btn btn-success btn-xs ' + purchaseAddDetailFlag + '" href="javascript:void(0)" onclick="purchaseAddDetail(\'' + row.salesEstimateId + '\')"><i class="fa fa-edit"></i>详情</a> ');
+                            actions.push('<a class=" ' + purchaseAddDetailFlag + '" href="javascript:void(0)" onclick="purchaseAddDetail(\'' + row.salesEstimateId + '\')"><i class="fa fa-edit"></i>详情</a> ');
                         }
 
                         if (row.estimateStatus != '0' && row.estimateStatus != '1' && row.estimateStatus != '2') {
-                            actions.push('<a class="btn btn-success btn-xs ' + ceoAddDetailFlag + '" href="javascript:void(0)" onclick="ceoAddDetail(\'' + row.salesEstimateId + '\')"><i class="fa fa-edit"></i>详情</a> ');
+                            actions.push('<a class=" ' + ceoAddDetailFlag + '" href="javascript:void(0)" onclick="ceoAddDetail(\'' + row.salesEstimateId + '\')"><i class="fa fa-edit"></i>详情</a> ');
                         }
                         if(row.estimateStatus == '0'){
-                            actions.push('<a class="btn btn-success btn-xs ' + engineeringAddFlag + '" href="javascript:void(0)" onclick="engineeringAdd(\'' + row.salesEstimateId + '\')"><i class="fa fa-edit"></i>添加BOM</a> ');
+                            actions.push('<a class=" ' + engineeringAddFlag + '" href="javascript:void(0)" onclick="engineeringAdd(\'' + row.salesEstimateId + '\')"><i class="fa fa-edit"></i>添加BOM</a> ');
                         }
                         if(row.estimateStatus == '1'){
-                            actions.push('<a class="btn btn-success btn-xs ' + purchaseAddFlag + '" href="javascript:void(0)" onclick="purchaseAdd(\'' + row.salesEstimateId + '\')"><i class="fa fa-edit"></i>采购成本</a> ');
+                            actions.push('<a class=" ' + purchaseAddFlag + '" href="javascript:void(0)" onclick="purchaseAdd(\'' + row.salesEstimateId + '\')"><i class="fa fa-edit"></i>采购成本</a> ');
                         }
                         if(row.estimateStatus == '2'){
-                            actions.push('<a class="btn btn-success btn-xs ' + ceoAddFlag + '" href="javascript:void(0)" onclick="ceoAdd(\'' + row.salesEstimateId + '\')"><i class="fa fa-edit"></i>经营成本</a> ');
+                            actions.push('<a class="' + ceoAddFlag + '" href="javascript:void(0)" onclick="ceoAdd(\'' + row.salesEstimateId + '\')"><i class="fa fa-edit"></i>经营成本</a> ');
                         }
-                        return actions.join('');
+                        var actionLinks = actions.join('');
+                        return $.table.dropdownToggle(actionLinks);
                     }
                 }]
             };