diff --git a/ghy-admin/src/main/resources/templates/order/master.html b/ghy-admin/src/main/resources/templates/order/master.html
index 81fd0b9a..99d81f23 100644
--- a/ghy-admin/src/main/resources/templates/order/master.html
+++ b/ghy-admin/src/main/resources/templates/order/master.html
@@ -4,11 +4,52 @@
     <th:block th:include="include :: header('订单列表')"/>
     <th:block th:include="include :: layout-latest-css"/>
     <th:block th:include="include :: ztree-css"/>
+    <th:block th:include="include :: datetimepicker-css" />
 
     <style>
         #orderSearchBtnGroup {
             margin-top: 10px;
         }
+
+        #allOrServing {
+            width: 70px;
+            padding: 6px 9px;
+            height: 33px;
+            font-size: 14px;
+            border: 1px solid #e5e6e7;
+            background: #fff none;
+            border-radius: 4px;
+            vertical-align: middle;
+        }
+
+        .flex-board {
+            display: flex;
+            flex-wrap: wrap;
+            justify-content: flex-start;
+            align-items: center;
+        }
+
+        .flex-board-no-wrap {
+            display: flex;
+            justify-content: flex-start;
+            align-items: center;
+        }
+
+        .cx-select-input {
+            width: 100px;
+        }
+
+        .normal-select-input {
+            width: 100px;
+        }
+
+        .normal-input {
+            width: 100px;
+        }
+
+        .long-input {
+            width: 400px;
+        }
     </style>
 </head>
 <body class="gray-bg">
@@ -17,29 +58,207 @@
     <div class="container-div">
         <div class="row">
             <div class="col-sm-12 search-collapse">
-                <form id="order-form">
+                <form id="order-form" class="m">
                     <input type="hidden" id="deptId" name="deptId">
                     <input type="hidden" id="parentId" name="parentId">
                     <input type="hidden" id="orderStatus" name="orderStatus"/>
