BUG0016列表订单状态筛选缺少取消状态

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

@@ -52,18 +52,8 @@ layui.config({
             { field: 'payablePrice', title: '应付金额', width: 100, align: "left", rowspan: '2'},
             { field: 'servicePrice', title: '服务费', width: 100, align: "left", rowspan: '2'},
             { title: '下单地址', align: 'center', colspan: '2'},
-            { field: 'state', title: '支付状态', width: 150, align: "center", rowspan: '2', templet: function(d){
-                if(d.cancleState == 1){
-                    if(d.state == 1){
-                        return "<span class='state-down'>待支付</span>";
-                    }else if(d.state == 2){
-                        return "<span class='state-up'>已支付(待核销)</span>";
-                    }else if(d.state == 3){
-                        return "<span class='state-up'>已支付(已核销)</span>";
-                    }
-                }else{
-                    return '已取消';
-                }
+            { field: 'state', title: '订单状态', width: 150, align: "center", rowspan: '2', templet: function(d){
+                return shopUtil.getKeepFitOrderStateName(d);
             }},
             { field: 'payPrice', title: '实付金额', width: 100, align: "left", rowspan: '2' },
             { field: 'payTime', title: '实付日期', align: 'center', width: 150, rowspan: '2' },

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

@@ -20,15 +20,10 @@ layui.config({
             ajaxSendLoadBefore: function(hdb, json){
                 json.bean.remark = stringManipulation.textAreaShow(json.bean.remark);
                 json.bean.userType = json.bean.userType == 1 ? '匿名客户' : '会员';
-                if(json.bean.cancleState == 1){
-                    json.bean.state = json.bean.state == 1 ? '待支付' : '已支付';
-                }else{
-                    json.bean.state = '已取消';
-                }
+                json.bean.state = shopUtil.getKeepFitOrderStateName(json.bean);
                 json.bean.type = json.bean.type == 1 ? '线上下单' : '线下下单';
             },
             ajaxSendAfter:function(json){
-
                 matchingLanguage();
                 form.render();
             }

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

@@ -48,18 +48,8 @@ layui.config({
             { field: 'payablePrice', title: '应付金额', width: 100, align: "left"},
             { field: 'servicePrice', title: '服务费', width: 100, align: "left"},
             { field: 'storeName', title: '所属门店', align: 'left', width: 120 },
-            { field: 'state', title: '支付状态', width: 150, align: "center", templet: function(d){
-                if(d.cancleState == 1){
-                    if(d.state == 1){
-                        return "<span class='state-down'>待支付</span>";
-                    }else if(d.state == 2){
-                        return "<span class='state-up'>已支付(待核销)</span>";
-                    }else if(d.state == 3){
-                        return "<span class='state-up'>已支付(已核销)</span>";
-                    }
-                } else {
-                    return '已取消';
-                }
+            { field: 'state', title: '订单状态', width: 150, align: "center", templet: function(d){
+                return shopUtil.getKeepFitOrderStateName(d);
             }},
             { field: 'payPrice', title: '实付金额', width: 100, align: "left"},
             { field: 'payTime', title: '实付日期', align: 'center', width: 150 },

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

@@ -43,16 +43,8 @@ layui.config({
             { field: 'phone', title: '会员手机号', width: 100, rowspan: '2', align: "center"},
             { title: '下单地址', align: 'center', colspan: '2'},
             { field: 'payablePrice', title: '应付金额', width: 100, align: "left", rowspan: '2'},
-            { field: 'state', title: '支付状态', width: 80, align: "center", rowspan: '2', templet: function(d){
-                if(d.cancleState == 1) {
-                    if (d.state == 1) {
-                        return "<span class='state-down'>待支付</span>";
-                    } else {
-                        return "<span class='state-up'>已支付</span>";
-                    }
-                } else {
-                    return '已取消';
-                }
+            { field: 'state', title: '订单状态', width: 80, align: "center", rowspan: '2', templet: function(d){
+                return shopUtil.getMealOrderStateName(d);
             }},
             { field: 'payPrice', title: '实付金额', width: 100, align: "left", rowspan: '2'},
             { field: 'payTime', title: '实付日期', align: 'center', rowspan: '2', width: 150 },

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

@@ -34,16 +34,8 @@ layui.config({
             { field: 'contacts', title: '会员名称', width: 100 },
             { field: 'phone', title: '会员手机号', width: 100, align: "center"},
             { field: 'payablePrice', title: '应付金额', width: 100, align: "left"},
-            { field: 'state', title: '支付状态', width: 80, align: "center", templet: function(d){
-                if(d.cancleState == 1) {
-                    if (d.state == 1) {
-                        return "<span class='state-down'>待支付</span>";
-                    } else {
-                        return "<span class='state-up'>已支付</span>";
-                    }
-                } else {
-                    return '已取消';
-                }
+            { field: 'state', title: '订单状态', width: 80, align: "center", templet: function(d){
+                return shopUtil.getMealOrderStateName(d);
             }},
             { field: 'payPrice', title: '实付金额', width: 100, align: "left"},
             { field: 'payTime', title: '实付日期', align: 'center', width: 150 },

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

@@ -19,11 +19,7 @@ layui.config({
             template: $("#simpleTemplate").html(),
             ajaxSendLoadBefore: function(hdb, json){
                 json.bean.remark = stringManipulation.textAreaShow(json.bean.remark);
-                if(json.bean.cancleState == 1){
-                    json.bean.state = json.bean.state == 1 ? '待支付' : '已支付';
-                }else{
-                    json.bean.state = '已取消';
-                }
+                json.bean.state = shopUtil.getMealOrderStateName(json.bean);
                 json.bean.type = json.bean.type == 1 ? '线上下单' : '线下下单';
             },
             ajaxSendAfter:function(json){

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

@@ -38,16 +38,8 @@ layui.config({
             { field: 'contacts', title: '会员名称', width: 100 },
             { field: 'phone', title: '会员手机号', width: 100, align: "center"},
             { field: 'payablePrice', title: '应付金额', width: 100, align: "left"},
-            { field: 'state', title: '支付状态', width: 80, align: "center", templet: function(d){
-                if(d.cancleState == 1) {
-                    if (d.state == 1) {
-                        return "<span class='state-down'>待支付</span>";
-                    } else {
-                        return "<span class='state-up'>已支付</span>";
-                    }
-                } else {
-                    return '已取消';
-                }
+            { field: 'state', title: '订单状态', width: 80, align: "center", templet: function(d){
+                return shopUtil.getMealOrderStateName(d);
             }},
             { field: 'payPrice', title: '实付金额', width: 100, align: "left"},
             { field: 'payTime', title: '实付日期', align: 'center', width: 150 },

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

@@ -42,6 +42,7 @@
                             <option value="1">待支付</option>
                             <option value="2">已支付(待核销)</option>
                             <option value="3">已支付(已核销)</option>
+                            <option value="10">已取消</option>
                         </select>
                     </div>
                     <label class="layui-form-label">车牌号</label>

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

@@ -22,9 +22,9 @@
             </div>
         </div>
         <div class="layui-form-item layui-col-xs6">
-            <label class="layui-form-label">状态：</label>
+            <label class="layui-form-label">订单状态：</label>
             <div class="layui-input-block ver-center">
-                {{state}}
+                {{{state}}}
             </div>
         </div>
         <div class="layui-form-item layui-col-xs6">

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

@@ -37,6 +37,7 @@
                             <option value="1">待支付</option>
                             <option value="2">已支付(待核销)</option>
                             <option value="3">已支付(已核销)</option>
+                            <option value="10">已取消</option>
                         </select>
                     </div>
                     <label class="layui-form-label">车牌号</label>

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

@@ -41,6 +41,7 @@
                             <option value="">全部</option>
                             <option value="1">待支付</option>
                             <option value="2">已支付</option>
+                            <option value="10">已取消</option>
                         </select>
                     </div>
                     <button type="reset" class="layui-btn layui-btn-primary list-form-search"><language showName="com.skyeye.reset"></language></button>

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

@@ -22,9 +22,9 @@
             </div>
         </div>
         <div class="layui-form-item layui-col-xs6">
-            <label class="layui-form-label">状态：</label>
+            <label class="layui-form-label">订单状态：</label>
             <div class="layui-input-block ver-center">
-                {{state}}
+                {{{state}}}
             </div>
         </div>
         <div class="layui-form-item layui-col-xs6">

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

@@ -36,6 +36,7 @@
                             <option value="">全部</option>
                             <option value="1">待支付</option>
                             <option value="2">已支付</option>
+                            <option value="10">已取消</option>
                         </select>
                     </div>
                     <button type="reset" class="layui-btn layui-btn-primary list-form-search"><language showName="com.skyeye.reset"></language></button>

web/src/main/resources/template/assets/lib/layui/customer/shopUtil.js

@@ -24,6 +24,44 @@ var shopUtil = {
         }
     },
 
+    /**
+     * 套餐订单获取状态名称
+     *
+     * @param data
+     * @returns {string}
+     */
+    getMealOrderStateName: function (data){
+        if(data.cancleState == 1) {
+            if (data.state == 1) {
+                return "<span class='state-down'>待支付</span>";
+            } else {
+                return "<span class='state-up'>已支付</span>";
+            }
+        } else {
+            return '已取消';
+        }
+    },
+
+    /**
+     * 保养订单获取状态名称
+     *
+     * @param data
+     * @returns {string}
+     */
+    getKeepFitOrderStateName: function (data){
+        if(data.cancleState == 1){
+            if(data.state == 1){
+                return "<span class='state-down'>待支付</span>";
+            }else if(data.state == 2){
+                return "<span class='state-up'>已支付(待核销)</span>";
+            }else if(data.state == 3){
+                return "<span class='state-up'>已支付(已核销)</span>";
+            }
+        }else{
+            return '已取消';
+        }
+    },
+
     /**
      * 获取区域信息
      *