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

zjj

2023-12-27 d814bde01eb91d1544b718463cd31317726bbf6b

 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>
            <!-- 日期范围 -->
@@ -72,7 +77,7 @@
<script>
    function getCol() {
        let cols = [
            {type: 'checkbox', fixed: 'left'}
            {type: 'checkbox',width: 50, fixed: 'left'}
        ];
        cols.push.apply(cols, matCols);
        cols.push(