-                    <div class="select-list">
-                        <ul>
-                            <li>
-                                订单号：<input type="text" name="code"/>
-                            </li>
-<!--                            <li>-->
-<!--                                订单状态：<select name="orderStatus" th:with="type=${@dict.getType('order_status')}">-->
-<!--                                <option value="">所有</option>-->
-<!--                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}"-->
-<!--                                        th:value="${dict.dictValue}"></option>-->
-<!--                            </select>-->
-<!--                            </li>-->
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
-                                        class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
-                                        class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
+                    <div>
+                        <select id="allOrServing">
+                            <option value="">全部</option>
+                            <option value="">在途</option>
+                        </select>
+                        <a class="btn btn-default btn-outline">
+                            待付款
+                        </a>
+                        <a class="btn btn-default btn-outline" onclick="searchByOrderStatus(1)">
+                            未约/未排
+                        </a>
+                        <a class="btn btn-default btn-outline" onclick="searchByOrderStatus(2)">
+                            待上门
+                        </a>
+                        <a class="btn btn-default btn-outline" onclick="searchByOrderStatus(3)">
+                            进行中
+                        </a>
+                        <a class="btn btn-default btn-outline" onclick="searchByOrderStatus(4)">
+                            确认审核
+                        </a>
+                        <a class="btn btn-default btn-outline" onclick="searchByOrderStatus(5)">
+                            完成
+                        </a>
+                        <a class="btn btn-default btn-outline" onclick="searchByOrderStatus(6)">
+                            关闭
+                        </a>
+                        <a class="btn btn-default btn-outline" onclick="">
+                            今日待上门
+                        </a>
+                        <a class="btn btn-default btn-outline" onclick="">
+                            明日待上门
+                        </a>
+                        <a class="btn btn-default btn-outline" onclick="">
+                            售后
+                        </a>
+                        <a class="btn btn-default btn-outline" onclick="">
+                            急报中
+                        </a>
+                        <a class="btn btn-default btn-outline" onclick="">
+                            退单
+                        </a>
+                        <a class="btn btn-default btn-outline" onclick="">
+                            拒绝退单
+                        </a>
+                    </div>
+                    <div class="flex-board">
+                        <div class="flex-board m-t">
+                            区域筛选：
+                            <div id="areaCxSelect" class="flex-board-no-wrap">
+                                <select class="province form-control cx-select-input m-r" name="province" id="province" data-first-title="选择省" onchange="selectRegion('province', 'city')"></select>
+                                <select class="city form-control cx-select-input m-r" name="city" id="city" data-first-title="选择市" onchange="selectRegion('city', 'district')"></select>
+                                <select class="district form-control cx-select-input m-r" name="district" id="district" data-first-title="选择区" onchange="selectRegion('district', 'street')"></select>
+                                <select class="street form-control cx-select-input m-r" name="streetId" id="streetId" data-first-title="选择街道" ></select>
+                            </div>
+                        </div>
+                        <div class="flex-board m-t">
+                            创建时间：
+                            <div class="input-group date">
+                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                                <input type="text" class="form-control date-input" placeholder="开始日期">
+                            </div>
+                            至
+                            <div class="input-group date m-r">
+                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                                <input type="text" class="form-control date-input" placeholder="结束日期">
+                            </div>
+                        </div>
+                        <div class="flex-board m-t">
+                            服务时间：
+                            <div class="input-group date">
+                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                                <input type="text" class="form-control date-input" placeholder="开始日期">
+                            </div>
+                            至
+                            <div class="input-group date m-r">
+                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                                <input type="text" class="form-control date-input" placeholder="结束日期">
+                            </div>
+                        </div>
+                        <div class="flex-board m-t">
+                            完成时间：
+                            <div class="input-group date">
+                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                                <input type="text" class="form-control date-input" placeholder="开始日期">
+                            </div>
+                            至
+                            <div class="input-group date m-r">
+                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                                <input type="text" class="form-control date-input" placeholder="结束日期">
+                            </div>
+                        </div>
+                        <div class="flex-board m-t">
+                            类别筛选：
+                            <div id="categoryCxSelect" class="flex-board-no-wrap">
+                                <select class="category1 form-control cx-select-input m-r" name="category1" id="category1" data-first-title="选择一类"></select>
+                                <select class="category2 form-control cx-select-input m-r" name="category2" id="category2" data-first-title="选择二类"></select>
+                                <select class="category3 form-control cx-select-input m-r" name="category3" id="category3" data-first-title="选择三类"></select>
+                                <select class="category4 form-control cx-select-input m-r" name="category4" id="category4" data-first-title="选择四类" ></select>
+                            </div>
+                        </div>
+                        <div class="flex-board-no-wrap m-t">
+                            <label class="form-control-label">后台人员：</label>
+                            <input type="text" class="form-control normal-input m-r">
+                        </div>
+                        <div class="flex-board-no-wrap m-t">
+                            <label class="form-control-label">商家名称：</label>
+                            <input type="text" class="form-control normal-input m-r">
+                        </div>
+                        <div class="flex-board-no-wrap m-t">
+                            <label class="form-control-label">商家电话：</label>
+                            <input type="text" class="form-control normal-input m-r">
+                        </div>
+                        <div class="flex-board-no-wrap m-t">
+                            <label class="form-control-label">接单师傅名称：</label>
+                            <input type="text" class="form-control normal-input m-r">
+                        </div>
+                        <div class="flex-board-no-wrap m-t">
+                            <label class="form-control-label">接单师傅电话：</label>
+                            <input type="text" class="form-control normal-input m-r">
+                        </div>
+                        <div class="flex-board-no-wrap m-t">
+                            <label class="form-control-label">师傅类型：</label>
+                            <select class="form-control normal-select-input m-r">
+                                <option value="">全部</option>
+                                <option value="">大师傅</option>
+                                <option value="">小师傅</option>
+                            </select>
+                            <input type="text" class="form-control normal-input m-r" placeholder="师傅姓名电话">
+                        </div>
+                        <div class="flex-board-no-wrap m-t">
+                            <label class="form-control-label">订单模式：</label>
+                            <select id="orderMode" class="form-control normal-select-input m-r" onchange="changeOrderMode(this.options[this.options.selectedIndex].value)">
+                                <option value="0">全部</option>
+                                <option value="B2B">B2B</option>
+                                <option value="B2C">B2C</option>
+                            </select>
+                            <select id="B2BOptions" class="form-control normal-select-input m-r">
+                                <option value="">全部</option>
+                                <option value="">常规单</option>
+                                <option value="">赠送单</option>
+                                <option value="">合规单</option>
+                            </select>
+                            <select id="B2COptions" class="form-control normal-select-input m-r">
+                                <option value="">全部</option>
+                                <option value="">商品配件类目</option>
+                                <option value="">服务类目</option>
+                                <option value="">社区类目</option>
+                            </select>
+                        </div>
+                        <div class="flex-board-no-wrap m-t">
+                            <label class="form-control-label">订单标签：</label>
+                            <select class="form-control normal-select-input m-r">
+                                <option value="">全部</option>
+                            </select>
+                        </div>
+                        <div class="flex-board-no-wrap m-t">
+                            <label class="form-control-label">订单查询：</label>
+                            <input type="text" class="form-control long-input m-r" placeholder="请输入订单号、姓名、电话或地址、品牌、规格">
+                        </div>
+                        <div class="m-t">
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </div>
+                    </div>
+                    <div class="m-t">
+                        <a class="btn btn-default btn-outline" onclick="searchByOrderStatus(0)">
+                            新订单
+                        </a>
+                        <a class="btn btn-default btn-outline" onclick="">
+                            接单超时
+                        </a>
+                        <a class="btn btn-default btn-outline" onclick="">
+                            排单超时
+                        </a>
+                        <a class="btn btn-default btn-outline" onclick="">
+                            无法排单
+                        </a>
+                        <a class="btn btn-default btn-outline" onclick="">
+                            待上门超时
+                        </a>
+                        <a class="btn btn-default btn-outline" onclick="">
+                            进行超时
+                        </a>
+                        <a class="btn btn-default btn-outline" onclick="">
+                            售后超时
+                        </a>
+                        <a class="btn btn-default btn-outline" onclick="">
+                            客诉中
+                        </a>
+                        <a class="btn btn-default btn-outline" onclick="">
+                            审核中
+                        </a>
+                        <a class="btn btn-default btn-outline" onclick="">
+                            一票价未改价
+                        </a>
                     </div>
                 </form>
             </div>
