diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index fcdaa1cf..eae11a85 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -2559,13 +2559,23 @@ public class PageController { if (token == null) { token = (String) request.getSession().getAttribute("userToken"); } + UserByPort userToken = AuthenticationTokenPool.getUserToken(token); + ModelAndView mv = new ModelAndView(); List gidList = new ArrayList<>(); if ("one".equals(type)) { gidList.add(gid); } else if ("more".equals(type)) { } + + // 获取当前用户是否存在可见仓库 + List union = roleService.findDepositoryIdForWareHouseVisiblePermissionByUser(userToken); + if (union.size() > 0) { + mv.addObject("display", "block"); + } else { + mv.addObject("display", "none"); + } mv.addObject("gidList", gidList); mv.setViewName("pages/group/applicationOutForGroup"); Integer maindeparment = userToken.getMaindeparment(); diff --git a/src/main/resources/templates/pages/group/applicationOutForGroup.html b/src/main/resources/templates/pages/group/applicationOutForGroup.html index 17cc9699..d9d9f981 100644 --- a/src/main/resources/templates/pages/group/applicationOutForGroup.html +++ b/src/main/resources/templates/pages/group/applicationOutForGroup.html @@ -45,9 +45,6 @@ display: none; } - .layui-form-select .layui-input { - border-style: none; - }
@@ -55,6 +52,7 @@
+ +
+ +
+ +
@@ -550,8 +583,8 @@ let gnameItem = gnameParent.childNodes[1].childNodes[1]; let req = {}; req.code = code; - if(code !== ""){ - let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); + if (code !== "") { + let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); $.ajax({ url: "/group/findGroupByCode", type: "post", @@ -589,6 +622,17 @@ // 赋值给gname gnameItem.value = data[0].gname; gidItem.value = data[0].gid; + let satisfyDepositoryList = data[0].satisfyDepositoryList; + if (depositoryDisplay !== "none") { + var idNumber = gidItem.name.split("gid")[1]; + $("#showDepositoryForGroup" + idNumber).empty(); + if (satisfyDepositoryList !== null) { + for (let i = 0; i < satisfyDepositoryList.length; i++) { + $("#showDepositoryForGroup" + idNumber).append(new Option(satisfyDepositoryList[i].dname, satisfyDepositoryList[i].id)); + } + } + form.render(); + } for (let i = 0; i < data.length; i++) { CoverpageForGroupInfo(pid, data[i]); } @@ -646,7 +690,7 @@ if (gid !== '') { let req = {}; req.gid = gid; - let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); + let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); $.ajax({ url: "/group/findGroupInfoByGid", @@ -683,6 +727,17 @@ } // 赋值给gname gcodeItem.value = data[0].gcode; + let satisfyDepositoryList = data[0].satisfyDepositoryList; + if (depositoryDisplay !== "none") { + var idNumber = gidItem.name.split("gid")[1]; + $("#showDepositoryForGroup" + idNumber).empty(); + if (satisfyDepositoryList !== null) { + for (let i = 0; i < satisfyDepositoryList.length; i++) { + $("#showDepositoryForGroup" + idNumber).append(new Option(satisfyDepositoryList[i].dname, satisfyDepositoryList[i].id)); + } + } + form.render(); + } for (let i = 0; i < data.length; i++) { CoverpageForGroupInfo(pid, data[i]); } @@ -716,7 +771,7 @@ if (gname !== '') { - let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); + let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); var req = {}; req.gname = gname; @@ -775,6 +830,17 @@ // 赋值给gname gidItem.value = data[0].gid; gcodeItem.value = data[0].gcode; + let satisfyDepositoryList = data[0].satisfyDepositoryList; + if (depositoryDisplay !== "none") { + var idNumber = gidItem.name.split("gid")[1]; + $("#showDepositoryForGroup" + idNumber).empty(); + if (satisfyDepositoryList !== null) { + for (let i = 0; i < satisfyDepositoryList.length; i++) { + $("#showDepositoryForGroup" + idNumber).append(new Option(satisfyDepositoryList[i].dname, satisfyDepositoryList[i].id)); + } + } + form.render(); + } for (let i = 0; i < data.length; i++) { CoverpageForGroupInfo(pid, data[i]); } @@ -810,7 +876,10 @@ var req = {}; req.gid = gid; req.quantity = val; - let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); + if (depositoryDisplay !== "none") { + req.depositoryId = $("#showDepositoryForGroup" + id).val(); + } + let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); $.ajax({ url: "/group/groupQuantityIsTrue", type: "post", @@ -823,20 +892,32 @@ if (!flag) { // 如果当前数目不合适 layer.msg("当前组合中" + res.statusInfo.message + "的库存数量不足", { icon: 0, - time: 500 + time: 1000 }, function () { - $("#quantityForGroup" + id).val(""); layer.close(loading2); + $("#quantityForGroup" + id).val(""); }); - }else{ + } else { layer.close(loading2); } } }); } } - } + }; + + // 监听下拉选择框 + form.on('select()', function (data) { + + let id = data.elem.id; + let idNum = id.split('showDepositoryForGroup')[1]; + let elem = {}; + elem.id = "quantityForGroup" + idNum; + groupQuantityIsTrue(elem) + + + }); // 实现卡片删除（组合） deleteItemForGroup = function (obj) { @@ -864,6 +945,7 @@ } return result; } + // 用于选择代领用户 selectUser = function (obj) { let id = obj.id;