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

whycq

2023-10-11 8f0d649d83de955cfcbf38ebdbfc90a70c6ac547

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

@@ -73,6 +73,16 @@
        </div>
        <div class="layui-inline">
            <div class="layui-input-inline">
                <select name="locType2">
                    <option value="">选择上架区域</option>
                    <option value="1">单品区</option>
                    <option value="2">高频混放区</option>
                    <option value="3">低频混放区</option>
                </select>
            </div>
        </div>
        <div class="layui-inline">
            <div class="layui-input-inline">
                <select id="ownerSelect" name="owner">
                    <option value="">请选择客户信息</option>
                </select>
@@ -87,7 +97,7 @@
        <!-- 待添加 -->
        <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>
            <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">重置</button>
<!--            <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">重置</button>-->
        </div>
    </div>
</fieldset>