From 54bbf720a40e75dc692cbedd430e7b7f14722f36 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Thu, 21 Nov 2024 17:17:14 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=E9=87=87=E8=B4=AD=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E6=96=B0=E7=89=88=E4=B8=87=E6=9D=90=E9=9C=80?= =?UTF-8?q?=E6=B1=82=EF=BC=8C=E8=B0=83=E6=95=B4=E9=87=87=E8=B4=AD=E6=8A=A5?= =?UTF-8?q?=E4=BB=B7=E7=9A=84=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B=E4=B8=BA?= =?UTF-8?q?=EF=BC=9A=E7=9B=AE=E5=89=8D=E6=B2=A1=E6=9C=89=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E7=BB=8F=E7=90=86=E8=BF=99=E4=B8=AA=E8=81=8C=E4=BD=8D=EF=BC=8C?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E7=94=B1=E5=89=AF=E6=80=BB=E7=BB=8F=E7=90=86?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=8D=B3=E5=8F=AF=EF=BC=8C=E4=BB=A5=E5=90=8E?= =?UTF-8?q?=E6=9C=89=E6=AD=A4=E5=B2=97=E4=BD=8D=E4=B9=8B=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B=E4=B8=BA=EF=BC=9A=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E5=91=98-=E9=87=87=E8=B4=AD=E7=BB=8F=E7=90=86-?= =?UTF-8?q?=E5=89=AF=E6=80=BB=E7=BB=8F=E7=90=86=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=8A=A5=E4=BB=B7=E5=AE=A1=E6=89=B9=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E8=A7=92=E8=89=B2=E6=A0=A1=E9=AA=8C=E7=9A=84=E6=96=B9?= =?UTF-8?q?=E6=B3=95=20=E6=96=B0=E5=A2=9E=E5=89=AF=E6=80=BB=E7=BB=8F?= =?UTF-8?q?=E7=90=86=E5=AE=A1=E6=89=B9=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/service/IPurchaseQuoteService.java | 2 +- .../service/impl/PurchaseQuoteServiceImpl.java | 11 ++++++----- .../{taskCgzgVerify.html => taskFzjlVerify.html} | 12 ++++++------ 3 files changed, 13 insertions(+), 12 deletions(-) rename ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/{taskCgzgVerify.html => taskFzjlVerify.html} (97%) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/IPurchaseQuoteService.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/IPurchaseQuoteService.java index 003a3138..8ef72f7d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/IPurchaseQuoteService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/IPurchaseQuoteService.java @@ -76,7 +76,7 @@ public interface IPurchaseQuoteService */ ProcessInstance cancelPurchaseQuoteById(Long purchaseQuoteId); - @Transactional(rollbackFor = Exception.class) + ProcessInstance submitApply(PurchaseQuote purchaseQuote); /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseQuoteServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseQuoteServiceImpl.java index 5912efac..90d0add4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseQuoteServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseQuoteServiceImpl.java @@ -420,15 +420,16 @@ public class PurchaseQuoteServiceImpl implements IPurchaseQuoteService private void buildAuthority(SysUser user, Map variables) { Set roleKeys = roleService.selectRoleKeys(user.getUserId()); + variables.put("cgjlExist",false); + + // 角色不同审核人不同 if(roleKeys.contains("cgyRole")){ variables.put("authority",1); }else if(roleKeys.contains("cgjlRole")){ - variables.put("authority",2); - }else if(roleKeys.contains("cgzgRole")){ + variables.put("cgjlExist",true); + }else if(roleKeys.contains("admin")){ variables.put("authority",3); - } - // 角色不同审核人不同 - if(roleKeys.contains("admin")){ + }else if(roleKeys.contains("fzjlRole")){ variables.put("authority",4); } } diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskCgzgVerify.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskFzjlVerify.html similarity index 97% rename from ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskCgzgVerify.html rename to ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskFzjlVerify.html index 9cfb602f..d75393dd 100644 --- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskCgzgVerify.html +++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskFzjlVerify.html @@ -9,7 +9,7 @@
-
+ @@ -100,9 +100,9 @@
- +
- @@ -115,7 +115,7 @@
- +
@@ -204,7 +204,7 @@ } }); - $("#form-purchaseQuote-cgzg-audit").validate({focusCleanup: true}); + $("#form-purchaseQuote-fzjl-audit").validate({focusCleanup: true}); $(function() { var options = { id:'bootstrap-sub-table-purchaseQuoteChild', @@ -319,7 +319,7 @@ } else { // 将子表数据添加到FormData中 $('input[name="purchaseQuoteChildLists"]').val(JSON.stringify(tableData)); - var formData = $("#form-purchaseQuote-cgzg-audit").serialize(); + var formData = $("#form-purchaseQuote-fzjl-audit").serialize(); // 发送请求 $.operate.save(prefix + "/complete/" + taskId, formData) }