修改部分权限设置

src/main/java/com/dreamchaser/depository_manage/mapper/GroupMapper.xml

@@ -362,8 +362,8 @@
             </if>
             <if test="gname != null and gname !=''">
                 gname = #{gname},
-            </if><if test="applyRemark != null and applyRemark !=''">
-                remark = #{applyRemark}
+            </if><if test="remark != null and remark !=''">
+                remark = #{remark}
         </if>
         </set>
         where id = #{id}

src/main/resources/templates/pages/group/group-out.html

@@ -89,7 +89,7 @@
 <script type="text/html" id="currentTableBar">
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="detail">详情</a>
     <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete" th:style="'display:'+${display}">删除</a>
-    <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" th:style="'display:'+${display}"
+    <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" th:style="'display:'+${display}" id="display"
        lay-event="realDelete">彻底删除</a>
 </script>
 <script type="text/html" id="currentTableBarForOut">
@@ -152,8 +152,6 @@
                     {field: 'state', title: '状态', minWidth: 100, templet: '#switchTpl'},
                     {title: '出入库', minWidth: 200, toolbar: '#currentTableBarForOut', align: "center"},
                     {title: '操作', minWidth: 200, toolbar: '#currentTableBar', align: "center"},
-
-
                 ]
             ],
             limits: [10, 15, 20, 25, 50, 100],
@@ -161,6 +159,7 @@
             page: true,
             skin: 'line',
             done: function (res, curr, count) {
+
                 $.each(res['data'], function (i, j) {
                     let materialSimple = j["materialSimple"];
                     let gid = j["id"];
@@ -392,6 +391,8 @@
 
         //监听状态操作
         form.on('switch(changeState)', function (obj) {
+            let display = $("#display").css("display");
+            if(display !== "none"){
                 var req = new Map;
                 if (obj.elem.checked) {
                     req["state"] = 1
@@ -420,6 +421,8 @@
                         }
                     }
                 })
+            }
+
         });
 
 

src/main/resources/templates/pages/group/group_edit.html

@@ -325,7 +325,7 @@
             let applyRemark = obj.value;
             let req = {};
             req.id = gid;
-            req.applyRemark = applyRemark;
+            req.remark = applyRemark;
             $.ajax({
                 url:'/group/editGroupInfo',
                 dataType:"json",

src/main/resources/templates/pages/group/group_edit_mobile.html

@@ -166,7 +166,7 @@
             let applyRemark = obj.value;
             let req = {};
             req.id = gid;
-            req.applyRemark = applyRemark;
+            req.remark = applyRemark;
             $.ajax({
                 url: '/group/editGroupInfo',
                 dataType: "json",

src/main/resources/templates/pages/material/material-out.html

@@ -669,6 +669,8 @@
 
         //监听状态操作
         form.on('switch(changeState)', function (obj) {
+            let display = $("#display").val();
+            if(display !== "none"){
                 var req = new Map;
                 if (obj.elem.checked) {
                     req["state"] = 1
@@ -698,6 +700,8 @@
                         }
                     }
                 })
+            }
+
         });
 
 

src/main/resources/templates/pages/materialtype/materialType_view.html

@@ -63,7 +63,7 @@
 
         <script type="text/html" id="toolbarDemo">
             <div class="layui-btn-container">
-                <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add"
+                <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add" id="display"
                         th:style="'display:'+${display}"> 添加
                 </button>
                 <button class="layui-btn layui-btn-sm layui-btn-danger data-delete-btn" lay-event="delete"
@@ -592,13 +592,16 @@
 
         //监听状态操作
         form.on('switch(changeState)', function (obj) {
+            let display = $("#display").css("display");
+            if(display !== "none"){
                 var req = new Map;
                 if (obj.elem.checked) {
                     req["state"] = 1;
                 }
                 req["id"] = this.value;
                 var hasMaterial = false;
-            if (req["state"] === undefined) {  //如果禁用
+                if (req["state"] === undefined)
+                {  //如果禁用
                     $.ajax({
                         url: "/materialType/findMaterialByMaterialTypeId", // 判断该类型下是否有物品
                         type: "post",
@@ -686,7 +689,8 @@
                             }
                         }
                     })
-            } else { // 如果启用
+                }
+                else { // 如果启用
                     $.ajax({
                         url: "/materialType/EditMaterialTypeState",
                         type: 'post',
@@ -719,6 +723,8 @@
                         }
                     })
                 }
+            }
+
 
         });
 

src/main/resources/templates/pages/warehouse/depository-out.html

@@ -76,8 +76,8 @@
 
         <script id="toolbarDemo" type="text/html">
             <div class="layui-btn-container">
