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

admin

2021-08-27 38d7ec7ea772a6f48a0409f2fcbbcde05364ec7b

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

@@ -51,12 +51,12 @@
        </div>
        <div class="layui-inline">
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="matnr" 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">
                <input class="layui-input" type="text" name="maktx" placeholder="产品描述" autocomplete="off">
            </div>
        </div>
        <!-- 日期范围 -->
@@ -99,7 +99,9 @@
            ,{field: 'locNo$', align: 'center',title: '库位号'}
        ];
        cols.push.apply(cols, detlCols);
        cols.push({field: 'modiUser$', align: 'center',title: '修改人员', hide: true}
        cols.push(
            {field: 'memo', align: 'center',title: '备注'}
            ,{field: 'modiUser$', align: 'center',title: '修改人员', hide: true}
            ,{field: 'modiTime$', align: 'center',title: '修改时间'})
        return cols;
    }