Merge remote-tracking branch 'origin/stasrs' into stasrs

mrzhssss

2022-12-14 2b7ac35fd8abeaec8dcda8ed731ed8007e9e08d4

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

@@ -30,7 +30,12 @@
        <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="mat_no" placeholder="商品编号" autocomplete="off">
                    <input class="layui-input" type="text" name="matnr" placeholder="商品编号" autocomplete="off">
                </div>
            </div>
            <div class="layui-inline">
                <div class="layui-input-inline">
                    <input class="layui-input" type="text" name="maktx" placeholder="商品名称" autocomplete="off">
                </div>
            </div>
            <!-- 日期范围 -->
@@ -52,7 +57,7 @@
    </fieldset>

    <div class="layui-form">
        <table class="layui-hide" id="matCode" lay-filter="matCode"></table>
        <table class="layui-hide" id="mat" lay-filter="mat"></table>
    </div>
</div>

@@ -94,9 +99,9 @@

        // 物料查询数据表
        matQueryTable = table.render({
            elem: '#matCode',
            elem: '#mat',
            headers: {token: localStorage.getItem('token')},
            url: baseUrl + '/matCode/list/auth',
            url: baseUrl + '/mat/list/auth',
            page: true,
            limit: 7,
            limits: [7, 10, 30,50,100],
@@ -127,7 +132,7 @@
        });

        // 监听头工具栏事件
        table.on('toolbar(matCode)', function (obj) {
        table.on('toolbar(mat)', function (obj) {
            let checkStatus = table.checkStatus(obj.config.id);
            let data = checkStatus.data;
            switch(obj.event) {