From f55aeae6f7d3198e6fa95d6448ac2a1cd5390efd Mon Sep 17 00:00:00 2001
From: weizhiqiang <598748873@qq.com>
Date: Tue, 15 Mar 2022 18:05:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BF=9D=E5=85=BB=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/template/js/keepFitOrder/allKeepFitOrderList.js | 2 +-
 .../main/resources/template/js/mealOrder/allMealOrderList.js  | 4 ++--
 .../template/tpl/keepFitOrder/allKeepFitOrderList.html        | 2 ++
 .../resources/template/tpl/mealOrder/allMealOrderList.html    | 2 ++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/shop/src/main/resources/template/js/keepFitOrder/allKeepFitOrderList.js b/shop/src/main/resources/template/js/keepFitOrder/allKeepFitOrderList.js
index d4e9207fa..c12045c98 100644
--- a/shop/src/main/resources/template/js/keepFitOrder/allKeepFitOrderList.js
+++ b/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) {
diff --git a/shop/src/main/resources/template/js/mealOrder/allMealOrderList.js b/shop/src/main/resources/template/js/mealOrder/allMealOrderList.js
index d7df7a537..ce5e74574 100644
--- a/shop/src/main/resources/template/js/mealOrder/allMealOrderList.js
+++ b/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){
diff --git a/shop/src/main/resources/template/tpl/keepFitOrder/allKeepFitOrderList.html b/shop/src/main/resources/template/tpl/keepFitOrder/allKeepFitOrderList.html
index bcdc3992b..450d5c34c 100644
--- a/shop/src/main/resources/template/tpl/keepFitOrder/allKeepFitOrderList.html
+++ b/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}}
diff --git a/shop/src/main/resources/template/tpl/mealOrder/allMealOrderList.html b/shop/src/main/resources/template/tpl/mealOrder/allMealOrderList.html
index 320fe3c2f..dbb2e7fb5 100644
--- a/shop/src/main/resources/template/tpl/mealOrder/allMealOrderList.html
+++ b/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}}
-- 
GitLab