-                <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add"> 添加</button>
-                <button class="layui-btn layui-btn-sm layui-btn-danger data-delete-btn" lay-event="delete"> 删除</button>
+                <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add" th:style="'display:'+${display}" id="display"> 添加</button>
+                <button class="layui-btn layui-btn-sm layui-btn-danger data-delete-btn" lay-event="delete" th:style="'display:'+${display}"> 删除</button>
             </div>
         </script>
 
@@ -86,7 +86,7 @@
         <script id="currentTableBar" type="text/html">
             <a class="layui-btn layui-btn-normal layui-btn-xs data-count-subclass" lay-event="subclass">子仓</a>
             <a class="layui-btn layui-btn-xs data-count-edit" lay-event="detail">详情</a>
-            <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+            <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" th:style="'display:'+${display}" lay-event="delete">删除</a>
             <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" th:style="'display:'+${display}"
                lay-event="realDelete">彻底删除</a>
         </script>
@@ -460,8 +460,10 @@
         //监听状态操作
         form.on('switch(changeState)', function (obj) {
             // 首先发送请求判断待禁用的仓库是否还有货物，如果没有就直接禁用，否则进行判断
-            var hasMaterial = false
-            var req = new Map
+            let display = $("#display").css("display");
+            if(display !== "none"){
+                var hasMaterial = false;
+                var req = new Map;
                 if (obj.elem.checked) {
                     req["state"] = 1
                 }
@@ -576,7 +578,8 @@
                             }
                         }
                     })
-            } else {  // 如果启用
+                }
+                else {  // 如果启用
                     $.ajax({
                         url: "/repository/EditDepositoryState",
                         type: 'post',
@@ -610,6 +613,9 @@
                         }
                     })
                 }
+            }
+
+
 
         });
 

src/main/resources/templates/pages/warehouse/warehouseByParentId.html

@@ -21,6 +21,7 @@
             <div style="margin: 10px 10px 10px 10px">
                 <form class="layui-form layui-form-pane" action="">
                     <input id="parentId" style="display: none" th:value="${parentId}">
+                    <input id="display" style="display: none" th:value="${display}">
                     <div class="layui-form-item">
                         <div class="layui-inline">
                             <label class="layui-form-label">库位行</label>
@@ -336,6 +337,8 @@
 
         //监听状态操作
         form.on('switch(changeState)', function (obj) {
+            let display = $("#display").val();
+            if(display !== "none"){
                 var req = {};
                 if (obj.elem.checked) {
                     req["state"] = 1
@@ -366,6 +369,8 @@
                     }
 
                 })
+            }
+
         });
 
         viewInfoForInventory = function (obj) {

target/classes/com/dreamchaser/depository_manage/mapper/GroupMapper.xml

@@ -362,8 +362,8 @@
             </if>
             <if test="gname != null and gname !=''">
                 gname = #{gname},
-            </if><if test="applyRemark != null and applyRemark !=''">
-                remark = #{applyRemark}
+            </if><if test="remark != null and remark !=''">
+                remark = #{remark}
         </if>
         </set>
         where id = #{id}

target/classes/templates/pages/group/group-out.html

@@ -89,7 +89,7 @@
 <script type="text/html" id="currentTableBar">
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="detail">详情</a>
     <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete" th:style="'display:'+${display}">删除</a>
-    <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" th:style="'display:'+${display}"
+    <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" th:style="'display:'+${display}" id="display"
        lay-event="realDelete">彻底删除</a>
 </script>
 <script type="text/html" id="currentTableBarForOut">
@@ -152,8 +152,6 @@
                     {field: 'state', title: '状态', minWidth: 100, templet: '#switchTpl'},
                     {title: '出入库', minWidth: 200, toolbar: '#currentTableBarForOut', align: "center"},
                     {title: '操作', minWidth: 200, toolbar: '#currentTableBar', align: "center"},
-
-
                 ]
             ],
             limits: [10, 15, 20, 25, 50, 100],
@@ -161,6 +159,7 @@
             page: true,
             skin: 'line',
             done: function (res, curr, count) {
+
                 $.each(res['data'], function (i, j) {
                     let materialSimple = j["materialSimple"];
                     let gid = j["id"];
@@ -392,6 +391,8 @@
 
         //监听状态操作
         form.on('switch(changeState)', function (obj) {
+            let display = $("#display").css("display");
+            if(display !== "none"){
                 var req = new Map;
                 if (obj.elem.checked) {
                     req["state"] = 1
@@ -420,6 +421,8 @@
                         }
                     }
                 })
+            }
+
         });
 
 

target/classes/templates/pages/group/group_edit.html

@@ -325,7 +325,7 @@
             let applyRemark = obj.value;
             let req = {};
             req.id = gid;
