组织表单二次提交

3 years ago · 1f2279be92
49 changed files with 2133 additions and 1779 deletions
--- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
@ -54,7 +54,7 @@ public class DepositoryRecordController {
    @GetMapping("/myApply")
    public RestResponse findDepositoryInAndOutRecordPByCondition(@RequestParam Map<String, Object> map, HttpServletRequest request) {
        String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
            token = (String) request.getSession().getAttribute("userToken");
        }
        UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -84,7 +84,7 @@ public class DepositoryRecordController {
    @GetMapping("/myTaskOut")
    public RestResponse myTaskOut(@RequestParam Map<String, Object> map, HttpServletRequest request) {
        String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
            token = (String) request.getSession().getAttribute("userToken");
        }
        UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -99,7 +99,7 @@ public class DepositoryRecordController {
    @GetMapping("/myTaskIn")
    public RestResponse myTaskIn(@RequestParam Map<String, Object> map, HttpServletRequest request) {
        String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
            token = (String) request.getSession().getAttribute("userToken");
        }
        UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -117,7 +117,7 @@ public class DepositoryRecordController {
        // isDone 为0为未完成，1为已完成
        String isDone = (String) (map.get("isDone"));
        String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
            token = (String) request.getSession().getAttribute("userToken");
        }
        UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -200,7 +200,7 @@ public class DepositoryRecordController {
    @PostMapping("/depositoryRecord")
    public RestResponse insertDepositoryRecord(@RequestBody Map<String, Object> map, HttpServletRequest request) {
        String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
            token = (String) request.getSession().getAttribute("userToken");
        }
        UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -219,7 +219,7 @@ public class DepositoryRecordController {
        String header = request.getHeader("user-agent");
        String crypt = Md5.crypt(header);
        String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
            token = (String) request.getSession().getAttribute("userToken");
        }
        UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -244,8 +244,7 @@ public class DepositoryRecordController {
                    recordIds.add(ObjectFormatUtil.toInteger(map.get("applicationInId")));
                    mtIdList.add(ObjectFormatUtil.toLong(map.get("mtId")));
                }
-            }
+            } else {
            else {
                // 获取库位id
                Integer placeId = ObjectFormatUtil.toInteger(map.get("placeId"));
                if (placeId == 0) {// 如果插入到仓库
@ -438,7 +437,7 @@ public class DepositoryRecordController {
    @PostMapping("/applicationOut")
    public RestResponse insertApplicationOutRecord(@RequestBody Map<String, Object> map, HttpServletRequest request) {
        String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
            token = (String) request.getSession().getAttribute("userToken");
        }
        UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -466,15 +465,21 @@ public class DepositoryRecordController {
                    map.remove("id");
                    map.put("parentId", id);
                }
                if (map.containsKey("constructionUnitId")) {
                    String constructionUnitId = map.get("constructionUnitId").toString();
-                String adminorgId =  map.get("adminorgId").toString();
+                    if ("".equals(constructionUnitId)) {
                if("".equals(constructionUnitId))
                {
                        map.remove("constructionUnitId");
                    }
                if("".equals(adminorgId)){
                    map.put("adminorgId",userToken.getMaindeparment());
                }
                if (map.containsKey("adminorgId")) {
                    String adminorgId = map.get("adminorgId").toString();
                    if ("".equals(adminorgId)) {
                        map.put("adminorgId", userToken.getMaindeparment());
                    }
                } else {
                    map.put("adminorgId", userToken.getMaindeparment());
                }
                integer += depositoryRecordService.insertApplicationOutMin(map);
                // 开启一个线程执行发送信息操作
@ -542,28 +547,40 @@ public class DepositoryRecordController {
                    insert.put("unit", map.get("unit" + temp));
                    // 获取主订单编号
                    insert.put("parentId", id);
-                    String constructionUnitId = (String) map.get("constructionUnitId"+temp);
+                    if (map.containsKey("constructionUnitId" + temp)) {
-                    String adminorgId = (String) map.get("adminorgId"+temp);
+                        String constructionUnitId = (String) map.get("constructionUnitId" + temp);
-                    if(!"".equals(constructionUnitId))
+                        if (!"".equals(constructionUnitId)) {
-                    {
+                            insert.put("constructionUnitId", constructionUnitId);
-                        insert.put("constructionUnitId",constructionUnitId);
+                        }
                    }
                    if (map.containsKey("adminorgId" + temp)) {
                        String adminorgId = (String) map.get("adminorgId" + temp);
                        if ("".equals(adminorgId)) {
                            map.put("adminorgId", userToken.getMaindeparment());
                        } else {
                            map.put("adminorgId", adminorgId);
                        }
-                    if("".equals(adminorgId)){
+                    } else {
-                        map.put("adminorgId",userToken.getMaindeparment());
+                        map.put("adminorgId", userToken.getMaindeparment());
                    }else{
                        map.put("adminorgId",adminorgId);
                    }
                    // 插入子订单
                    integer += depositoryRecordService.insertApplicationOutMin(insert);
                }
                if (map.containsKey("constructionUnitId")) {
                    String constructionUnitId = map.get("constructionUnitId").toString();
-                String adminorgId =  map.get("adminorgId").toString();
+                    if ("".equals(constructionUnitId)) {
                if("".equals(constructionUnitId))
                {
                        map.remove("constructionUnitId");
                    }
-                if("".equals(adminorgId)){
+                }
-                    map.put("adminorgId",userToken.getMaindeparment());
+                if (map.containsKey("adminorgId")) {
                    String adminorgId = map.get("adminorgId").toString();
                    if ("".equals(adminorgId)) {
                        map.put("adminorgId", userToken.getMaindeparment());
                    }
                } else {
                    map.put("adminorgId", userToken.getMaindeparment());
                }
                // 插入子订单
                map.put("parentId", id);
@ -620,7 +637,7 @@ public class DepositoryRecordController {
    @GetMapping("/applicationInView")
    public RestResponse findApplicationInRecordByCondition(@RequestParam Map<String, Object> map, HttpServletRequest request) {
        String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
            token = (String) request.getSession().getAttribute("userToken");
        }
        UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -652,7 +669,7 @@ public class DepositoryRecordController {
        // 0未完成1已完成
        Integer stateOnView = ObjectFormatUtil.toInteger(map.get("state"));
        String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
            token = (String) request.getSession().getAttribute("userToken");
        }
        UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -776,17 +793,17 @@ public class DepositoryRecordController {
    @GetMapping("/applicationOutView")
    public RestResponse findApplicationOutRecordByCondition(@RequestParam Map<String, Object> map, HttpServletRequest request) {
        String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
            token = (String) request.getSession().getAttribute("userToken");
        }
        UserByPort userByPort = AuthenticationTokenPool.getUserToken(token);
        // 获取对应主订单
        List<ApplicationOutRecordP> list = new ArrayList<>();
        Integer countBy = 0;
-        if(Integer.compare(userByPort.getMaindeparment(),361)==0){
+        if (Integer.compare(userByPort.getMaindeparment(), 361) == 0) {
-            list = depositoryRecordService.findApplicationOutRecordPByCondition(map,userByPort);
+            list = depositoryRecordService.findApplicationOutRecordPByCondition(map, userByPort);
            countBy = depositoryRecordService.findApplicationOutRecordPCountByCondition(map);
-        }else{
+        } else {
            list = depositoryRecordService.findApplicationOutRecordPByUser(userByPort, map);
            countBy = depositoryRecordService.findApplicationOutRecordPCountByUser(userByPort, map);
@ -845,7 +862,7 @@ public class DepositoryRecordController {
    @PostMapping("/addApplicationToRedis")
    public RestResponse addApplicationToRedis(@RequestBody Map<String, Object> map, HttpServletRequest request) {
        String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
            token = (String) request.getSession().getAttribute("userToken");
        }
        UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -878,7 +895,7 @@ public class DepositoryRecordController {
    @PostMapping("/deleteApplicationToRedis")
    public RestResponse deleteApplicationToRedis(@RequestBody Map<String, Object> map, HttpServletRequest request) {
        String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
            token = (String) request.getSession().getAttribute("userToken");
        }
        UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -901,7 +918,7 @@ public class DepositoryRecordController {
    @PutMapping("/review")
    public RestResponse review(@RequestBody Map<String, Object> map, HttpServletRequest request) {
        String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
            token = (String) request.getSession().getAttribute("userToken");
        }
        UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -918,7 +935,7 @@ public class DepositoryRecordController {
    @PutMapping("/reviewIn")
    public RestResponse reviewIn(@RequestBody Map<String, Object> map, HttpServletRequest request) {
        String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
            token = (String) request.getSession().getAttribute("userToken");
        }
        UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -936,7 +953,7 @@ public class DepositoryRecordController {
    @PutMapping("/transfer")
    public RestResponse transfer(@RequestBody Map<String, Object> map, HttpServletRequest request) {
        String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
            token = (String) request.getSession().getAttribute("userToken");
        }
        UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -1057,9 +1074,9 @@ public class DepositoryRecordController {
    //    删除入库记录
    @PostMapping("/deleteApplicationInRecord")
-    public RestResponse deleteApplicationInRecord(@RequestBody Map<String, Object> map,HttpServletRequest request) {
+    public RestResponse deleteApplicationInRecord(@RequestBody Map<String, Object> map, HttpServletRequest request) {
        String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
            token = (String) request.getSession().getAttribute("userToken");
        }
        UserByPort userByPort = AuthenticationTokenPool.getUserToken(token);
@ -1067,10 +1084,10 @@ public class DepositoryRecordController {
        String crypt = Md5.crypt(header);
        if (map.containsKey("id")) {
            Integer id = ObjectFormatUtil.toInteger(map.get("id"));
-            return CrudUtil.deleteHandle(depositoryRecordService.deleteApplicationInRecordById(id,userByPort,crypt), 1);
+            return CrudUtil.deleteHandle(depositoryRecordService.deleteApplicationInRecordById(id, userByPort, crypt), 1);
        } else if (map.containsKey("ids")) {
            List<Integer> ids = (List<Integer>) map.get("ids");
-            return CrudUtil.deleteHandle(depositoryRecordService.deleteApplicationInRecordByIds(ids,userByPort,crypt), ids.size());
+            return CrudUtil.deleteHandle(depositoryRecordService.deleteApplicationInRecordByIds(ids, userByPort, crypt), ids.size());
        } else {
            throw new MyException("所需请求参数缺失！");
        }
@ -1080,7 +1097,7 @@ public class DepositoryRecordController {
    @PostMapping("/deleteApplicationOutRecord")
    public RestResponse deleteApplicationOutRecord(@RequestBody Map<String, Object> map, HttpServletRequest request) {
        String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
            token = (String) request.getSession().getAttribute("userToken");
        }
        UserByPort userByPort = AuthenticationTokenPool.getUserToken(token);
@ -1134,7 +1151,7 @@ public class DepositoryRecordController {
        int start = (page - 1) * pagesize;
        Integer end = page * 10;
        String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
            token = (String) request.getSession().getAttribute("userToken");
        }
        UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -1190,7 +1207,7 @@ public class DepositoryRecordController {
    @PostMapping("/createMultiApplication")
    public RestResponse createMultiApplication(@RequestBody Map<String, Object> map, HttpServletRequest request) {
        String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
            token = (String) request.getSession().getAttribute("userToken");
        }
        UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -1303,7 +1320,7 @@ public class DepositoryRecordController {
    @PostMapping("/createMultiApplications")
    public RestResponse createMultiApplications(@RequestBody Map<String, Object> map, HttpServletRequest request) {
        String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
            token = (String) request.getSession().getAttribute("userToken");
        }
        UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -1498,7 +1515,7 @@ public class DepositoryRecordController {
    @PostMapping("/isCheckOut")
    public RestResponse isCheckOut(@RequestBody Map<String, Object> map, HttpServletRequest request) {
        String token = request.getHeader("user-token");
-        if(token == null){
+        if (token == null) {
            token = (String) request.getSession().getAttribute("userToken");
        }
        UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java
@ -497,16 +497,19 @@ public class GroupServiceImpl implements GroupService {
        List<Group> allGroupOnly = groupMapper.findAllGroupOnly(gname);
        // 获取当前总数
-        Integer totalVal = allGroupOnly.size();
+        int totalVal = allGroupOnly.size();
        // 定义分页数量
        double size = 10.0;
        // 定义线程数
-        Integer threadSize = (int) Math.ceil(totalVal / size);
+        int threadSize = (int) Math.ceil(totalVal / size);
        // 定义开启线程数目
-        Integer openThreadSize = 0;
+        int openThreadSize = 0;
        if(threadSize == 0){
            return list;
        }
        // 开启对应数量的线程
        ExecutorService exs = Executors.newFixedThreadPool(threadSize);
        // 线程结果集
--- a/src/main/resources/templates/pages/application/application-in.html
+++ b/src/main/resources/templates/pages/application/application-in.html
@ -413,6 +413,11 @@
    // 用于卡片编号
    var NewIdNumber = 1;
    // 用于标志当前表单是否第一次提交
    let flagForForm  = false;
    let GroupflagForForm  = false;
    // 用于暂存卡片个数(组合)
    var params2 = [];
    layui.use(['form', 'step', 'flow', 'laydate', 'element'], function () {
@ -449,6 +454,8 @@
        // 用于提交操作
        form.on('submit(formStep)', function (data) {
            if(!flagForForm){
                flagForForm = true;
                data = data.field;
                data.type = 1;
                data.params = params;
@ -501,10 +508,14 @@
                        layer.close(this.layerIndex);
                    }
                });
            }
            return false;
        });
        // 用于提交操作(组合)
        form.on('submit(formStep2)', function (data) {
            if(!GroupflagForForm){
                GroupflagForForm = true;
                data = data.field;
                data.type = 1;
                data.params = params2;
@ -535,6 +546,8 @@
                        layer.close(this.layerIndex);
                    }
                });
            }
        });
        $('.pre').click(function () {
--- a/src/main/resources/templates/pages/application/application-in_back.html
+++ b/src/main/resources/templates/pages/application/application-in_back.html
@ -139,11 +139,14 @@
 <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
 <script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script>
 <script>
    let flagForForm  = false;
    layui.use(['form', 'step','laydate'], function () {
        var $ = layui.$,
            form = layui.form,
            laydate = layui.laydate,
            step = layui.step;
        // 用于标志当前表单是否第一次提交
        var mid = $("#mid").val();
        var depositoryId = $("#depositoryId").val();
@ -294,6 +297,8 @@
        form.on('submit(formStep)', function (data) {
            if(!flagForForm){
                flagForForm = true;
                data = data.field;
                data.type = 1;
                var params = [];
@ -325,6 +330,8 @@
                        layer.close(this.layerIndex);
                    }
                });
            }
            return false;
        });
--- a/src/main/resources/templates/pages/application/application-in_scanQrCode.html
+++ b/src/main/resources/templates/pages/application/application-in_scanQrCode.html
@ -131,6 +131,10 @@
    function initForm(num, obj) {
    }
    // 用于标志当前表单是否第一次提交
    let flagForForm  = false;
    // 用于暂存卡片个数
    var params = [];
    // 用于卡片编号
@ -354,6 +358,8 @@
        // 用于提交操作
        form.on('submit(formStep)', function (data) {
            if(!flagForForm){
                flagForForm = true;
                data = data.field;
                data.type = 1;
                data.params = params;
@ -402,6 +408,8 @@
                        layer.close(this.layerIndex);
                    }
                });
            }
            return false;
        });
--- a/src/main/resources/templates/pages/application/application-out.html
+++ b/src/main/resources/templates/pages/application/application-out.html
@ -203,14 +203,16 @@
                                                                   class="layui-input" lay-verify="required"
                                                                   style="border-style: none">
                                                            <img src="/static/images/search.ico" height="16" width="16"
-                                                                 style="margin-top: 10px;display: none" onclick="scanCodeByOut(this)">
+                                                                 style="margin-top: 10px;display: none"
                                                                 onclick="scanCodeByOut(this)">
                                                        </div>
                                                    </div>
                                                </div>
                                                <div class="layui-form-item">
                                                    <label class="layui-form-label">组合数量:</label>
                                                    <div class="layui-input-block">
-                                                        <input type="number" name="quantity" class="layui-input" id="quantityForGroup" onblur="groupQuantityIsTrue(this)"
+                                                        <input type="number" name="quantity" class="layui-input"
                                                               id="quantityForGroup" onblur="groupQuantityIsTrue(this)"
                                                               required lay-verify="number" placeholder="请填写组合数量"/>
                                                    </div>
                                                </div>
@ -229,7 +231,8 @@
                                            <!--提交按钮-->
                                            <div class="layui-form-item" id="btn_sub2">
                                                <div class="layui-input-block">
-                                                    <button class="layui-btn" lay-submit lay-filter="formStep2" type="button"
+                                                    <button class="layui-btn" lay-submit lay-filter="formStep2"
                                                            type="button"
                                                            style="margin-bottom: 30px;margin-left: 15%">
                                                        &emsp;提交&emsp;
                                                    </button>
@ -335,6 +338,10 @@
    // 用于暂存卡片个数
    var params = [];
    // 用于标志当前表单是否第一次提交
    let flagForForm  = false;
    let GroupflagForForm  = false;
    // 用于暂存卡片个数(组合)
    var params2 = [];
    // 用于卡片编号
@ -373,6 +380,8 @@
        // 提交（物料出库）
        form.on('submit(formStep)', function (data) {
            if(!flagForForm){
                flagForForm = true;
                data = data.field;
                data.params = params;
                if (data.mid === undefined) {
@ -426,11 +435,14 @@
                        layer.close(this.layerIndex);
                    }
                });
            }
            return false;
        });
        // 提交（组合出库）
        form.on('submit(formStep2)', function (data) {
            if(!GroupflagForForm){
                GroupflagForForm = true;
                data = data.field;
                data.params = params2;
                if (data.gid === undefined) {
@ -483,6 +495,9 @@
                        layer.close(this.layerIndex);
                    }
                });
            }
            return false;
        });
        $('.pre').click(function () {
@ -554,7 +569,7 @@
                                    <div class="layui-form-item">
                                                    <label class="layui-form-label">计量单位:</label>
                                                    <div class="layui-input-block">
-                                                        <select id=`+"unit"+NewIdNumber+` name=`+"unit"+NewIdNumber+`>
+                                                        <select id=` + "unit" + NewIdNumber + ` name=` + "unit" + NewIdNumber + `>
                                                        </select>
                                                    </div>
@ -590,13 +605,13 @@
                                                        <div class="inputdiv">
                                                            <input type="text" placeholder="请选择组合" class="layui-input"
                                                                   style="border-style: none"
-                                                                   id=`+"openGroupList"+NewIdNumber+` onblur="selectGroupByName(this)"
+                                                                   id=` + "openGroupList" + NewIdNumber + ` onblur="selectGroupByName(this)"
                                                                   lay-verify="required"/>
                                                            <i class="layui-icon layui-icon-search"
                                                               style="display: inline"
-                                                               id=`+"selectGroup"+NewIdNumber+` onclick="selectGroup(this)"></i>
+                                                               id=` + "selectGroup" + NewIdNumber + ` onclick="selectGroup(this)"></i>
                                                        </div>
-                                                        <input type="text" name=`+"gid"+NewIdNumber+` class="layui-input" id=`+"gid"+NewIdNumber+`
+                                                        <input type="text" name=` + "gid" + NewIdNumber + ` class="layui-input" id=` + "gid" + NewIdNumber + `
                                                               style="display: none" lay-verify="required"/>
                                                    </div>
                                                </div>
@ -616,14 +631,14 @@
                                                <div class="layui-form-item">
                                                    <label class="layui-form-label">组合数量:</label>
                                                    <div class="layui-input-block">
-                                                        <input type="number" name=`+"quantity"+NewIdNumber+` class="layui-input" id=`+"quantityForGroup"+NewIdNumber+`
+                                                        <input type="number" name=` + "quantity" + NewIdNumber + ` class="layui-input" id=` + "quantityForGroup" + NewIdNumber + `
                                                                required lay-verify="number" onblur="groupQuantityIsTrue(this)" placeholder="请填写组合数量"/>
                                                    </div>
                                                </div>
                                                 <div class="layui-form-item">
                                                    <label class="layui-form-label">备注说明:</label>
                                                    <div class="layui-input-block">
-                                                        <input name=`+"applyRemark"+NewIdNumber+` placeholder="请填写相关原因及申请原因" value=""
+                                                        <input name=` + "applyRemark" + NewIdNumber + ` placeholder="请填写相关原因及申请原因" value=""
                                                               class="layui-input"/>
                                                    </div>
                                                </div>
@ -762,7 +777,7 @@
            var req = {};
            req.code = code;
            req.type = "out";
-            if(code !== ""){
+            if (code !== "") {
                $.ajax({
                    url: "/material/findMatrialByCode",
                    type: "get",
@ -843,7 +858,7 @@
            let gnameItem = gnameParent.childNodes[1].childNodes[1];
            let req = {};
            req.code = code;
-            if(code !== ""){
+            if (code !== "") {
                $.ajax({
                    url: "/group/findGroupByCode",
                    type: "post",
@ -856,7 +871,7 @@
                            layer.msg(d.statusInfo.detail, {
                                icon: 0,
                                time: 1500
-                            },function () {
+                            }, function () {
                                obj.value = '';
                                gidItem.value = '';
                                gnameItem.value = '';
@ -928,9 +943,9 @@
                },
                end: function () {
                    var mid = materialId.value;
-                    if(mid !== '') {
+                    if (mid !== '') {
                        $.ajax({
-                            url: "/material/findMatrialById?mid=" + mid+"&type=out",
+                            url: "/material/findMatrialById?mid=" + mid + "&type=out",
                            type: "get",
                            dataType: 'json',
                            contentType: "application/json;charset=utf-8",
@ -987,7 +1002,7 @@
        };
        // 用于实现点击搜索按钮（组合）
-        selectGroup = function(obj){
+        selectGroup = function (obj) {
            var parent = obj.parentNode.parentNode.parentNode.parentNode;
            var parentId = parent.id;
@ -1025,9 +1040,9 @@
                    content.css('height', '100%');
                    iframeChildren.css('height', '100%');
                },
-                end:function () {
+                end: function () {
                    let gid = gidItem.value;
-                    if(gid !== ''){
+                    if (gid !== '') {
                        let req = {};
                        req.gid = gid;
                        $.ajax({
@ -1042,7 +1057,7 @@
                                    layer.msg(d.statusInfo.detail, {
                                        icon: 0,
                                        time: 1500
-                                    },function () {
+                                    }, function () {
                                        obj.value = '';
                                        gidItem.value = '';
                                        gnameItem.value = '';
@ -1078,7 +1093,7 @@
        };
        // 用于实现组合名称搜索
-        selectGroupByName = function(obj){
+        selectGroupByName = function (obj) {
            let gname = obj.value;
            var parent = obj.parentNode.parentNode.parentNode.parentNode;
            // 获取对应元素
@ -1094,7 +1109,7 @@
            // gid
            let gidItem = gnameParent.childNodes[3];
-            if(gname !== ''){
+            if (gname !== '') {
                var req = {};
@ -1106,12 +1121,12 @@
                    data: JSON.stringify(req),
                    contentType: "application/json;charset=utf-8",
                    success: function (d) {
-                        if(d.count === -1){
+                        if (d.count === -1) {
                            // 如果当前组合名称的数量不止一个
                            layer.msg("请点击右侧搜索确定物品", {
                                icon: 0,
                                time: 1500
-                            },function () {
+                            }, function () {
                                obj.value = '';
                                gidItem.value = '';
                                gcodeItem.value = '';
@ -1122,12 +1137,12 @@
                                    }
                                }
                            });
-                        }else if(d.count === 0){
+                        } else if (d.count === 0) {
                            // 如果当前组合名称不存在
                            layer.msg("没有该组合，请确认输入是否正确", {
                                icon: 0,
                                time: 1500
-                            },function () {
+                            }, function () {
                                obj.value = '';
                                gidItem.value = '';
                                gcodeItem.value = '';
@ -1138,7 +1153,7 @@
                                    }
                                }
                            });
-                        }else{
+                        } else {
                            // 正常
                            let data = d.data;
                            let childNodes = parent.childNodes;
@ -1160,8 +1175,7 @@
                        }
                    }
                })
-            }
+            } else {
            else{
                gcodeItem.value = '';
                gidItem.value = '';
                let childNodes = parent.childNodes;
@ -1191,7 +1205,7 @@
            var barCodeItem = barCodeChildren.childNodes[3];
            var req = {};
            data = data.split(",")[0];
-            if(data !== ""){
+            if (data !== "") {
                req.mname = data;
                $.ajax({
                    url: "/material/findInventoryByCondition",
@ -1218,7 +1232,7 @@
                            unit.empty();
                            $("#unit" + idNumber).append(new Option(material.baseUnit, "-1"));
                            var unitList = material["splitInfoList"];
-                            if(unitList !== null && unitList != undefined){
+                            if (unitList !== null && unitList != undefined) {
                                for (let i = 0; i < unitList.length; i++) {
                                    $("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
                                }
@ -1266,10 +1280,9 @@
        scanBarCode = function (obj) {
            let wxScan = parent;
-            if(wxScan.wx === undefined){
+            if (wxScan.wx === undefined) {
                wxScan = wxScan.parent.wx;
-            }
+            } else {
            else{
                wxScan = wxScan.wx;
            }
            wxScan.scanQRCode({
@ -1342,16 +1355,15 @@
        scanCodeByOut = function (obj) {
            let wxScan = parent;
-            if(wxScan.wx === undefined){
+            if (wxScan.wx === undefined) {
                wxScan = wxScan.parent.wx;
-            }
+            } else {
            else{
                wxScan = wxScan.wx;
            }
            wxScan.scanQRCode({
                desc: 'scanQRCode desc',
                needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果，
-                scanType: ["qrCode","barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有
+                scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有
                success: function (res) {
                    // 回调
                    var result = res.resultStr;//当needResult为1时返回处理结果
@ -1446,7 +1458,7 @@
        MaterialQuantityIsTrue = function (obj) {
            var id = obj.id.split("quantity")[1];
            var mcode = $("#code" + id).val(); // 获取到当前输入的物料编码
-            var unit = $("#unit"+id).val();
+            var unit = $("#unit" + id).val();
            if (mcode === "" || mcode === undefined || mcode === null) {
                layer.msg("请输入物料的正确编码！", {icon: 0, time: 500}, function () {
                    $("#quantity" + id).val("")
@ -1459,6 +1471,7 @@
                    req.quantity = val;
                    req.unit = unit;
                    req.placeId = -1;
                    let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
                    $.ajax({
                        url: "/material/MaterialQuantityIsTrue",
                        type: "post",
@ -1470,8 +1483,10 @@
                            if (!flag) { // 如果当前数目不合适
                                layer.msg("当前单个仓库中物料数量不足", {icon: 0, time: 500}, function () {
                                    $("#quantity" + id).val("");
                                    layer.close(loading2);
                                });
-
+                            } else {
                                layer.close(loading2);
                            }
                        }
                    });
@ -1503,7 +1518,10 @@
                            var flag = res.data;
                            if (!flag) { // 如果当前数目不合适
-                                layer.msg("当前组合中"+res.statusInfo.message+"的库存数量不足", {icon: 0, time: 1000}, function () {
+                                layer.msg("当前组合中" + res.statusInfo.message + "的库存数量不足", {
                                    icon: 0,
                                    time: 1000
                                }, function () {
                                    $("#quantityForGroup" + id).val("");
                                });
--- a/src/main/resources/templates/pages/application/application-out_back.html
+++ b/src/main/resources/templates/pages/application/application-out_back.html
@ -143,6 +143,9 @@
    function selectMaterial() {
    }
    // 用于标志是否为第一次提交
    let flagForForm = false;
    layui.use(['form', 'step', 'layer', 'jquery'], function () {
        var $ = layui.$,
            form = layui.form,
@ -307,6 +310,8 @@
        form.on('submit(formStep)', function (data) {
            if(!flagForForm){
                flagForForm = true;
                data = data.field;
                var params = [];
                data.params = params;
@ -337,6 +342,8 @@
                        layer.close(this.layerIndex);
                    }
                });
            }
            return false;
        });
--- a/src/main/resources/templates/pages/application/application-out_scanQrCode.html
+++ b/src/main/resources/templates/pages/application/application-out_scanQrCode.html
@ -99,6 +99,8 @@
    function initForm(num,obj) {}
    // 用于卡片编号
    var NewIdNumber = 1;
    // 用于标志是否为第一次提交
    let flagForForm = false;
    layui.use(['form', 'step', 'layer', 'jquery'], function () {
        var $ = layui.$,
            form = layui.form,
@ -307,6 +309,8 @@
        // 提交
        form.on('submit(formStep)', function (data) {
            if(!flagForForm){
                flagForForm = true;
                data = data.field;
                data.params = params;
                $.ajax({
@ -336,6 +340,8 @@
                        layer.close(this.layerIndex);
                    }
                })
            }
            return false;
        });
--- a/src/main/resources/templates/pages/application/application-review.html
+++ b/src/main/resources/templates/pages/application/application-review.html
@ -184,7 +184,8 @@
    function selectThisMinRecord(obj){
    }
-
+    // 用于标志是否为第一次提交
    let flagForForm = false;
    layui.use(['form', 'step'], function () {
        var $ = layui.$,
            form = layui.form,
@ -235,6 +236,8 @@
            $("#check").show();
        }
        review = function (pass) {
            if(!flagForForm){
                flagForForm = true;
                let data = {};
                data.id = $("#id").text();
                if (pass == 1) {
@ -244,8 +247,12 @@
                }
                data.departmentheadMessage = $("#departmentheadMessageF").val();
                send(data);
            }
        };
        check = function (pass) {
            if(!flagForForm) {
                flagForForm = true;
                let data = {};
                data.id = $("#id").text();
                if (pass == 1) {
@ -255,6 +262,7 @@
                }
                data.depositoryManagerMessage = $("#depositoryManagerMessageF").val();
                send(data);
            }
        };
        function send(req) {
--- a/src/main/resources/templates/pages/application/application-transfer.html
+++ b/src/main/resources/templates/pages/application/application-transfer.html
@ -201,6 +201,8 @@
    let scanValue = {};
    // 用于卡片编号
    var NewIdNumber = 1;
    // 用于标志是否为第一次提交
    let flagForForm = false;
    layui.use([ 'form', 'step','layer','jquery'], function () {
        var $ = layui.$,
            form = layui.form,
@ -221,6 +223,8 @@
        form.on('submit(formStep)', function (data) {
            if(!flagForForm){
                flagForForm = true;
                data=data.field;
                data.params = params;
                if(data.mid === undefined){
@ -272,6 +276,8 @@
                        layer.close(this.layerIndex);
                    }
                });
            }
            return false;
        });
--- a/src/main/resources/templates/pages/application/application-transfer_back.html
+++ b/src/main/resources/templates/pages/application/application-transfer_back.html
@ -151,6 +151,8 @@
    var params = [];
    // 用于卡片编号
    var NewIdNumber = 1;
    // 用于标志是否为第一次提交
    let flagForForm = false;
    layui.use([ 'form', 'step','layer','jquery'], function () {
        var $ = layui.$,
            form = layui.form,
@ -171,6 +173,8 @@
        form.on('submit(formStep)', function (data) {
            if(!flagForForm){
                flagForForm = true;
                data=data.field;
                data.params = params;
                $.ajax({
@ -201,6 +205,8 @@
                    }
                })
                return false;
            }
        });
        form.on('submit(formStep2)', function (data) {
--- a/src/main/resources/templates/pages/application/application_in_multi.html
+++ b/src/main/resources/templates/pages/application/application_in_multi.html
@ -32,6 +32,8 @@
 <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
 <script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script>
 <script>
    // 用于标志是否为第一次提交
    let flagForForm = false;
    layui.use(['form', 'step'], function () {
        var $ = layui.$,
            form = layui.form,
@ -172,6 +174,8 @@
        form.on('submit(formStep)', function (data) {
            if(!flagForForm){
                flagForForm = true;
                data = data.field;
                data.type = 1;
                $.ajax({
@ -201,6 +205,8 @@
                        layer.close(this.layerIndex);
                    }
                })
            }
            return false;
        });
--- a/src/main/resources/templates/pages/application/form-step-look_group_review.html
+++ b/src/main/resources/templates/pages/application/form-step-look_group_review.html
@ -217,9 +217,13 @@
 <script>
    function review() {
    }
    // 用于标志是否为第一次提交
    let flagForForm = false;
    layui.use(['form', 'table', 'laydate'], function () {
        var $ = layui.jquery;
        review = function (pass) {
            if(!flagForForm){
                flagForForm = true;
                let data = {};
                data.id = $("#id").val();
                if (pass === 1) {
@ -229,6 +233,8 @@
                }
                data.approverMessage = $("#approverMessage").val();
                send(data);
            }
        };
        function send(req) {
--- a/src/main/resources/templates/pages/application/form-step-look_in_review.html
+++ b/src/main/resources/templates/pages/application/form-step-look_in_review.html
@ -126,11 +126,15 @@
 <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
 <script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script>
 <script>
    // 用于标志是否为第一次提交
    let flagForForm = false;
    function review() {
    }
    layui.use(['form', 'table', 'laydate'], function () {
        var $ = layui.jquery;
        review = function (pass) {
            if(!flagForForm){
                flagForForm = true;
                let data = {};
                data.id = $("#id").val();
                if (pass === 1) {
@ -140,6 +144,8 @@
                }
                data.approverMessage = $("#approverMessage").val();
                send(data);
            }
        };
        function send(req) {
--- a/src/main/resources/templates/pages/applicationForStorageCenter/application-out.html
+++ b/src/main/resources/templates/pages/applicationForStorageCenter/application-out.html
@ -404,6 +404,11 @@
    var params2 = [];
    // 用于卡片编号
    var NewIdNumber = 1;
    // 用于标志是否为第一次提交
    let flagForForm = false;
    let GroupFlagForForm = false;
    layui.use(['form', 'step', 'layer', 'jquery', 'element'], function () {
        var $ = layui.$,
            form = layui.form,
@ -438,6 +443,8 @@
        // 提交（物料出库）
        form.on('submit(formStep)', function (data) {
            if(!flagForForm){
                flagForForm = true;
                data = data.field;
                data.params = params;
                if (data.mid === undefined) {
@ -491,11 +498,15 @@
                        layer.close(this.layerIndex);
                    }
                });
            }
            return false;
        });
        // 提交（组合出库）
        form.on('submit(formStep2)', function (data) {
            if(!GroupFlagForForm){
                GroupFlagForForm = true;
                data = data.field;
                data.params = params2;
                if (data.gid === undefined) {
@ -520,7 +531,6 @@
                    }
                    data.params = remove(data.params, Number(keyNumber));
                }
                $.ajax({
                    url: "/group/applicationOutForGroup",
                    type: 'post',
@ -548,6 +558,8 @@
                        layer.close(this.layerIndex);
                    }
                });
            }
        });
        $('.pre').click(function () {
@ -629,11 +641,11 @@
                                                    <div class="layui-input-block">
                                                        <input type="text" placeholder="请选择部门" class="layui-input"
                                                               readonly
-                                                               id=`+"openCompanyAdminorg"+NewIdNumber+`
+                                                               id=` + "openCompanyAdminorg" + NewIdNumber + `
                                                               onclick="selectPost(this)"
                                                               />
-                                                        <input type="text" name=`+"adminorgId"+NewIdNumber+` class="layui-input"
+                                                        <input type="text" name=` + "adminorgId" + NewIdNumber + ` class="layui-input"
-                                                               id=`+"adminorgId"+NewIdNumber+`
+                                                               id=` + "adminorgId" + NewIdNumber + `
                                                               style="display: none"/>
                                                    </div>
                                                </div>
@ -642,11 +654,11 @@
                                                    <div class="layui-input-block">
                                                        <input type="text" placeholder="请选择施工单位" class="layui-input"
                                                               readonly
-                                                               id=`+"openConstructionUnit"+NewIdNumber+`
+                                                               id=` + "openConstructionUnit" + NewIdNumber + `
                                                               onclick="selectConstructionUnit(this)"
                                                               />
-                                                        <input type="text" name=`+"constructionUnitId"+NewIdNumber+` class="layui-input"
+                                                        <input type="text" name=` + "constructionUnitId" + NewIdNumber + ` class="layui-input"
-                                                               id=`+"constructionUnitId"+NewIdNumber+`
+                                                               id=` + "constructionUnitId" + NewIdNumber + `
                                                               style="display: none"/>
                                                    </div>
                                                </div>
@ -716,11 +728,11 @@
                                                    <div class="layui-input-block">
                                                        <input type="text" placeholder="请选择部门" class="layui-input"
                                                               readonly
-                                                               id=`+"openCompanyAdminorgForGroup"+NewIdNumber+`
+                                                               id=` + "openCompanyAdminorgForGroup" + NewIdNumber + `
                                                               onclick="selectPost(this)"
                                                               />
-                                                        <input type="text" name=`+"adminorgId"+NewIdNumber+` class="layui-input"
+                                                        <input type="text" name=` + "adminorgId" + NewIdNumber + ` class="layui-input"
-                                                               id=`+"adminorgIdForGroup"+NewIdNumber+`
+                                                               id=` + "adminorgIdForGroup" + NewIdNumber + `
                                                               style="display: none"/>
                                                    </div>
                                                </div>
@ -729,11 +741,11 @@
                                                    <div class="layui-input-block">
                                                        <input type="text" placeholder="请选择施工单位" class="layui-input"
                                                               readonly
-                                                               id=`+"openConstructionUnitForGroup"+NewIdNumber+`
+                                                               id=` + "openConstructionUnitForGroup" + NewIdNumber + `
                                                               onclick="selectConstructionUnit(this)"
                                                               />
-                                                        <input type="text" name=`+"constructionUnitId"+NewIdNumber+` class="layui-input"
+                                                        <input type="text" name=` + "constructionUnitId" + NewIdNumber + ` class="layui-input"
-                                                               id=`+"constructionUnitIdForGroup"+NewIdNumber+`
+                                                               id=` + "constructionUnitIdForGroup" + NewIdNumber + `
                                                               style="display: none"/>
                                                    </div>
                                                </div>
@ -1573,6 +1585,7 @@
                    req.quantity = val;
                    req.unit = unit;
                    req.placeId = -1;
                    let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
                    $.ajax({
                        url: "/material/MaterialQuantityIsTrue",
                        type: "post",
@ -1583,10 +1596,14 @@
                            var flag = res.data;
                            if (!flag) { // 如果当前数目不合适
                                layer.msg("当前单个仓库中物料数量不足", {icon: 0, time: 500}, function () {
                                        layer.close(loading2);
                                        $("#quantity" + id).val("");
-                                });
+                                    },
-
+                                );
                            }else{
                                layer.close(loading2)
                            }
                        }
                    });
                }
@ -1597,9 +1614,11 @@
        groupQuantityIsTrue = function (obj) {
            var id = obj.id.split("quantityForGroup")[1];
            var gid = $("#gid" + id).val(); // 获取到当前输入的物料编码
            let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
            if (gid === "" || gid === undefined || gid === null) {
                layer.msg("请输入正确的组合！", {icon: 0, time: 500}, function () {
-                    $("#quantityForGroup" + id).val("")
+                    $("#quantityForGroup" + id).val("");
                    layer.close(loading2)
                });
            } else {
                let val = $("#quantityForGroup" + id).val();
@ -1607,6 +1626,7 @@
                    var req = {};
                    req.gid = gid;
                    req.quantity = val;
                    $.ajax({
                        url: "/group/groupQuantityIsTrue",
                        type: "post",
@ -1622,8 +1642,11 @@
                                    time: 1000
                                }, function () {
                                    $("#quantityForGroup" + id).val("");
                                    layer.close(loading2)
                                });
                            }else{
                                layer.close(loading2);
                            }
                        }
                    });
--- a/src/main/resources/templates/pages/applicationForStorageCenter/application-out_back.html
+++ b/src/main/resources/templates/pages/applicationForStorageCenter/application-out_back.html
@ -178,6 +178,8 @@
    function selectPost() {
    }
    // 用于标志是否为第一次提交
    let flagForForm = false;
    layui.use(['form', 'step', 'layer', 'jquery'], function () {
        var $ = layui.$,
            form = layui.form,
@ -342,6 +344,8 @@
        form.on('submit(formStep)', function (data) {
            if(!flagForForm){
                flagForForm = true;
                data = data.field;
                var params = [];
                data.params = params;
@ -372,6 +376,8 @@
                        layer.close(this.layerIndex);
                    }
                });
            }
            return false;
        });
--- a/src/main/resources/templates/pages/applicationForStorageCenter/application-out_scanQrCode.html
+++ b/src/main/resources/templates/pages/applicationForStorageCenter/application-out_scanQrCode.html
@ -99,6 +99,8 @@
    function initForm(num,obj) {}
    // 用于卡片编号
    var NewIdNumber = 1;
    // 用于标志是否为第一次提交
    let flagForForm = false;
    layui.use(['form', 'step', 'layer', 'jquery'], function () {
        var $ = layui.$,
            form = layui.form,
@ -307,6 +309,8 @@
        // 提交
        form.on('submit(formStep)', function (data) {
            if(!flagForForm){
                flagForForm = true;
                data = data.field;
                data.params = params;
                $.ajax({
@ -336,6 +340,7 @@
                        layer.close(this.layerIndex);
                    }
                })
            }
            return false;
        });
--- a/src/main/resources/templates/pages/company/company_add.html
+++ b/src/main/resources/templates/pages/company/company_add.html
@ -63,12 +63,16 @@
 <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
 <script>
    var data;
    // 用于标志是否为第一次提交
    let flagForForm = false;
    layui.use(['form', 'layer'], function () {
        var $ = layui.jquery,
            form = layui.form,
            layer = layui.layer;
        form.on('submit(formStep)', function (data) {
            if(!flagForForm){
                flagForForm = true;
                $.ajax({
                    url:"/company/company_add",
                    type:'post',
@ -97,6 +101,7 @@
                        })
                    }
                })
            }
            return false;
        });
--- a/src/main/resources/templates/pages/constructionunit/constructionunit_add.html
+++ b/src/main/resources/templates/pages/constructionunit/constructionunit_add.html
@ -63,11 +63,15 @@
 <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
 <script>
    var data;
    // 用于标志是否为第一次提交
    let flagForForm = false;
    layui.use(['form', 'layer'], function () {
        var $ = layui.jquery,
            form = layui.form,
            layer = layui.layer;
        form.on('submit(formStep)', function (data) {
            if(!flagForForm){
                flagForForm = true;
                $.ajax({
                    url: "/company/constructionUnitAdd",
                    type: 'post',
@ -100,6 +104,7 @@
                        })
                    }
                });
            }
            return false;
        });
--- a/src/main/resources/templates/pages/constructionunit/constructionunit_edit.html
+++ b/src/main/resources/templates/pages/constructionunit/constructionunit_edit.html
@ -67,11 +67,15 @@
 <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
 <script>
    var data;
    // 用于标志是否为第一次提交
    let flagForForm = false;
    layui.use(['form', 'layer'], function () {
        var $ = layui.jquery,
            form = layui.form,
            layer = layui.layer;
        form.on('submit(formStep)', function (data) {
            if(!flagForForm){
                flagForForm = true;
                $.ajax({
                    url: "/company/ConstructionUnitEdit",
                    type: 'post',
@ -97,6 +101,7 @@
                        }
                    }
                });
            }
            return false;
        });
--- a/src/main/resources/templates/pages/group/applicationInForGroup.html
+++ b/src/main/resources/templates/pages/group/applicationInForGroup.html
@ -124,6 +124,8 @@
    // 用于编码查询(用于组合)
    function selectCodeForGroup(obj) {
    }
    // 用于标志是否为第一次提交
    let flagForForm = false;
    // 用于暂存卡片个数(组合)
    var params2 = [];
@ -151,6 +153,8 @@
        // 用于提交操作(组合)
        form.on('submit(formStep2)', function (data) {
            if(!flagForForm){
                flagForForm = true;
                data = data.field;
                data.type = 1;
                data.params = params2;
@ -181,6 +185,8 @@
                        layer.close(this.layerIndex);
                    }
                });
            }
        });
        $('.pre').click(function () {
--- a/src/main/resources/templates/pages/group/applicationOutForGroup.html
+++ b/src/main/resources/templates/pages/group/applicationOutForGroup.html
@ -50,7 +50,7 @@
 <div class="layuimini-container">
    <div class="layuimini-main">
        <div class="layui-fluid">
-            <input id="gidList" type="text" style="display:none;" th:value="${gidList}" >
+            <input id="gidList" type="text" style="display:none;" th:value="${gidList}">
            <div class="layui-carousel" id="stepForm2" lay-filter="stepForm2" style="margin: 0 auto;">
                <div carousel-item style="overflow: inherit">
                    <div>
@ -91,13 +91,16 @@
 <script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script>
 <script>
    // 用于重新构造页面中的组合明细
-    function CoverpageForGroupInfo(){}
+    function CoverpageForGroupInfo() {
    }
    // 用于重新构造页面
-    function CoverPageForGroup(){}
+    function CoverPageForGroup() {
    }
    // 用于实现卡片添加
-    function addItemForGroup(){}
+    function addItemForGroup() {
    }
    // 用于判断当前组合数量是否合适
    function groupQuantityIsTrue() {
@ -121,6 +124,9 @@
    function selectCodeForGroup(obj) {
    }
    // 用于标志是否为第一次提交
    let flagForForm = false;
    // 用于暂存卡片个数(组合)
    var params2 = [];
    // 用于卡片编号
@ -147,6 +153,8 @@
        // 提交（组合出库）
        form.on('submit(formStep2)', function (data) {
            if (!flagForForm) {
                flagForForm = true;
                data = data.field;
                data.params = params2;
                if (data.gid === undefined) {
@ -171,7 +179,6 @@
                    }
                    data.params = remove(data.params, Number(keyNumber));
                }
                $.ajax({
                    url: "/group/applicationOutForGroup",
                    type: 'post',
@ -199,6 +206,8 @@
                        layer.close(this.layerIndex);
                    }
                });
            }
        });
        $('.pre').click(function () {
@ -223,16 +232,16 @@
                    dataType: 'json',
                    contentType: "application/json;charset=utf-8",
                    success: function (d) {
-                        if(d.status === 666){
+                        if (d.status === 666) {
-                            layer.msg(d.statusInfo.detail,{
+                            layer.msg(d.statusInfo.detail, {
-                                icon:0,
+                                icon: 0,
-                                time:1000,
+                                time: 1000,
-                            },function () {
+                            }, function () {
                                // 关闭当前页
                                var index = parent.layer.getFrameIndex(window.name);
                                parent.layer.close(index);
                            })
-                        }else {
+                        } else {
                            var data = d.data;
                            CoverPageForGroup(i, data[0]);
                            form.render();
@ -316,10 +325,10 @@
        };
        // 用于重新构造页面
-        CoverPageForGroup =function (num,obj) {
+        CoverPageForGroup = function (num, obj) {
-            if(num === 0){
+            if (num === 0) {
                num = '';
-            }else{
+            } else {
                params2.push(num);
            }
            var materialItem = `<div class="layui-card-body" id=` + "cardItemForGroup" + num + `>
@ -332,13 +341,13 @@
                                                        <div class="inputdiv">
                                                            <input type="text" placeholder="请选择组合" class="layui-input" value="${obj.gname}"
                                                                   style="border-style: none"
-                                                                   id=`+"openGroupList"+num+` onblur="selectGroupByName(this)"
+                                                                   id=` + "openGroupList" + num + ` onblur="selectGroupByName(this)"
                                                                   lay-verify="required"/>
                                                            <i class="layui-icon layui-icon-search"
                                                               style="display: inline"
-                                                               id=`+"selectGroup"+num+` onclick="selectGroup(this)"></i>
+                                                               id=` + "selectGroup" + num + ` onclick="selectGroup(this)"></i>
                                                        </div>
-                                                        <input type="text" value="${obj.gid}" name=`+"gid"+num+` class="layui-input" id=`+"gid"+num+`
+                                                        <input type="text" value="${obj.gid}" name=` + "gid" + num + ` class="layui-input" id=` + "gid" + num + `
                                                               style="display: none" lay-verify="required"/>
                                                    </div>
                                                </div>
@ -358,14 +367,14 @@
                                                <div class="layui-form-item">
                                                    <label class="layui-form-label">组合数量:</label>
                                                    <div class="layui-input-block">
-                                                        <input type="number" name=`+"quantity"+num+` class="layui-input" id=`+"quantityForGroup"+num+`
+                                                        <input type="number" name=` + "quantity" + num + ` class="layui-input" id=` + "quantityForGroup" + num + `
                                                                required lay-verify="number" onblur="groupQuantityIsTrue(this)" placeholder="请填写组合数量"/>
                                                    </div>
                                                </div>
                                                 <div class="layui-form-item">
                                                    <label class="layui-form-label">备注说明:</label>
                                                    <div class="layui-input-block">
-                                                        <input name=`+"applyRemark"+num+` placeholder="请填写相关原因及申请原因" value=""
+                                                        <input name=` + "applyRemark" + num + ` placeholder="请填写相关原因及申请原因" value=""
                                                               class="layui-input"/>
                                                    </div>
                                                </div>
@ -379,14 +388,14 @@
            // 获取当前高度
            var height = parseInt(($("#stepForm2").css('height')).split("px")[0]);
            $("#stepForm2").css("height", height + 289 + 'px');
-            if(num === ''){
+            if (num === '') {
                $("#btn_sub2").before(materialItem);
-            }else{
+            } else {
                num = num - 1;
-                if(num === 0){
+                if (num === 0) {
                    num = '';
                }
-                $("#"+"cardItemForGroup"+num).after(materialItem);
+                $("#" + "cardItemForGroup" + num).after(materialItem);
            }
        };
@ -405,13 +414,13 @@
                                                        <div class="inputdiv">
                                                            <input type="text" placeholder="请选择组合" class="layui-input"
                                                                   style="border-style: none"
-                                                                   id=`+"openGroupList"+NewIdNumber+` onblur="selectGroupByName(this)"
+                                                                   id=` + "openGroupList" + NewIdNumber + ` onblur="selectGroupByName(this)"
                                                                   lay-verify="required"/>
                                                            <i class="layui-icon layui-icon-search"
                                                               style="display: inline"
-                                                               id=`+"selectGroup"+NewIdNumber+` onclick="selectGroup(this)"></i>
+                                                               id=` + "selectGroup" + NewIdNumber + ` onclick="selectGroup(this)"></i>
                                                        </div>
-                                                        <input type="text" name=`+"gid"+NewIdNumber+` class="layui-input" id=`+"gid"+NewIdNumber+`
+                                                        <input type="text" name=` + "gid" + NewIdNumber + ` class="layui-input" id=` + "gid" + NewIdNumber + `
                                                               style="display: none" lay-verify="required"/>
                                                    </div>
                                                </div>
@ -431,14 +440,14 @@
                                                <div class="layui-form-item">
                                                    <label class="layui-form-label">组合数量:</label>
                                                    <div class="layui-input-block">
-                                                        <input type="number" name=`+"quantity"+NewIdNumber+` class="layui-input" id=`+"quantityForGroup"+NewIdNumber+`
+                                                        <input type="number" name=` + "quantity" + NewIdNumber + ` class="layui-input" id=` + "quantityForGroup" + NewIdNumber + `
                                                                required lay-verify="number" onblur="groupQuantityIsTrue(this)" placeholder="请填写组合数量"/>
                                                    </div>
                                                </div>
                                                 <div class="layui-form-item">
                                                    <label class="layui-form-label">备注说明:</label>
                                                    <div class="layui-input-block">
-                                                        <input name=`+"applyRemark"+NewIdNumber+` placeholder="请填写相关原因及申请原因" value=""
+                                                        <input name=` + "applyRemark" + NewIdNumber + ` placeholder="请填写相关原因及申请原因" value=""
                                                               class="layui-input"/>
                                                    </div>
                                                </div>
@ -484,7 +493,7 @@
                        layer.msg(d.statusInfo.detail, {
                            icon: 0,
                            time: 1500
-                        },function () {
+                        }, function () {
                            obj.value = '';
                            gidItem.value = '';
                            gnameItem.value = '';
@ -518,7 +527,7 @@
        };
        // 用于实现点击搜索按钮（组合）
-        selectGroup = function(obj){
+        selectGroup = function (obj) {
            var parent = obj.parentNode.parentNode.parentNode.parentNode;
            var parentId = parent.id;
@ -556,9 +565,9 @@
                    content.css('height', '100%');
                    iframeChildren.css('height', '100%');
                },
-                end:function () {
+                end: function () {
                    let gid = gidItem.value;
-                    if(gid !== ''){
+                    if (gid !== '') {
                        let req = {};
                        req.gid = gid;
                        $.ajax({
@ -573,7 +582,7 @@
                                    layer.msg(d.statusInfo.detail, {
                                        icon: 0,
                                        time: 1500
-                                    },function () {
+                                    }, function () {
                                        obj.value = '';
                                        gidItem.value = '';
                                        gnameItem.value = '';
@ -609,7 +618,7 @@
        };
        // 用于实现组合名称搜索
-        selectGroupByName = function(obj){
+        selectGroupByName = function (obj) {
            let gname = obj.value;
            var parent = obj.parentNode.parentNode.parentNode.parentNode;
            // 获取对应元素
@ -625,7 +634,7 @@
            // gid
            let gidItem = gnameParent.childNodes[3];
-            if(gname !== ''){
+            if (gname !== '') {
                var req = {};
@ -637,12 +646,12 @@
                    data: JSON.stringify(req),
                    contentType: "application/json;charset=utf-8",
                    success: function (d) {
-                        if(d.count === -1){
+                        if (d.count === -1) {
                            // 如果当前组合名称的数量不止一个
                            layer.msg("请点击右侧搜索确定物品", {
                                icon: 0,
                                time: 1500
-                            },function () {
+                            }, function () {
                                obj.value = '';
                                gidItem.value = '';
                                gcodeItem.value = '';
@ -653,12 +662,12 @@
                                    }
                                }
                            });
-                        }else if(d.count === 0){
+                        } else if (d.count === 0) {
                            // 如果当前组合名称不存在
                            layer.msg("没有该组合，请确认输入是否正确", {
                                icon: 0,
                                time: 1500
-                            },function () {
+                            }, function () {
                                obj.value = '';
                                gidItem.value = '';
                                gcodeItem.value = '';
@ -669,7 +678,7 @@
                                    }
                                }
                            });
-                        }else{
+                        } else {
                            // 正常
                            let data = d.data;
                            let childNodes = parent.childNodes;
@ -691,8 +700,7 @@
                        }
                    }
                })
-            }
+            } else {
            else{
                gcodeItem.value = '';
                gidItem.value = '';
                let childNodes = parent.childNodes;
@ -729,7 +737,10 @@
                            var flag = res.data;
                            if (!flag) { // 如果当前数目不合适
-                                layer.msg("当前组合中"+res.statusInfo.message+"的库存数量不足", {icon: 0, time: 500}, function () {
+                                layer.msg("当前组合中" + res.statusInfo.message + "的库存数量不足", {
                                    icon: 0,
                                    time: 500
                                }, function () {
                                    $("#quantityForGroup" + id).val("");
                                });
--- a/src/main/resources/templates/pages/group/group-add.html
+++ b/src/main/resources/templates/pages/group/group-add.html
@ -61,6 +61,8 @@
 <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
 <script>
    // 用于标志是否为第一次提交
    let flagForForm = false;
    layui.use(['form', 'layer', 'dropdown', 'tree', 'laydate'], function () {
        var $ = layui.jquery,
            form = layui.form,
--- a/src/main/resources/templates/pages/group/group-add_back.html
+++ b/src/main/resources/templates/pages/group/group-add_back.html
@ -57,20 +57,23 @@
                                    <label class="layui-form-label" style="height: 40px;">组合名称:</label>
                                    <div class="layui-input-block">
                                        <div class="inputdiv">
-                                            <input type="text" placeholder="请输入组合名称" class="layui-input" id="gname" th:value="${gid == -1?'':group?.getGname()}"
+                                            <input type="text" placeholder="请输入组合名称" class="layui-input" id="gname"
                                                   th:value="${gid == -1?'':group?.getGname()}"
                                                   th:attr="readonly=${gid != -1}" name="gname" lay-verify="required">
                                        </div>
                                    </div>
                                </div>
                                <label class="layui-form-label">备注说明:</label>
                                <div class="layui-input-block">
-                                    <input name="applyRemark" placeholder="请填写相关原因及申请原因" th:value="${gid == -1?'':group?.getRemark()}" th:attr="readonly=${gid != -1}"
+                                    <input name="applyRemark" placeholder="请填写相关原因及申请原因"
                                           th:value="${gid == -1?'':group?.getRemark()}" th:attr="readonly=${gid != -1}"
                                           class="layui-input"/>
                                </div>
                            </div>
                            <div class="layui-card" id="cardParent" style="box-shadow:none">
-                                <fieldset style="color: rgb(107, 107, 107); border-style: solid; border-color: rgb(230, 230, 230);border-image: initial;" >
+                                <fieldset
                                        style="color: rgb(107, 107, 107); border-style: solid; border-color: rgb(230, 230, 230);border-image: initial;">
                                    <legend>组合明细</legend>
                                    <div class="layui-card-body" id="cardItem">
                                        <hr>
@ -164,7 +167,7 @@
                                    创建成功
                                </div>
                                <div style="text-align: center;margin-top: 50px;">
-                                    <button class="layui-btn next" >再创建一次</button>
+                                    <button class="layui-btn next">再创建一次</button>
                                </div>
                            </div>
@ -219,6 +222,9 @@
    // 用于卡片编号
    var NewIdNumber = 1;
    // 用于标志是否为第一次提交
    let flagForForm = false;
    layui.use(['form', 'layer', 'tree', 'step'], function () {
        var $ = layui.jquery,
            form = layui.form,
@ -240,10 +246,12 @@
        // 提交（组合出库）
        form.on('submit(formStep)', function (data) {
            if (!flagForForm) {
                flagForForm = true;
                data = data.field;
                data.len = NewIdNumber;
                data.params = params;
-            if("-1" !== gid){
+                if ("-1" !== gid) {
                    data.gid = gid;
                }
                $.ajax({
@ -273,6 +281,8 @@
                        layer.close(this.layerIndex);
                    }
                })
            }
            return false;
        });
        $('.pre').click(function () {
@ -301,7 +311,7 @@
                                                               id="openSonByMaterial" lay-verify="required" onblur="selectMaterialByName(this)"/>
                                            <i  class="layui-icon layui-icon-search" style="display: inline" id="selectMaterial" onclick="selectMaterial(this)"></i>
                                            </div>
-                                            <input type="text" name=` + "mid" + NewIdNumber + ` class="layui-input" id=`+"mid"+NewIdNumber+`
+                                            <input type="text" name=` + "mid" + NewIdNumber + ` class="layui-input" id=` + "mid" + NewIdNumber + `
                                                               style="display: none" lay-verify="required" />
                                        </div>
                                    </div>
@ -386,11 +396,11 @@
        // 扫描物料条码
        scanBarCode = function (obj) {
            let wxScan = parent;
-            if(wxScan.wx === undefined && wxScan.parent.wx !== undefined){
+            if (wxScan.wx === undefined && wxScan.parent.wx !== undefined) {
                wxScan = wxScan.parent.wx;
-            }else if(wxScan.parent.wx === undefined){
+            } else if (wxScan.parent.wx === undefined) {
                wxScan = wxScan.parent.parent.wx
-            }else{
+            } else {
                wxScan = wxScan.wx;
            }
            wxScan.scanQRCode({
@ -463,17 +473,17 @@
        // 用于扫码功能
        scanCodeForMaterial = function (obj) {
            let wxScan = parent;
-            if(wxScan.wx === undefined && wxScan.parent.wx !== undefined){
+            if (wxScan.wx === undefined && wxScan.parent.wx !== undefined) {
                wxScan = wxScan.parent.wx;
-            }else if(wxScan.parent.wx === undefined){
+            } else if (wxScan.parent.wx === undefined) {
                wxScan = wxScan.parent.parent.wx
-            }else{
+            } else {
                wxScan = wxScan.wx;
            }
            wxScan.scanQRCode({
                desc: 'scanQRCode desc',
                needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果，
-                scanType: ["qrCode","barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有
+                scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有
                success: function (res) {
                    // 回调
                    var result = res.resultStr;//当needResult为1时返回处理结果
@ -667,7 +677,7 @@
            var req = {};
            req.code = code;
            req.type = "in";
-            if(code !== "") {
+            if (code !== "") {
                $.ajax({
                    url: "/material/findMatrialByCode",
                    type: "get",
@ -747,7 +757,7 @@
            var barCodeItem = barCodeChildren.childNodes[3];
            var req = {};
            data = data.split(",")[0];
-            if(data !== ""){
+            if (data !== "") {
                req.mname = data;
                $.ajax({
                    url: "/material/findMaterialByCondition",
--- a/src/main/resources/templates/pages/group/group_edit.html
+++ b/src/main/resources/templates/pages/group/group_edit.html
@ -85,6 +85,7 @@
    // 用于创建二维码
    function createQrCode(obj){}
    layui.use(['form', 'table'], function () {
        var $ = layui.jquery,
            form = layui.form,
--- a/src/main/resources/templates/pages/group/group_material_edit.html
+++ b/src/main/resources/templates/pages/group/group_material_edit.html
@ -23,7 +23,8 @@
    <div class="layui-form-item">
        <label class="layui-form-label">物料编号</label>
        <div class="layui-input-inline">
-            <input id="mcode" type="text" th:value="${record.getMcode()}" name="mcode" required lay-verify="required" autocomplete="off"
+            <input id="mcode" type="text" th:value="${record.getMcode()}" name="mcode" required lay-verify="required"
                   autocomplete="off"
                   class="layui-input" onblur="selectMaterialByCode(this)" readonly="readonly">
        </div>
    </div>
@ -79,7 +80,8 @@
        <div class="layui-input-inline">
            <select id="unit" name="unit">
                <option value="-1" th:text="${record.getMunit()}" th:selected="${record.getUnit() == '-1'}"></option>
-                <option th:each="splitInfo,iterStar:${splitList}" th:selected="${splitInfo.getNewUnit() == record.getUnit()}"
+                <option th:each="splitInfo,iterStar:${splitList}"
                        th:selected="${splitInfo.getNewUnit() == record.getUnit()}"
                        th:value="${splitInfo?.getNewUnit()}"
                        th:text="${splitInfo?.getNewUnit()}">
                </option>
@ -98,13 +100,19 @@
    // 用于通过编码查询物料
    function selectMaterialByCode(obj) {
    }
    // 用于点击搜索按钮
    function selectMaterial(obj) {
    }
    // 用于标志是否为第一次提交
    let flagForForm = false;
    layui.use(['form'], function () {
        var form = layui.form, $ = layui.$;
        let id = $("#id").val();
        form.on('submit(formDemo)', function (data) {
            if (!flagForForm) {
                flagForForm = true;
                data = data.field;
                data.id = id;
                $.ajax({
@ -133,6 +141,8 @@
                        }
                    }
                });
            }
            return false;
        });
--- a/src/main/resources/templates/pages/material/material-add.html
+++ b/src/main/resources/templates/pages/material/material-add.html
@ -164,6 +164,8 @@
  var data;
  function  selectBarCode(){}
  function scanBarCode(){}
  // 用于标志是否为第一次提交
  let flagForForm = false;
  layui.use(['form', 'layer','dropdown','tree','laydate'], function () {
    var $ = layui.jquery,
            form = layui.form,
@ -244,6 +246,8 @@
    };
    form.on('submit(formStep)', function (data) {
      if(!flagForForm){
        flagForForm = true;
        $.ajax({
          url: "/material/material_add",
          type: 'post',
@ -278,6 +282,8 @@
            })
          }
        });
      }
      return false;
    });
--- a/src/main/resources/templates/pages/material/material-add_back.html
+++ b/src/main/resources/templates/pages/material/material-add_back.html
@ -86,6 +86,8 @@
 <script>
  var data;
  // 用于标志是否为第一次提交
  let flagForForm = false;
  layui.use(['form', 'layer','dropdown','tree'], function () {
    var $ = layui.jquery,
            form = layui.form,
@ -138,6 +140,8 @@
    form.on('submit(formStep)', function (data) {
      if(!flagForForm){
        flagForForm = true;
        $.ajax({
          url: "/material/material_add",
          type: 'post',
@ -172,6 +176,8 @@
            })
          }
        })
      }
      return false;
    });
--- a/src/main/resources/templates/pages/material/material-view.html
+++ b/src/main/resources/templates/pages/material/material-view.html
@ -179,6 +179,8 @@
    function print_code() {
    }
    // 用于标志是否为第一次提交
    let flagForForm = false;
    var barCode = [];
    var flag = false;
    layui.use(['form', 'laydate'], function () {
@ -205,6 +207,8 @@
        });
        //提交
        form.on('submit(formDemo)', function (data) {
            if(!flagForForm){
                flagForForm = true;
                data = data.field;
                if (flag) {
                    data.barCodeList = barCode;
@ -235,6 +239,8 @@
                        }
                    }
                });
            }
            return false;
        });
--- a/src/main/resources/templates/pages/materialtype/materialType_add.html
+++ b/src/main/resources/templates/pages/materialtype/materialType_add.html
@ -66,6 +66,8 @@
    <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
    <script>
        var data;
        // 用于标志是否为第一次提交
        let flagForForm = false;
        layui.use(['form', 'layer','tree'], function () {
            var $ = layui.jquery,
                form = layui.form,
@ -94,7 +96,10 @@
                });
            });
            form.on('submit(formStep)', function (data) {
                if(!flagForForm){
                    flagForForm = true;
                    $.ajax({
                        url:"/materialType/materialType_add",
                        type:'post',
@ -125,6 +130,8 @@
                            })
                        }
                    })
                }
                return false;
            });
--- a/src/main/resources/templates/pages/materialtype/materialType_edit.html
+++ b/src/main/resources/templates/pages/materialtype/materialType_edit.html
@ -12,36 +12,42 @@
 </head>
 <body>
-<form class="layui-form layui-form-pane" action="" >
+<form class="layui-form layui-form-pane" action="">
    <div class="layui-form-item" style="display:none;">
        <label class="layui-form-label">类型编号</label>
        <div class="layui-input-block">
-      <input type="text" th:value="${record.getOldId()}" name="id" required  lay-verify="required" autocomplete="off" class="layui-input" readonly="readonly">
+            <input type="text" th:value="${record.getOldId()}" name="id" required lay-verify="required"
                   autocomplete="off" class="layui-input" readonly="readonly">
        </div>
    </div>
    <div class="layui-form-item">
        <label class="layui-form-label">类型名称</label>
        <div class="layui-input-block">
-      <input type="text" th:value="${record.getTname()}" name="tname" required  lay-verify="required" autocomplete="off" class="layui-input">
+            <input type="text" th:value="${record.getTname()}" name="tname" required lay-verify="required"
                   autocomplete="off" class="layui-input">
        </div>
    </div>
    <div class="layui-form-item">
        <label class="layui-form-label">类型介绍</label>
        <div class="layui-input-block">
-      <input type="text" th:value="${record.getIntroduce()}" name="introduce" required  lay-verify="required" autocomplete="off" class="layui-input">
+            <input type="text" th:value="${record.getIntroduce()}" name="introduce" required lay-verify="required"
                   autocomplete="off" class="layui-input">
        </div>
    </div>
    <div class="layui-form-item">
        <label class="layui-form-label">父级类型:</label>
        <div class="layui-input-block">
-      <input type="text"  placeholder="请选择物料类型"  class="layui-input" id="openSonByMateralType" readonly   th:value="${parentType == null ?'': parentType.getTname()}"                                           />
+            <input type="text" placeholder="请选择物料类型" class="layui-input" id="openSonByMateralType" readonly
-      <input type="text" id="materialTypeId"  placeholder="请选择物料类型" name="parentId" class="layui-input"  th:value="${parentType == null ?'' :parentType.getOldId()}" style="display: none" />
+                   th:value="${parentType == null ?'': parentType.getTname()}"/>
            <input type="text" id="materialTypeId" placeholder="请选择物料类型" name="parentId" class="layui-input"
                   th:value="${parentType == null ?'' :parentType.getOldId()}" style="display: none"/>
        </div>
    </div>
    <div class="layui-form-item" style="display: none">
        <label class="layui-form-label">状态</label>
        <div class="layui-input-block">
-      <input type="checkbox" name="state" lay-skin="switch" lay-text="启用|禁用" th:checked="${record.getState() == 1}">
+            <input type="checkbox" name="state" lay-skin="switch" lay-text="启用|禁用"
                   th:checked="${record.getState() == 1}">
        </div>
    </div>
    <div class="layui-form-item">
@ -53,11 +59,13 @@
 </form>
 <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
 <script>
-  layui.use('form', function(){
+    // 用于标志是否为第一次提交
    let flagForForm = false;
    layui.use('form', function () {
        var form = layui.form, $ = layui.$;
-    $('#openSonByMateralType').on('click', function(){
+        $('#openSonByMateralType').on('click', function () {
            layer.open({
                type: 2,
                title: '弹窗内容',
@ -65,21 +73,23 @@
                maxmin: true,
                shadeClose: true, //点击遮罩关闭层
                area: ['70%', '70%'],
-        move : '.layui-layer-title',
+                move: '.layui-layer-title',
-        fixed:false,
+                fixed: false,
                content: '/selectType',
-        success: function(layero, index){
+                success: function (layero, index) {
                    var children = layero.children();
                    var content = $(children[1]);
                    var iframeChildren = $(content.children());
-          content.css('height','100%');
+                    content.css('height', '100%');
-          iframeChildren.css('height','100%');
+                    iframeChildren.css('height', '100%');
                }
            });
        });
        //提交
-    form.on('submit(formDemo)', function(data){
+        form.on('submit(formDemo)', function (data) {
            if (!flagForForm) {
                flagForForm = true;
                data = data.field;
                $.ajax({
                    url: "/materialType/materialType_edit",
@ -99,14 +109,16 @@
                            layer.msg("物料类型信息修改成功", {
                                icon: 6,//成功的表情
                                time: 500 //1秒关闭（如果不配置，默认是3秒）
-            },function(){
+                            }, function () {
-              window.location='/materialType_view';
+                                window.location = '/materialType_view';
                                var index = parent.layer.getFrameIndex(window.name);
                                parent.layer.close(index);//关闭当前页
                            })
                        }
                    }
                })
            }
            return false;
        });
    });
--- a/src/main/resources/templates/pages/notice/notice-add.html
+++ b/src/main/resources/templates/pages/notice/notice-add.html
@ -84,6 +84,8 @@
    function selectDepartment(){
    }
    // 用于标志是否为第一次提交
    let flagForForm = false;
    layui.use(['form', 'layer', 'laydate',  'inputTag'], function () {
        var form = layui.form,
            layer = layui.layer,
@ -98,6 +100,8 @@
        //监听提交
        form.on('submit(noticeBtn)', function (data) {
            if(!flagForForm){
                flagForForm = true;
                $.ajax({
                    url: "/notice/notice",
                    data: JSON.stringify(data.field),
@ -117,6 +121,8 @@
                        }
                    }
                });
            }
            return false;
        });
--- a/src/main/resources/templates/pages/notice/notice-edit.html
+++ b/src/main/resources/templates/pages/notice/notice-edit.html
@ -86,6 +86,8 @@
    function selectDepartment(){
    }
    // 用于标志是否为第一次提交
    let flagForForm = false;
    layui.use(['form', 'layer', 'laydate',  'inputTag'], function () {
        var form = layui.form,
            layer = layui.layer,
@ -100,6 +102,8 @@
        //监听提交
        form.on('submit(noticeBtn)', function (data) {
            if(!flagForForm){
                flagForForm = true;
                $.ajax({
                    url: "/notice/noticeEdit",
                    data: JSON.stringify(data.field),
@ -119,6 +123,8 @@
                        }
                    }
                });
            }
            return false;
        });
--- a/src/main/resources/templates/pages/place/place_add.html
+++ b/src/main/resources/templates/pages/place/place_add.html
@ -125,7 +125,8 @@
 <script>
    var data;
-
+    // 用于标志是否为第一次提交
    let flagForForm = false;
    layui.use(['form', 'layer', 'dropdown', 'tree'], function () {
        var $ = layui.jquery,
            form = layui.form,
@ -133,6 +134,8 @@
        var depositoryId = $("#depositoryID").val();
        form.on('submit(formStep)', function (data) {
            if(!flagForForm){
                flagForForm = true;
                var req = data.field;
                req.type = "one";
                $.ajax({
@ -164,6 +167,8 @@
                        form.val("form1", {})
                    }
                });
            }
            return false;
        });
        form.on('submit(formStep1)', function (data) {
--- a/src/main/resources/templates/pages/place/place_edit.html
+++ b/src/main/resources/templates/pages/place/place_edit.html
@ -103,6 +103,8 @@
    function print_code() {
    }
    // 用于标志是否为第一次提交
    let flagForForm = false;
    layui.use(['form', 'layer','dropdown','tree'], function () {
        var $ = layui.jquery,
            form = layui.form,
@ -110,6 +112,8 @@
        var depositoryId = $("#depositoryId").val();
        form.on('submit(formStep)', function (data) {
            if(!flagForForm){
                flagForForm = true;
                var req = data.field;
                req.type = "one";
                $.ajax({
@ -149,6 +153,8 @@
                        })
                    }
                });
            }
            return false;
        });
--- a/src/main/resources/templates/pages/place/place_editForTray.html
+++ b/src/main/resources/templates/pages/place/place_editForTray.html
@ -82,6 +82,8 @@
    function print_code() {
    }
    // 用于标志是否为第一次提交
    let flagForForm = false;
    layui.use(['form', 'layer','dropdown','tree'], function () {
        var $ = layui.jquery,
            form = layui.form,
@ -89,6 +91,8 @@
        var depositoryId = $("#depositoryId").val();
        form.on('submit(formStep)', function (data) {
            if(!flagForForm){
                flagForForm = true;
                var req = data.field;
                req.type = "one";
                $.ajax({
@ -128,6 +132,8 @@
                        })
                    }
                });
            }
            return false;
        });
--- a/src/main/resources/templates/pages/post/postRole_add.html
+++ b/src/main/resources/templates/pages/post/postRole_add.html
@ -45,6 +45,8 @@
 </div>
 <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
 <script>
    // 用于标志是否为第一次提交
    let flagForForm = false;
    layui.use(['form','layer','laydate'], function () {
        var form = layui.form,
            layer = layui.layer,
@ -78,6 +80,8 @@
        let organization = $("#organization").val();
        //监听提交
        form.on('submit(saveBtn)', function (data) {
            if(!flagForForm){
                flagForForm = true;
                data=data.field;
                //去除对应的仓库id
                if (data.depositoryId===""){
@ -113,6 +117,8 @@
                        }
                    }
                })
            }
            return false;
        });
--- a/src/main/resources/templates/pages/post/postRole_edit.html
+++ b/src/main/resources/templates/pages/post/postRole_edit.html
@ -60,6 +60,8 @@
 </div>
 <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
 <script>
    // 用于标志是否为第一次提交
    let flagForForm = false;
    layui.use(['form','layer','laydate'], function () {
        var form = layui.form,
            layer = layui.layer,
@ -93,6 +95,8 @@
        var organization = document.getElementById("organization").value
        //监听提交
        form.on('submit(saveBtn)', function (data) {
            if(!flagForForm){
                flagForForm = true;
                data=data.field;
                //去除对应的仓库id
                if (data.depositoryId===""){
@ -123,6 +127,8 @@
                        }
                    }
                })
            }
            return false;
        });
--- a/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html
+++ b/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html
@ -53,11 +53,14 @@
    var qrCode = null;
    var barCode = null;
    // 用于标志是否为第一次提交
    let flagForForm = false;
    layui.$(function () {
        let wxScan = parent.parent.parent;
-        if(wxScan.wx !== undefined){
+        if (wxScan.wx !== undefined) {
            wxScan = wxScan.wx;
-        }else{
+        } else {
            wxScan = wxScan.parent.wx;
        }
        wxScan.scanQRCode({
@ -89,6 +92,8 @@
                btn: ["确定", "取消"]
            },
            function () { // 如果确定出库
                if (!flagForForm) {
                    flagForForm = true;
                    layui.$.ajax({
                        url: "/depositoryRecord/isCheckOut",
                        type: "post",
@ -111,10 +116,10 @@
                                    });
                            } else {
                                // 如果出库失败
-                            layer.msg(res.statusInfo.detail + ",请重试",{
+                                layer.msg(res.statusInfo.detail + ",请重试", {
-                                icon:0,
+                                    icon: 0,
-                                time:1000
+                                    time: 1000
-                            },function () {
+                                }, function () {
                                    var index = parent.layer.getFrameIndex(window.name);
                                    parent.layer.close(index);
                                });
@ -122,6 +127,7 @@
                        }
                    })
                }
            },
            function () {
                // 如果取消
@ -169,8 +175,7 @@
                        var index = parent.layer.getFrameIndex(window.name);
                        parent.layer.close(index);
                    })
-                }
+                } else if (flag === 1) {
                else if (flag === 1) {
                    // 如果是物料
                    material = data.material;
                    if (mcode !== material.code && Number(mcode) !== material.code && mcode !== material.code.toString()) {
@ -197,8 +202,7 @@
                                parent.layer.close(index);
                            })
-                    }
+                    } else {
                    else {
                        if (depository !== null) { // 如果已经扫描仓库
                            if (depositoryId !== depository.id && Number(depositoryId) !== depository.id && depositoryId !== depository.id.toString()) {
                                // 如果扫描的仓库不是订单要求的仓库
@ -285,8 +289,7 @@
                        }
                    }
-                }
+                } else if (flag === 2) {
                else if (flag === 2) {
                    // 如果扫描的为库位
                    place = data.place;// 将扫描结果保存到vue中
                    if (material == null) {
@ -369,8 +372,7 @@
                    }
-                }
+                } else if (flag === 3) {
                else if (flag === 3) {
                    // 如果是仓库
                    depository = data.depository;// 将扫描结果保存到vue中
--- a/src/main/resources/templates/pages/split/split_add.html
+++ b/src/main/resources/templates/pages/split/split_add.html
@ -185,11 +185,16 @@
    function scanCode(obj) {
    }
    // 用于标志是否为第一次提交
    let flagForForm = false;
    layui.use(['form', 'layer'], function () {
        var $ = layui.jquery,
            form = layui.form,
            layer = layui.layer;
        form.on('submit(formStep)', function (data) {
            if(!flagForForm){
                flagForForm = true;
                data = data.field;
                $.ajax({
                    url: "/split/splitAdd",
@ -219,6 +224,8 @@
                    }
                })
            }
        });
        // 通过名称查询物料
--- a/src/main/resources/templates/pages/split/split_edit.html
+++ b/src/main/resources/templates/pages/split/split_edit.html
@ -155,12 +155,16 @@
 <script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script>
 <script>
    // 用于标志是否为第一次提交
    let flagForForm = false;
    layui.use(['form', 'layer'], function () {
        var $ = layui.jquery,
            form = layui.form,
            layer = layui.layer;
        let id = $("#id").val();
        form.on('submit(formStep)', function (data) {
            if(!flagForForm){
                flagForForm = true;
                data = data.field;
                data.state = 1;
                $.ajax({
@ -191,6 +195,8 @@
                    }
                })
            }
        });
--- a/src/main/resources/templates/pages/stockTaking/stockTaking.html
+++ b/src/main/resources/templates/pages/stockTaking/stockTaking.html
@ -444,6 +444,10 @@
    let departmentManagerIdForMaterial;
    // 用于存储当前选择的负责人
    let departmentManagerIdForLocation;
    // 用于标志是否为第一次提交
    let flagForForm = false;
    let flagForForm1 = false;
    layui.use(['form', 'step', 'flow', 'table', 'inputTag'], function () {
        var $ = layui.$,
            form = layui.form,
@ -481,6 +485,8 @@
        // 用于提交盘点情况
        form.on('submit(formStep)', function (data) {
            if(!flagForForm){
                flagForForm = true;
                data = data.field;
                data.depositoryId = depositoryId;
                data.placeId = placeId;
@ -511,6 +517,8 @@
                        layer.close(this.layerIndex);
                    }
                });
            }
        });
@ -521,6 +529,8 @@
        // 用于提交盘点情况
        form.on('submit(formStep3)', function (data) {
            if(!flagForForm1){
                flagForForm1 = true;
                data = data.field;
                data.params = params;
                data.departmentManagerId = departmentManagerIdForLocation;
@ -547,6 +557,8 @@
                        layer.close(this.layerIndex);
                    }
                });
            }
        });
        $('.pre').click(function () {
--- a/src/main/resources/templates/pages/stockTaking/stockTakingComplete.html
+++ b/src/main/resources/templates/pages/stockTaking/stockTakingComplete.html
@ -247,6 +247,8 @@
    function complete(data) {
    }
    // 用于标志是否为第一次提交
    let flagForForm = false;
    layui.use(['form', 'step', 'element'], function () {
        var $ = layui.$,
            step = layui.step,
@ -270,6 +272,8 @@
        // 用于获取审核结果与审核的单号
        complete = function (pass) {
            if(!flagForForm){
                flagForForm = true;
                let data = {};
                data.mainId = $("#mainId").val();
                data.state = pass;
@ -297,6 +301,8 @@
                        }
                    },
                })
            }
        };
--- a/src/main/resources/templates/pages/stockTaking/stockTakingForTable.html
+++ b/src/main/resources/templates/pages/stockTaking/stockTakingForTable.html
@ -177,6 +177,9 @@
    }
    // 用于标志是否为第一次提交
    let flagForForm = false;
    // 用于存储当前选择的盘点位置
    let depositoryId;
@ -373,6 +376,8 @@
        // 用于提交盘点情况
        form.on('submit(formStep)', function (data) {
            if(!flagForForm){
                flagForForm = true;
                data = data.field;
                data.depositoryId = depositoryId;
                data.placeId = placeId;
@ -399,6 +404,8 @@
                        layer.close(this.layerIndex);
                    }
                });
            }
        });
--- a/src/main/resources/templates/pages/stockTaking/stockTakingReview.html
+++ b/src/main/resources/templates/pages/stockTaking/stockTakingReview.html
@ -265,6 +265,8 @@
    function review(data) {
    }
    // 用于标志是否为第一次提交
    let flagForForm = false;
    layui.use(['form', 'step', 'element'], function () {
        var $ = layui.$,
@ -289,6 +291,8 @@
        // 用于获取审核结果与审核的单号
        review = function (pass) {
            if(!flagForForm){
                flagForForm = true;
                let data = {};
                data.mainId = $("#mainId").val();
                data.auditOpinion = $("#auditOpinion").val();
@ -354,6 +358,8 @@
                        }
                    },
                })
            }
        };
--- a/src/main/resources/templates/pages/stockTaking/stockTaking_back.html
+++ b/src/main/resources/templates/pages/stockTaking/stockTaking_back.html
@ -331,6 +331,9 @@
    let barCodeList = {};
    let needToUpdate = {};
    // 用于标志是否为第一次提交
    let flagForForm = false;
    layui.use(['form', 'step', 'flow', 'laydate', 'inputTag'], function () {
        var $ = layui.$,
            form = layui.form,
@ -445,6 +448,8 @@
        // 用于提交盘点情况
        form.on('submit(formStep)', function (data) {
            if(!flagForForm){
                flagForForm = true;
                data = data.field;
                data.params = params;
                data.needToUpdate = needToUpdate;
@ -471,6 +476,8 @@
                        layer.close(this.layerIndex);
                    }
                });
            }
        });
--- a/src/main/resources/templates/pages/stockTaking/stockTransfer.html
+++ b/src/main/resources/templates/pages/stockTaking/stockTransfer.html
@ -49,7 +49,8 @@
                                <div class="layui-form-item">
                                    <label class="layui-form-label">转移位置:</label>
                                    <div class="layui-input-block">
-                                        <input type="text" id="minIds" name="minIds" th:value="${minIds}" style="display:none;">
+                                        <input type="text" id="minIds" name="minIds" th:value="${minIds}"
                                               style="display:none;">
                                        <input type="text" name="mainId" id="mainId" th:value="${mainRecord.getId()}"
                                               style="display:none;">
                                        <input type="text" class="layui-input"
@ -205,6 +206,9 @@
    }
    // 用于标志是否为第一次提交
    let flagForForm = false;
    // 用于暂存卡片个数
    let params = [];
@ -244,12 +248,12 @@
                move: '.layui-layer-title',
                fixed: false,
                content: '/selectDepository?type=2',
-                success: function(layero, index){
+                success: function (layero, index) {
                    var children = layero.children();
                    var content = $(children[1]);
                    var iframeChildren = $(content.children());
-                    content.css('height','100%');
+                    content.css('height', '100%');
-                    iframeChildren.css('height','100%');
+                    iframeChildren.css('height', '100%');
                },
                end: function () {
                    var nowDepositoryId = $("#depositoryId").val();
@ -273,6 +277,8 @@
        // 用于提交盘点转移情况
        form.on('submit(formStep)', function (data) {
            if (!flagForForm) {
                flagForForm = true;
                if (depositoryId !== null && depositoryId !== undefined && depositoryId !== "") {
                    data = data.field;
                    $.ajax({
@ -304,6 +310,8 @@
                        time: 500
                    })
                }
            }
        });
        //删除数组中指定元素
@ -331,12 +339,12 @@
                move: '.layui-layer-title',
                fixed: false,
                content: '/scanCodeByTaking',
-                success: function(layero, index){
+                success: function (layero, index) {
                    var children = layero.children();
                    var content = $(children[1]);
                    var iframeChildren = $(content.children());
-                    content.css('height','100%');
+                    content.css('height', '100%');
-                    iframeChildren.css('height','100%');
+                    iframeChildren.css('height', '100%');
                },
                end: function () {
                    var nowDepositoryId = $("#depositoryId").val();
@ -386,8 +394,8 @@
                            layer.msg("转移数量不能大于当前盘点数量：" + inventory);
                            obj.value = oldNumber;
                        }
-                        if(number > placeInventory){
+                        if (number > placeInventory) {
-                            layer.msg("当前转移库位只能存放：" + placeInventory+"的物料");
+                            layer.msg("当前转移库位只能存放：" + placeInventory + "的物料");
                            obj.value = oldNumber;
                        }
                    }
--- a/src/main/resources/templates/pages/warehouse/depository_add.html
+++ b/src/main/resources/templates/pages/warehouse/depository_add.html
@ -99,6 +99,8 @@
 </div>
    <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
    <script>
        // 用于标志是否为第一次提交
        let flagForForm = false;
        var data;
        layui.use(['form', 'layer'], function () {
            var $ = layui.jquery,
@ -150,7 +152,8 @@
            });
            form.on('submit(formStep)', function (data) {
-
+                if(!flagForForm){
                    flagForForm = true;
                    $.ajax({
                        url: "/repository/depository",
                        type: 'post',
@ -183,6 +186,8 @@
                            })
                        }
                    })
                }
                return false;
            });
--- a/src/main/resources/templates/pages/warehouse/warehouse_view.html
+++ b/src/main/resources/templates/pages/warehouse/warehouse_view.html
@ -132,7 +132,8 @@
    function downloadCodeImg() {
    }
-
+    // 用于标志是否为第一次提交
    let flagForForm = false;
    layui.use('form', function () {
        var form = layui.form, $ = layui.$;
@ -161,6 +162,7 @@
        //提交
        form.on('submit(formDemo)', function (data) {
            if(!flagForForm){
                data = data.field;
                $.ajax({
                    url: "/repository/depository_edit",
@ -188,6 +190,8 @@
                        }
                    }
                });
            }
            return false;
        });