1.新增分区查询 2.任务档新增分区字段

zwl

2 天以前 fb57e7836338304b16c09fec4fb5c68fb688c39e

 src/main/webapp/views/ioWorks/locDetlQuery.html

@@ -47,7 +47,7 @@
    <div id="search-box" class="layui-form layui-card-header">
        <div class="layui-inline">
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="loc_no" placeholder="货位" autocomplete="off">
                <input class="layui-input" type="text" name="loc_no" placeholder="货位/别名" autocomplete="off">
            </div>
        </div>
        <div class="layui-inline">
@@ -61,11 +61,11 @@
            </div>
        </div>
        <!-- 日期范围 -->
        <div class="layui-inline" style="width: 300px">
            <div class="layui-input-inline">
                <input class="layui-input layui-laydate-range" name="update_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
            </div>
        </div>
<!--        <div class="layui-inline" style="width: 300px">-->
<!--            <div class="layui-input-inline">-->
<!--                <input class="layui-input layui-laydate-range" name="update_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">-->
<!--            </div>-->
<!--        </div>-->
        <!-- 待添加 -->
        <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
            <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">搜索</button>
@@ -83,6 +83,9 @@
<div class="layui-form">
    <table class="layui-hide" id="stockOut" lay-filter="stockOut"></table>
</div>
<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="viewPhoto">查看照片</a>
</script>

<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>
@@ -97,11 +100,13 @@
    function getCol() {
        var cols = [
            {type: 'checkbox'}
            ,{field: 'locNo', align: 'center',title: '货位'}
            ,{field: 'locNo', align: 'center',title: '货位', hide: true}
            ,{field: 'locNo$', align: 'center',title: '货位'}
        ];
        cols.push.apply(cols, detlCols);
        cols.push({field: 'updateBy$', align: 'center',title: '修改人员', hide: true}
            ,{field: 'updateTime$', align: 'center',title: '修改时间'})
            ,{field: 'updateTime$', align: 'center',title: '修改时间'}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:110})
        return cols;
    }

@@ -115,7 +120,7 @@
        locDetlTableIns = table.render({
            elem: '#stockOut',
            headers: {token: localStorage.getItem('token')},
            url: baseUrl+'/locDetl/list/auth',
            url: baseUrl+'/manLocDetl/list',
            page: true,
            limit: 10,
            even: true,
@@ -162,6 +167,27 @@
            }
        });

        table.on('tool(stockOut)', function(obj){
            if (obj.event !== 'viewPhoto') {
                return;
            }
            $.ajax({
                url: baseUrl + "/photo/loc/auth",
                headers: {'token': localStorage.getItem('token')},
                data: {locNo: obj.data.locNo},
                method: 'GET',
                success: function (res) {
                    if (res.code === 200) {
                        showPhotoViewer(layer, res.data);
                    } else if (res.code === 403) {
                        top.location.href = baseUrl + "/";
                    } else {
                        layer.msg(res.msg);
                    }
                }
            });
        });

        // 搜索栏搜索事件
        form.on('submit(search)', function (data) {
            pageCurr = 1;