From 1547c94abb45a14db6c5b41bec07010747f862eb Mon Sep 17 00:00:00 2001 From: erdanergou Date: Thu, 1 Jun 2023 08:23:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E8=88=AC=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E6=97=B6=E7=BB=84=E5=90=88=E5=87=BA=E5=BA=93=E6=97=B6?= =?UTF-8?q?=E4=BB=A3=E9=A2=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/GroupController.java | 1 + .../service/impl/GroupServiceImpl.java | 10 ++- .../pages/application/application-out.html | 83 ++++++++++++++----- 3 files changed, 74 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java b/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java index 5be855eb..3212fb00 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java @@ -653,6 +653,7 @@ public class GroupController { String header = request.getHeader("user-agent"); String crypt = Md5.crypt(header); map.put("applicantId", userToken.getId()); + // 获取当前部门负责人 List departmentHeadByUsers = PublicConfig.findDepartmentHeadByUser(userToken.getMaindeparment(), userkey,token); // 部门负责人id diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java index 6304710f..8fe3cda8 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java @@ -585,7 +585,7 @@ public class GroupServiceImpl implements GroupService { Map paramForOut = new HashMap<>(); paramForOut.put("departmenthead", map.get("departmenthead")); paramForOut.put("applicantId", userToken.getId()); - + paramForOut.put("createUid", userToken.getId()); // 获取当前提交数 List params = (List) map.get("params"); @@ -669,6 +669,14 @@ public class GroupServiceImpl implements GroupService { } } } + if (map.containsKey("flagForAgency")) { + // 如果开启了代领 + paramForOut.put("applicantId", map.get("agencyUid")); + paramForOut.put("flagForAgency", 1); + } else { + paramForOut.put("flagForAgency", 2); + } + paramForOut.put("flagForOpenDepository",1); paramForOut.put("quantity", quantityForTotal * 100); paramForOut.put("price", priceForTotal); paramForOut.put("applicantTime", System.currentTimeMillis()); diff --git a/src/main/resources/templates/pages/application/application-out.html b/src/main/resources/templates/pages/application/application-out.html index 302841d5..792ef65f 100644 --- a/src/main/resources/templates/pages/application/application-out.html +++ b/src/main/resources/templates/pages/application/application-out.html @@ -217,6 +217,42 @@
+
+
+ +
+ +
+
+ + +
@@ -527,7 +563,6 @@ } data.params = remove(data.params, Number(keyNumber)); } - $.ajax({ url: "/group/applicationOutForGroup", type: 'post', @@ -565,16 +600,17 @@ // 监听开关 form.on('switch()', function (data) { let isAgency = data.elem.checked; //开关是否开启，true或者false + let id = data.elem.id; if (isAgency) { // 如果开启了代领功能 - $("#agencyItem").show(); + $("#agencyItem" + id).show(); // 添加必填 - $("#agencyUid").attr("lay-verify", "required"); + $("#agencyUid" + id).attr("lay-verify", "required"); } else { - $("#agencyItem").hide(); + $("#agencyItem" + id).hide(); // 删除必填 - $("#agencyUid").removeAttr("lay-verify"); + $("#agencyUid" + id).removeAttr("lay-verify"); } }); @@ -1781,6 +1817,10 @@ // 用于选择代领用户 selectUser = function (obj) { + let id = obj.id; + if (id.indexOf("ForGroup") !== -1) { + id = "ForGroup"; + } let name = obj.value; if (name !== "") { let req = {}; @@ -1803,18 +1843,18 @@ layer.msg("部门中不存在该用户，请重试", { icon: 0, time: 1000 - },function () { - $("#adminorgId").val(""); - $("#agencyAdminorg").val(""); - $("#agencyUid").val(""); - $("#agencyUser").val(""); + }, function () { + $("#adminorgId" + id).val(""); + $("#agencyAdminorg" + id).val(""); + $("#agencyUid" + id).val(""); + $("#agencyUser" + id).val(""); }) } else if (count > 1) { let content = ``; $.each(data, function (index, item) { let listItem = `
- +
`; content += listItem; }); @@ -1826,10 +1866,10 @@ }) } else { let user = data[0]; - $("#adminorgId").val(user.maindeparment); - $("#agencyAdminorg").val(user.maindeparmentname); - $("#agencyUid").val(user.id); - $("#agencyUser").val(user.name); + $("#adminorgId" + id).val(user.maindeparment); + $("#agencyAdminorg" + id).val(user.maindeparmentname); + $("#agencyUid" + id).val(user.id); + $("#agencyUser" + id).val(user.name); } } }) @@ -1839,14 +1879,19 @@ // 用于选定人员 SelectTheUser = function (obj) { let data = $(obj); + let isGroup = data.attr("isGroup"); + if (isGroup !== "ForGroup") { + isGroup = ""; + } + let adminorg = data.attr("adminorg"); let adminorgName = data.attr("adminorgname"); let id = data.attr("id"); let name = data.attr("name"); - $("#adminorgId").val(adminorg); - $("#agencyAdminorg").val(adminorgName); - $("#agencyUid").val(id); - $("#agencyUser").val(name); + $("#adminorgId" + isGroup).val(adminorg); + $("#agencyAdminorg" + isGroup).val(adminorgName); + $("#agencyUid" + isGroup).val(id); + $("#agencyUser" + isGroup).val(name); layer.close(selectUserIfame) };