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) }