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

---
 .../purchase/purchaseQuote/purchaseQuote.html | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/purchaseQuote.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/purchaseQuote.html
index b26e7fa5..2fc31fca 100644
--- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/purchaseQuote.html
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/purchaseQuote.html
@@ -66,12 +66,16 @@
                 <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="purchase:purchaseQuote:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="purchase:purchaseQuote:export">
+                <a class="btn btn-success" onclick="$.table.exportExcel()" shiro:hasPermission="purchase:purchaseQuote:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
+                <a class="btn btn-success" onclick="$.table.importExcel()" shiro:hasPermission="purchase:purchaseQuote:import">
+                    <i class="fa fa-upload"></i> 导入
+                </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>
@@ -147,14 +151,14 @@
                             // 审核状态-审核通过 使用状态-是 未发起作废流程
                             if (row.auditStatus == "1" && row.useStatus == "1") {
                                 // 作废
-                                actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.purchaseQuoteId + '\')"><i class="fa fa-remove"></i> 作废</a>');
+                                actions.push('<a  href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.purchaseQuoteId + '\')"><i class="fa fa-remove"></i> 作废</a>');
                                 // 编辑
-                                actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.purchaseQuoteId + '\')"><i class="fa fa-edit"></i> 编辑</a> ');
+                                actions.push('<a  href="javascript:void(0)" onclick="$.operate.edit(\'' + row.purchaseQuoteId + '\')"><i class="fa fa-edit"></i> 编辑</a> ');
                             }
                             // 已作废
                             if (row.useStatus == "2") {
                                 // 恢复
-                                actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.purchaseQuoteId + '\')"><i class="fa fa-window-restore"></i> 恢复</a> ');
+                                actions.push('<a  href="javascript:void(0)" onclick="$.operate.restore(\'' + row.purchaseQuoteId + '\')"><i class="fa fa-window-restore"></i> 恢复</a> ');
                             }
                             // 有流程实例id
                             if (row.instanceId) {
@@ -163,17 +167,18 @@
                                     var todoUserIdList = row.todoUserId.split(",");
                                     if (todoUserIdList.includes(loginName)) {
                                         var nodeName = row.taskName == '驳回调整' ? ' 调整申请' : ' 审批';
-                                        actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix + '\',\'' + row.taskId + '\', \'' + row.taskName + "-" + row.instanceTypeName + "申请" + '\')"><i class="fa fa-edit"></i> ' + nodeName + '</a> ');
+                                        actions.push('<a href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix + '\',\'' + row.taskId + '\', \'' + row.taskName + "-" + row.instanceTypeName + "申请" + '\')"><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-primary btn-xs" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.purchaseQuoteId + '\')"><i class="fa fa-eye"></i> 详情</a> ');
-                            return actions.join('');
+                            actions.push('<a  href="javascript:void(0)" onclick="$.operate.detail(\'' + row.purchaseQuoteId + '\')"><i class="fa fa-eye"></i> 详情</a> ');
+                            var actionLinks = actions.join('');
+                            return $.table.dropdownToggle(actionLinks);
                         }
                     }
                 ],