@@ -51,52 +270,6 @@
                         <i class="fa fa-download"></i> 导出
                     </a>
                 </div>
-
-                <div class="btn-group-sm" id="orderSearchBtnGroup" role="group">
-                    <a class="btn btn-success btn-outline" onclick="searchByOrderStatus(0)">
-                        新订单
-                    </a>
-
-                    <a class="btn btn-success btn-outline" onclick="searchByOrderStatus(1)">
-                        未约/未排
-                    </a>
-
-                    <a class="btn btn-success btn-outline" onclick="searchByOrderStatus(2)">
-                        待上门
-                    </a>
-
-                    <a class="btn btn-success btn-outline" onclick="searchByOrderStatus(3)">
-                        服务中
-                    </a>
-
-                    <a class="btn btn-success btn-outline" onclick="searchByOrderStatus(4)">
-                        确认中
-                    </a>
-
-                    <a class="btn btn-success btn-outline" onclick="searchByOrderStatus(5)">
-                        已完成
-                    </a>
-
-                    <a class="btn btn-success btn-outline" onclick="searchByOrderStatus(6)">
-                        已取消
-                    </a>
-
-                    <a class="btn btn-success btn-outline" onclick="">
-                        售后中
-                    </a>
-
-                    <a class="btn btn-success btn-outline" onclick="">
-                        今日待上门
-                    </a>
-
-                    <a class="btn btn-success btn-outline" onclick="">
-                        明日待上门
-                    </a>
-
-                    <a class="btn btn-success btn-outline" onclick="">
-                        超时单
-                    </a>
-                </div>
             </div>
 
             <div class="col-sm-12 select-table table-striped">
