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 e7626e38..28c963b2 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -1011,13 +1011,27 @@ public class PageController { * @return */ @GetMapping("/materialForGroup") - public ModelAndView materialForGroup(Integer mid, Integer gid) { + public ModelAndView materialForGroup(Integer mid, Integer gid,HttpServletRequest request) { ModelAndView mv = new ModelAndView(); // 根据物料id与组合id查询对应明细 GroupInfo groupInfoByMidAndGid = groupService.findGroupInfoByMidAndGid(mid, gid); if (groupInfoByMidAndGid != null) { mv.addObject("record", groupInfoByMidAndGid); List splitInfoByMid = splitUnitService.findSplitInfoByMid(groupInfoByMidAndGid.getMid()); + String token = request.getHeader("user-token"); + if (token == null) { + token = (String) request.getSession().getAttribute("userToken"); + } + UserByPort userToken = AuthenticationTokenPool.getUserToken(token); + Integer isadmin = userToken.getIsadmin(); + if (isadmin == null) { + isadmin = 1; + } + if (isadmin == 4 || Integer.compare(userToken.getMaindeparment(), 361) == 0) { + mv.addObject("display", "inline-block"); + } else { + mv.addObject("display", "none"); + } mv.addObject("splitList", splitInfoByMid); } else { throw new MyException("缺少必要参数!"); diff --git a/src/main/resources/templates/pages/group/group_edit.html b/src/main/resources/templates/pages/group/group_edit.html index 529b4973..8ea22bd5 100644 --- a/src/main/resources/templates/pages/group/group_edit.html +++ b/src/main/resources/templates/pages/group/group_edit.html @@ -62,8 +62,8 @@
@@ -292,27 +292,31 @@ // 用于修改组合名称 editGroupName = function (obj) { - let gid = $("#gid").val(); - let gname = obj.value; - let req = {}; - req.id = gid; - req.gname = gname; - $.ajax({ - url:'/group/editGroupInfo', - dataType:"json", - type:"post", - data:JSON.stringify(req), - contentType: "application/json;charset=utf-8", - success: function (data) { - if (data.status >= 300) { - layer.msg(data.statusInfo.message);//失败的表情 - - } else { + let display = $("#display").css("display"); + if(display !== "none"){ + let gid = $("#gid").val(); + let gname = obj.value; + let req = {}; + req.id = gid; + req.gname = gname; + $.ajax({ + url:'/group/editGroupInfo', + dataType:"json", + type:"post", + data:JSON.stringify(req), + contentType: "application/json;charset=utf-8", + success: function (data) { + if (data.status >= 300) { + layer.msg(data.statusInfo.message);//失败的表情 + } else { + layer.msg("修改成功") + } } - } - }); + }); + } + }; // 用于修改组合备注 diff --git a/src/main/resources/templates/pages/group/group_material_edit.html b/src/main/resources/templates/pages/group/group_material_edit.html index 8abf20db..14eb2f7d 100644 --- a/src/main/resources/templates/pages/group/group_material_edit.html +++ b/src/main/resources/templates/pages/group/group_material_edit.html @@ -48,7 +48,7 @@
-
@@ -91,7 +91,7 @@ -
+
@@ -113,6 +113,11 @@ layui.use(['form'], function () { var form = layui.form, $ = layui.$; let id = $("#id").val(); + let display = $("#btn_sb").css("display"); + if(display === "none"){ + $("#quantity").attr("readonly","readonly"); + } + form.on('submit(formDemo)', function (data) { if (!flagForForm) { flagForForm = true; diff --git a/src/main/resources/templates/pages/material/material-add.html b/src/main/resources/templates/pages/material/material-add.html index 0e6816e9..0d220444 100644 --- a/src/main/resources/templates/pages/material/material-add.html +++ b/src/main/resources/templates/pages/material/material-add.html @@ -302,11 +302,13 @@ console.log(d.data) } }) + }); + + $('body').on('click', '[data-refresh]', function () { + location.reload(); }) }); - $('body').on('click', '[data-refresh]', function () { - location.reload(); - }) + diff --git a/target/classes/templates/pages/group/group_edit.html b/target/classes/templates/pages/group/group_edit.html index 529b4973..952c2a16 100644 --- a/target/classes/templates/pages/group/group_edit.html +++ b/target/classes/templates/pages/group/group_edit.html @@ -62,8 +62,8 @@
@@ -292,27 +292,31 @@ // 用于修改组合名称 editGroupName = function (obj) { - let gid = $("#gid").val(); - let gname = obj.value; - let req = {}; - req.id = gid; - req.gname = gname; - $.ajax({ - url:'/group/editGroupInfo', - dataType:"json", - type:"post", - data:JSON.stringify(req), - contentType: "application/json;charset=utf-8", - success: function (data) { - if (data.status >= 300) { - layer.msg(data.statusInfo.message);//失败的表情 - - } else { + let display = $("#display").css("display"); + if(display !== "none"){ + let gid = $("#gid").val(); + let gname = obj.value; + let req = {}; + req.id = gid; + req.gname = gname; + $.ajax({ + url:'/group/editGroupInfo', + dataType:"json", + type:"post", + data:JSON.stringify(req), + contentType: "application/json;charset=utf-8", + success: function (data) { + if (data.status >= 300) { + layer.msg(data.statusInfo.message);//失败的表情 + } else { + layer.msg("修改成功") + } } - } - }); + }); + } + }; // 用于修改组合备注 diff --git a/target/classes/templates/pages/group/group_material_edit.html b/target/classes/templates/pages/group/group_material_edit.html index 8abf20db..14eb2f7d 100644 --- a/target/classes/templates/pages/group/group_material_edit.html +++ b/target/classes/templates/pages/group/group_material_edit.html @@ -48,7 +48,7 @@
-
@@ -91,7 +91,7 @@
-
+
@@ -113,6 +113,11 @@ layui.use(['form'], function () { var form = layui.form, $ = layui.$; let id = $("#id").val(); + let display = $("#btn_sb").css("display"); + if(display === "none"){ + $("#quantity").attr("readonly","readonly"); + } + form.on('submit(formDemo)', function (data) { if (!flagForForm) { flagForForm = true; diff --git a/target/classes/templates/pages/material/material-add.html b/target/classes/templates/pages/material/material-add.html index 0e6816e9..0d220444 100644 --- a/target/classes/templates/pages/material/material-add.html +++ b/target/classes/templates/pages/material/material-add.html @@ -302,11 +302,13 @@ console.log(d.data) } }) + }); + + $('body').on('click', '[data-refresh]', function () { + location.reload(); }) }); - $('body').on('click', '[data-refresh]', function () { - location.reload(); - }) +