parent: 946e956b | 补丁 | 提交 | ignore whitespace
#
luxiaotao1123
2020-06-12 0347b8c45a632564b4fac11abab8db25032aef11 
#
7个文件已修改
151 ■■■■■ 已修改文件
src/main/webapp/static/js/locMast/locMast.js 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/pakStore/pakStore.js 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/locMast/locMast.html 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/pakStore/emptyIn.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/pakStore/emptyOut.html 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/pakStore/matQuery.html 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/pakStore/pakStore.html 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 src/main/webapp/static/js/locMast/locMast.js


@@ -202,24 +202,35 @@


                });


                break;


            case "init":


                layer.prompt({title: '请输入口令，并重置库位', formType: 1,   shadeClose: true}, function(pass, idx){


                    if (pass === "123456") {


                        layer.open({


                            type: 1,


                            title: '初始化库位',


                            maxmin: true,


                            shadeClose: true,


                            content: $("#resetLocDiv"),


                            success: function (layero, index) {


                layer.open({


                    type: 1,


                    title: '初始化库位',


                    maxmin: true,


                    area: ["400px"],


                    shadeClose: true,


                    content: $("#resetLocDiv"),


                    success: function (layero, index) {




                            }


                        })


                    } else {


                        layer.msg("口令错误");


                    }


                    layer.close(idx);


                    doSwitch(0, pass); // 停止wcs系统


                });


                })


                // layer.prompt({title: '请输入口令，并重置库位', formType: 1,   shadeClose: true}, function(pass, idx){


                //     if (pass === "123456") {


                //         layer.open({


                //             type: 1,


                //             title: '初始化库位',


                //             maxmin: true,


                //             shadeClose: true,


                //             content: $("#resetLocDiv"),


                //             success: function (layero, index) {


                //


                //             }


                //         })


                //     } else {


                //         layer.msg("口令错误");


                //     }


                //     layer.close(idx);


                //     doSwitch(0, pass); // 停止wcs系统


                // });


                break;


        }


    });




 src/main/webapp/static/js/pakStore/pakStore.js


@@ -9,7 +9,25 @@


    var layDate = layui.laydate;


    var form = layui.form;






    // 获取可用入库站点


    $.ajax({


        url: baseUrl+"/available/put/site",


        headers: {'token': localStorage.getItem('token')},


        method: 'POST',


        success: function (res) {


            if (res.code === 200){


                var tpl = $("#putSiteSelectTemplate").html();


                var template = Handlebars.compile(tpl);


                var html = template(res);


                $('#putSiteSelect').append(html);


                form.render('select');


            } else if (res.code === 403){


                top.location.href = baseUrl+"/";


            }else {


                layer.msg(res.msg)


            }


        }


    })




    tableIns = table.render({


        elem: '#chooseData',




 src/main/webapp/views/locMast/locMast.html


@@ -13,6 +13,10 @@


        #btn-init {


            display: none;


        }


        .layui-layer-page .layui-layer-content {


            position: relative;


            overflow: visible !important;


        }


    </style>


</head>


<body>


@@ -84,8 +88,63 @@


<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>




<!-- 重置库位弹窗 -->


<div id="resetLocDiv">


    <h1>Hello </h1>


<div id="resetLocDiv" style="margin: 20px 0 20px 30px">


    <div class="layui-form layui-form-pane">


        <!-- 排 -->


        <div class="layui-form-item">


            <div class="layui-inline">


                <label class="layui-form-label">起止排</label>


                <div class="layui-input-inline" style="width: 100px;">


                    <input type="text" name="startRow" autocomplete="off" class="layui-input" lay-verify="number">


                </div>


                <div class="layui-form-mid">-</div>


                <div class="layui-input-inline" style="width: 100px;">


                    <input type="text" name="endRow" autocomplete="off" class="layui-input" lay-verify="number">


                </div>


            </div>


        </div>


        <!-- 列 -->


        <div class="layui-form-item">


            <div class="layui-inline">


                <label class="layui-form-label">起止列</label>


                <div class="layui-input-inline" style="width: 100px;">


                    <input type="text" name="startBay" autocomplete="off" class="layui-input" lay-verify="number">


                </div>


                <div class="layui-form-mid">-</div>


                <div class="layui-input-inline" style="width: 100px;">


                    <input type="text" name="endbay" autocomplete="off" class="layui-input" lay-verify="number">


                </div>


            </div>


        </div>


        <!-- 层 -->


        <div class="layui-form-item">


            <div class="layui-inline">


                <label class="layui-form-label">起止层</label>


                <div class="layui-input-inline" style="width: 100px;">


                    <input type="text" name="startLev" autocomplete="off" class="layui-input" lay-verify="number">


                </div>


                <div class="layui-form-mid">-</div>


                <div class="layui-input-inline" style="width: 100px;">


                    <input type="text" name="endLev" autocomplete="off" class="layui-input" lay-verify="number">


                </div>


            </div>


        </div>


        <!-- 库位类型 -->


        <div class="layui-form-item">


            <label class="layui-form-label">库位类型</label>


            <div class="layui-input-inline">


                <select name="locType">


                    <option selected="" style="color: #1E9FFF">请选择类型（选填）</option>


                    <option value="1">低库位</option>


                    <option value="2">高库位</option>


                </select>


            </div>


        </div>


        <!-- 按钮 -->


        <div style="text-align: center; margin-top: 20px">


            <button class="layui-btn layui-btn-radius layui-btn-normal" id="initDo" lay-submit lay-filter="initDo">确定</button>


        </div>


    </div>


</div>


</body>


</html>




 src/main/webapp/views/pakStore/emptyIn.html


@@ -17,13 +17,11 @@










<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>


<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>


<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>


<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>


<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>


<script type="text/javascript" src="../../static/js/pakStore/pakStore.js" charset="utf-8"></script>


</body>


</html>






 src/main/webapp/views/pakStore/emptyOut.html


@@ -19,7 +19,6 @@


<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>


<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>


<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>


<script type="text/javascript" src="../../static/js/pakStore/pakStore.js" charset="utf-8"></script>


</body>


</html>






 src/main/webapp/views/pakStore/matQuery.html


@@ -55,7 +55,6 @@


<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>


<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>


<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>


<script type="text/javascript" src="../../static/js/pakStore/pakStore.js" charset="utf-8"></script>




</body>


<script>




 src/main/webapp/views/pakStore/pakStore.html


@@ -111,27 +111,6 @@


        <option value="{{this}}">{{this}}</option>


    {{/each}}


</script>


<script>


    $(function(){


        $.ajax({


            url: baseUrl+"/available/put/site",


            headers: {'token': localStorage.getItem('token')},


            method: 'POST',


            success: function (res) {


                if (res.code === 200){


                    var tpl = $("#putSiteSelectTemplate").html();


                    var template = Handlebars.compile(tpl);


                    var html = template(res);


                    $('#putSiteSelect').append(html);


                } else if (res.code === 403){


                    top.location.href = baseUrl+"/";


                }else {


                    layer.msg(res.msg)


                }


            }


        })


    })


</script>


</body>


</html>