-            req.applyRemark = applyRemark;
+            req.remark = applyRemark;
             $.ajax({
                 url:'/group/editGroupInfo',
                 dataType:"json",

target/classes/templates/pages/group/group_edit_mobile.html

@@ -166,7 +166,7 @@
             let applyRemark = obj.value;
             let req = {};
             req.id = gid;
-            req.applyRemark = applyRemark;
+            req.remark = applyRemark;
             $.ajax({
                 url: '/group/editGroupInfo',
                 dataType: "json",

target/classes/templates/pages/material/material-out.html

@@ -669,6 +669,8 @@
 
         //监听状态操作
         form.on('switch(changeState)', function (obj) {
+            let display = $("#display").val();
+            if(display !== "none"){
                 var req = new Map;
                 if (obj.elem.checked) {
                     req["state"] = 1
@@ -698,6 +700,8 @@
                         }
                     }
                 })
+            }
+
         });
 
 

target/classes/templates/pages/materialtype/materialType_view.html

@@ -63,7 +63,7 @@
 
         <script type="text/html" id="toolbarDemo">
             <div class="layui-btn-container">
-                <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add"
+                <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add" id="display"
                         th:style="'display:'+${display}"> 添加
                 </button>
                 <button class="layui-btn layui-btn-sm layui-btn-danger data-delete-btn" lay-event="delete"
@@ -592,13 +592,16 @@
 
         //监听状态操作
         form.on('switch(changeState)', function (obj) {
+            let display = $("#display").css("display");
+            if(display !== "none"){
                 var req = new Map;
                 if (obj.elem.checked) {
                     req["state"] = 1;
                 }
                 req["id"] = this.value;
                 var hasMaterial = false;
-            if (req["state"] === undefined) {  //如果禁用
+                if (req["state"] === undefined)
+                {  //如果禁用
                     $.ajax({
                         url: "/materialType/findMaterialByMaterialTypeId", // 判断该类型下是否有物品
                         type: "post",
@@ -686,7 +689,8 @@
                             }
                         }
                     })
-            } else { // 如果启用
+                }
+                else { // 如果启用
                     $.ajax({
                         url: "/materialType/EditMaterialTypeState",
                         type: 'post',
@@ -719,6 +723,8 @@
                         }
                     })
                 }
+            }
+
 
         });
 

target/classes/templates/pages/warehouse/depository-out.html

@@ -76,8 +76,8 @@
 
         <script id="toolbarDemo" type="text/html">
             <div class="layui-btn-container">
-                <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add"> 添加</button>
-                <button class="layui-btn layui-btn-sm layui-btn-danger data-delete-btn" lay-event="delete"> 删除</button>
+                <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add" th:style="'display:'+${display}" id="display"> 添加</button>
+                <button class="layui-btn layui-btn-sm layui-btn-danger data-delete-btn" lay-event="delete" th:style="'display:'+${display}"> 删除</button>
             </div>
         </script>
 
@@ -86,7 +86,7 @@
         <script id="currentTableBar" type="text/html">
             <a class="layui-btn layui-btn-normal layui-btn-xs data-count-subclass" lay-event="subclass">子仓</a>
             <a class="layui-btn layui-btn-xs data-count-edit" lay-event="detail">详情</a>
-            <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+            <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" th:style="'display:'+${display}" lay-event="delete">删除</a>
             <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" th:style="'display:'+${display}"
                lay-event="realDelete">彻底删除</a>
         </script>
@@ -460,8 +460,10 @@
         //监听状态操作
         form.on('switch(changeState)', function (obj) {
             // 首先发送请求判断待禁用的仓库是否还有货物，如果没有就直接禁用，否则进行判断
-            var hasMaterial = false
-            var req = new Map
+            let display = $("#display").css("display");
+            if(display !== "none"){
+                var hasMaterial = false;
+                var req = new Map;
                 if (obj.elem.checked) {
                     req["state"] = 1
                 }
@@ -576,7 +578,8 @@
                             }
                         }
                     })
-            } else {  // 如果启用
+                }
+                else {  // 如果启用
                     $.ajax({
                         url: "/repository/EditDepositoryState",
                         type: 'post',
@@ -610,6 +613,9 @@
                         }
                     })
                 }
+            }
+
+
 
         });
 

target/classes/templates/pages/warehouse/warehouseByParentId.html

@@ -21,6 +21,7 @@
             <div style="margin: 10px 10px 10px 10px">
                 <form class="layui-form layui-form-pane" action="">
                     <input id="parentId" style="display: none" th:value="${parentId}">
+                    <input id="display" style="display: none" th:value="${display}">
                     <div class="layui-form-item">
                         <div class="layui-inline">
                             <label class="layui-form-label">库位行</label>
@@ -336,6 +337,8 @@
 
         //监听状态操作
         form.on('switch(changeState)', function (obj) {
+            let display = $("#display").val();
+            if(display !== "none"){
                 var req = {};
                 if (obj.elem.checked) {
                     req["state"] = 1
@@ -366,6 +369,8 @@
                     }
 
                 })
+            }
+
         });
 
         viewInfoForInventory = function (obj) {