@@ -109,6 +282,8 @@
 <th:block th:include="include :: footer"/>
 <th:block th:include="include :: layout-latest-js"/>
 <th:block th:include="include :: ztree-js"/>
+<th:block th:include="include :: jquery-cxselect-js" />
+<th:block th:include="include :: datetimepicker-js" />
 <script th:inline="javascript">
     var payTypes = [[${@dict.getType('pay_type')}]];
     var orderTypes = [[${@dict.getType('goods_category_type')}]];
@@ -133,8 +308,95 @@
             $('#scroll-up').toTop(opt);
         }
         queryOrderList();
+
+        $.ajax({
+            type: "POST",
+            dataType:"json",
+            url: ctx + "system/area/list",
+            success: function (result) {
+                if (result.code == web_status.SUCCESS) {
+                    $('#areaCxSelect').cxSelect({
+                        selects: ['province', 'city', 'district', 'street'],
+                        jsonValue: 'areaId',
+                        jsonName: 'areaName',
+                        data: result.data
+                    });
+                } else {
+                    $.modal.msgError("数据加载错误，请重试！")
+                }
+            }
+        })
+
+        $(".date-input").datetimepicker({
+            format: "yyyy-mm-dd",
+            minView: "month",
+            autoclose: true
+        });
+
+        $.ajax({
+            type: "POST",
+            dataType:"json",
+            url: ctx + "goods/deptcategory/app/list",
+            data: JSON.stringify({deptId: 101, goodsCategoryId: 1}),
+            contentType: 'application/json',
+            success: function (result) {
+                if (result.code == web_status.SUCCESS) {
+                    $('#categoryCxSelect').cxSelect({
+                        selects: ['category1', 'category2', 'category3', 'category4'],
+                        jsonValue: 'deptGoodsCategoryId',
+                        jsonName: 'goodsCategoryName',
+                        jsonSub: 'child',
+                        data: result.data
+                    });
+                } else {
+                    $.modal.msgError("数据加载错误，请重试！")
+                }
+            }
+        })
+
+        changeOrderMode();
     });
 
+    function changeOrderMode(orderMode) {
+        if (orderMode === 'B2B') {
+            $("#B2BOptions").show();
+            $("#B2COptions").hide();
+        } else if (orderMode === 'B2C') {
+            $("#B2BOptions").hide();
+            $("#B2COptions").show();
+        } else {
+            $("#B2BOptions").hide();
+            $("#B2COptions").hide();
+        }
+    }
+
+    function selectRegion(regionLevelName, nextRegionLevelName) {
+        var regionId = $("#" + regionLevelName).val();
+        if ($.common.isEmpty(regionId)) {
+            return;
+        }
+
+        //Ajax调用处理
+        $.ajax({
+            type: "POST",
+            dataType:"json",
+            url: ctx + "system/area/list",
+            data: {parentCode: regionId},
+            success: function (result) {
+                if (result.code == web_status.SUCCESS) {
+                    $('#areaCxSelect').cxSelect({
+                        selects: [nextRegionLevelName],
+                        jsonValue: 'areaId',
+                        jsonName: 'areaName',
+                        data: result.data
+                    });
+                } else {
+                    $.modal.msgError("数据加载错误，请重试！")
+                }
+            }
+        })
+    }
+
     function queryOrderList() {
         var options = {
             url: prefix + "/list",
