From f6e864cf7c813a3eafbc40b4d2ef4afd9038c1d9 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Thu, 28 Nov 2024 13:35:06 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8D=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E8=B5=84=E6=96=99=E6=B7=BB=E5=8A=A0=E6=8A=A5404=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E6=8A=A5?=
 =?UTF-8?q?=E4=BB=B7=E7=9A=84=E5=89=8D=E7=AB=AF=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=93=8D=E4=BD=9C=E6=A0=8F?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E8=B0=83=E6=95=B4=E4=B8=BA=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=20=E4=BF=AE=E6=94=B9=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E7=9A=84=E5=AE=A1=E6=A0=B8=EF=BC=8C=E8=A7=A3=E5=86=B3=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=91=98=E4=B8=8D=E8=83=BD=E6=B7=BB=E5=8A=A0=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/erp/service/impl/ErpBomServiceImpl.java   | 5 +++--
 .../src/main/resources/templates/system/customer/add.html    | 2 +-
 .../templates/system/customerQuote/customerQuote.html        | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpBomServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpBomServiceImpl.java
index 1a1871f5..8c116373 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpBomServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpBomServiceImpl.java
@@ -973,7 +973,8 @@ private ISysAttachService attachService;
 //        }else if(roleKeys.contains("gcjlRole")){
 //            variables.put("authority",2);
 //        }
-//        if(roleKeys.contains("yfzjRole") || roleKeys.contains("admin")){
-//            variables.put("authority",4);
+        if(roleKeys.contains("admin")) {
+            variables.put("authority", 4);
+        }
     }
 }
diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/add.html b/ruoyi-admin/src/main/resources/templates/system/customer/add.html
index dae9e10a..3b6bbff1 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/add.html
@@ -365,7 +365,7 @@
                     return;
                 }
                 console.log( $('#form-customer-add').serialize());
-                $.operate.save(prefix + "/ad", $('#form-customer-add').serialize());
+                $.operate.save(prefix + "/add", $('#form-customer-add').serialize());
             }
         }
 
diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html
index 4fc4d434..d2337c89 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html
@@ -299,7 +299,7 @@
                             // 已作废
                             if(row.useStatus=="2" && !row.restoreInstanceId){
                                 // 恢复
-                                actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i> 恢复</a> ');
+                                actions.push('<a  href="javascript:void(0)" onclick="$.operate.restore(\'' + row.id + '\')"><i class="fa fa-window-restore"></i> 恢复</a> ');
                             }
                             // 有流程实例id
                             if (row.instanceId) {
@@ -308,7 +308,7 @@
                                     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+"-"+"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> ');
+                                        actions.push('<a  href="javascript:void(0)" onclick="showVerifyDialog(\'' + prefix + '\',\'' + row.taskId + '\', \'' + row.taskName+"-"+"申请" + '\')"><i class="fa fa-edit"></i> '+nodeName+'</a> ');
                                     }
                                 }
                                 // 审批历史