优化保养订单查询

shop/src/main/resources/template/js/keepFitOrder/allKeepFitOrderList.js

@@ -14,7 +14,7 @@ layui.config({
 
     // 加载区域
     shopUtil.getShopAreaMation(function (json){
-        $("#areaId").html(getDataUseHandlebars(selOption, json));
+        $("#areaId").html(getDataUseHandlebars($("#selectTemplate").html(), json));
         form.render('select');
     });
     form.on('select(areaId)', function(data) {

shop/src/main/resources/template/js/mealOrder/allMealOrderList.js

@@ -14,7 +14,7 @@ layui.config({
 
     // 加载区域
     shopUtil.getShopAreaMation(function (json){
-        $("#areaId").html(getDataUseHandlebars(selOption, json));
+        $("#areaId").html(getDataUseHandlebars($("#selectTemplate").html(), json));
         form.render('select');
     });
     form.on('select(areaId)', function(data) {
@@ -54,7 +54,7 @@ layui.config({
                 return shopUtil.getMealOrderStateName(d);
             }},
             { field: 'natureName', title: '订单性质', width: 80, rowspan: '2', align: "center"},
-            { field: 'label', title: '员工标签', width: 120, align: "left"},
+            { field: 'label', title: '员工标签', width: 120, rowspan: '2', align: "left"},
             { field: 'payTime', title: '支付时间', align: 'center', rowspan: '2', width: 150 },
             { field: 'type', title: '订单来源', width: 80, align: "center", rowspan: '2', templet: function(d){
                 if(d.type == 1){

shop/src/main/resources/template/tpl/keepFitOrder/allKeepFitOrderList.html

@@ -81,6 +81,8 @@
     </div>
 
     <script type="text/x-handlebars-template" id="selectTemplate">
+        <option value="">全部</option>
+        <option value="-">默认区域</option>
         {{#each rows}}
             <option value="{{id}}">{{name}}</option>
         {{/each}}

shop/src/main/resources/template/tpl/mealOrder/allMealOrderList.html

@@ -73,6 +73,8 @@
     </div>
 
     <script type="text/x-handlebars-template" id="selectTemplate">
+        <option value="">全部</option>
+        <option value="-">默认区域</option>
         {{#each rows}}
             <option value="{{id}}">{{name}}</option>
         {{/each}}