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

mrzhssss

2022-05-27 c6ab1a516d8398de65512fcd380d89e46ec8e430

 src/main/webapp/views/order/order.html

@@ -55,6 +55,17 @@
                        </div>
                    </div>
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <select name="settle">
                                <option value="">选择状态</option>
                                <option value="1">待处理</option>
                                <option value="2">作业中</option>
                                <option value="4">已完成</option>
                                <option value="6">上报完成</option>
                            </select>
                        </div>
                    </div>
                    <div class="layui-inline">
                        <button class="layui-btn icon-btn" lay-filter="tbSearch" lay-submit>
                            <i class="layui-icon">&#xe615;</i>搜索
                        </button>