From 208e7c7c64ae87c61eb16e912115025d2655bc55 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Fri, 14 Jun 2024 12:36:32 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86:=20?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=8A=A5=E4=BB=B7=20=E4=BF=AE=E6=94=B9=20?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BB=8F=E7=90=86=EF=BC=8C=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E4=B8=BB=E7=AE=A1=EF=BC=8C=E6=80=BB=E7=BB=8F=E7=90=86=E6=80=BB?= =?UTF-8?q?=E5=8A=A9=E7=BC=BA=E5=B0=91TaskId=E9=97=AE=E9=A2=98=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=80=BB=E7=BB=8F=E7=90=86=E6=80=BB=E5=8A=A9=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E6=97=B6=E7=BC=BA=E5=B0=91=E5=AE=A2=E6=88=B7=E6=8A=A5?= =?UTF-8?q?=E4=BB=B7=E8=AF=A6=E6=83=85=E9=97=AE=E9=A2=98=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=9A=E5=8A=A1=E4=B8=BB=E7=AE=A1=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E4=B8=8D=E5=90=8C=E6=84=8F=E7=9A=84=E6=9D=A1=E4=BB=B6=20?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=A0=B9=E6=8D=AE=20=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E7=BB=8F=E7=90=86=E8=BF=99=E4=B8=AA=E8=A7=92=E8=89=B2=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E6=95=B0=E6=8D=AE=E6=9D=A1=E4=BB=B6=20=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E5=AE=A1=E6=89=B9=E6=97=B6=E5=A4=9AinstanceTypeName?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SysCustomerQuoteController.java | 29 ++- .../system/customerQuote/customerQuote.html | 2 +- .../system/customerQuote/taskYwjlVerify.html | 177 +++++++++++++----- .../system/customerQuote/taskZozjVerify.html | 1 + 4 files changed, 149 insertions(+), 60 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteController.java index 58c49b5a..4362f014 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysCustomerQuoteController.java @@ -102,20 +102,20 @@ public class SysCustomerQuoteController extends BaseController String loginName = ShiroUtils.getLoginName(); List sysUserlist = sysUserService.selectRoleToUserList("ywyRole"); sysUserlist.add(curUser); - if (roleKeys.contains("ywjlRole")) { - List findUser = sysUserlist.stream().filter(item -> (item.getDeptId().equals(curUser.getDeptId()))).collect(Collectors.toList()); - Set user = findUser.stream().map(SysUser::getLoginName).collect(Collectors.toSet()); - startPage(); - List list2 = list.stream().filter(item -> user.contains(item.getApplyUser())).collect(Collectors.toList()); - return getDataTable(list2); - } - // 业务员角色只能看到自己创建的数据 - if (roleKeys.contains("ywyRole")) { - sysCustomerQuoteVo.setApplyUser(curUser.getLoginName()); - startPage(); - List list2 = sysCustomerQuoteService.selectSysCustomerQuoteList(sysCustomerQuoteVo); - return getDataTable(list2); - } +// if (roleKeys.contains("ywjlRole")) { +// List findUser = sysUserlist.stream().filter(item -> (item.getDeptId().equals(curUser.getDeptId()))).collect(Collectors.toList()); +// Set user = findUser.stream().map(SysUser::getLoginName).collect(Collectors.toSet()); +// startPage(); +// List list2 = list.stream().filter(item -> user.contains(item.getApplyUser())).collect(Collectors.toList()); +// return getDataTable(list2); +// } +// // 业务员角色只能看到自己创建的数据 +// if (roleKeys.contains("ywyRole")) { +// sysCustomerQuoteVo.setApplyUser(curUser.getLoginName()); +// startPage(); +// List list2 = sysCustomerQuoteService.selectSysCustomerQuoteList(sysCustomerQuoteVo); +// return getDataTable(list2); +// } return getDataTable(list); }catch(NullPointerException e){ throw new NullPointerException("当前用户没有申请客户报价信息"); @@ -240,7 +240,6 @@ public class SysCustomerQuoteController extends BaseController String processInstanceId = task.getProcessInstanceId(); ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult(); SysCustomerQuoteVo sysCustomerQuoteVo = sysCustomerQuoteService.selectSysCustomerQuoteById(new Long(processInstance.getBusinessKey())); - sysCustomerQuoteVo.setTaskId(taskId); mmap.put("formData", sysCustomerQuoteVo); mmap.put("taskId", taskId); String verifyName = task.getTaskDefinitionKey().substring(0, 1).toUpperCase() + task.getTaskDefinitionKey().substring(1); 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 dc5aa37c..984bb0d2 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html @@ -191,7 +191,7 @@ var todoUserIdList = row.todoUserId.split(","); if(todoUserIdList.includes(loginName)){ var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批'; - actions.push(' '+nodeName+' '); + actions.push(' '+nodeName+' '); } } // 审批历史 diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html index 6d2b761c..5308a760 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html @@ -1,5 +1,5 @@ - + @@ -16,7 +16,7 @@
- +
@@ -49,7 +49,7 @@
-
@@ -69,8 +69,7 @@
- @@ -86,8 +85,8 @@
- +
@@ -117,25 +116,24 @@

计算

- - + +
-
- - + +
- - + +
-
- - +
+ +
-
- - +
+ +
@@ -162,7 +160,7 @@
选择报价信息 - + 添加物料
@@ -176,8 +174,12 @@
- + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html index f9f186bc..5126ce41 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html @@ -454,6 +454,7 @@ } var taskId = [[${taskId}]]; var tableData = $("#bootstrap-table-Quote-child5").bootstrapTable('getData'); + $("input[name='customerQuoteChildList']").val(JSON.stringify(tableData)); $.operate.save(prefix + "/complete/" + taskId, $('#form-customerQuote-zozj').serialize()); } }