套餐订单新增性质属性

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

@@ -24,6 +24,11 @@ layui.config({
         });
     });
 
+    // 加载套餐订单性质
+    shopUtil.queryMealOrderNatureList(function (json){
+        $("#natureId").html(getDataUseHandlebars(selOption, json));
+    });
+
     table.render({
         id: 'messageTable',
         elem: '#messageTable',
@@ -47,6 +52,7 @@ layui.config({
             { field: 'state', title: '订单状态', width: 80, align: "center", rowspan: '2', templet: function(d){
                 return shopUtil.getMealOrderStateName(d);
             }},
+            { field: 'natureName', title: '订单性质', width: 80, rowspan: '2', align: "center"},
             { 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){
@@ -112,6 +118,7 @@ layui.config({
             orderNum: $("#orderNum").val(),
             memberName: $("#memberName").val(),
             memberPhone: $("#memberPhone").val(),
+            natureId: $("#natureId").val(),
             state: $("#state").val(),
             areaId: $("#areaId").val(),
             storeId: $("#storeId").val()

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

@@ -38,6 +38,7 @@ layui.config({
             { field: 'state', title: '订单状态', width: 80, align: "center", templet: function(d){
                 return shopUtil.getMealOrderStateName(d);
             }},
+            { field: 'natureName', title: '订单性质', width: 80, align: "center"},
             { field: 'payTime', title: '支付时间', align: 'center', width: 150 },
             { field: 'type', title: '订单来源', width: 80, align: "center", templet: function(d){
                 if(d.type == 1){

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

@@ -48,6 +48,11 @@ layui.config({
             $("#allPrice").html("0 元");
         });
 
+        // 加载套餐订单性质
+        shopUtil.queryMealOrderNatureList(function (json){
+            $("#natureId").html(getDataUseHandlebars($("#selectTemplate").html(), json));
+        });
+
         textool.init({
             eleId: 'remark',
             maxlength: 400,
@@ -100,6 +105,7 @@ layui.config({
 
                 var params = {
                     storeId: $("#storeId").val(),
+                    natureId: $("#natureId").val(),
                     memberId: memberMation.id,
                     remark: $("#remark").val(),
                     type: 2,

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

@@ -10,12 +10,18 @@ layui.config({
     var $ = layui.$,
         form = layui.form,
         table = layui.table;
+    var selOption = getFileContent('tpl/template/select-option.tpl');
 
     // 加载我所在的门店
     shopUtil.queryStaffBelongStoreList(function (json){
         $("#storeId").html(getDataUseHandlebars($("#selectTemplate").html(), json));
     });
 
+    // 加载套餐订单性质
+    shopUtil.queryMealOrderNatureList(function (json){
+        $("#natureId").html(getDataUseHandlebars(selOption, json));
+    });
+
     form.on('select(storeId)', function(data) {
         table.reload("messageTable", {page: {curr: 1}, where: getTableParams()})
     });
@@ -42,6 +48,7 @@ layui.config({
             { field: 'state', title: '订单状态', width: 80, align: "center", templet: function(d){
                 return shopUtil.getMealOrderStateName(d);
             }},
+            { field: 'natureName', title: '订单性质', width: 80, align: "center"},
             { field: 'payTime', title: '支付时间', align: 'center', width: 150 },
             { field: 'type', title: '订单来源', width: 80, align: "center", templet: function(d){
                 if(d.type == 1){
@@ -163,6 +170,7 @@ layui.config({
             orderNum: $("#orderNum").val(),
             memberName: $("#memberName").val(),
             memberPhone: $("#memberPhone").val(),
+            natureId: $("#natureId").val(),
             state: $("#state").val(),
             storeId: storeId
         };

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

@@ -48,6 +48,11 @@
                             <option value="10">已取消</option>
                         </select>
                     </div>
+                    <label class="layui-form-label">订单性质</label>
+                    <div class="layui-input-inline">
+                        <select id="natureId" name="natureId" lay-filter="natureId" lay-search="">
+                        </select>
+                    </div>
                     <button type="reset" class="layui-btn layui-btn-primary list-form-search"><language showName="com.skyeye.reset"></language></button>
                     <button class="layui-btn list-form-search" lay-submit lay-filter="formSearch"><language showName="com.skyeye.search2"></language></button>
                 </div>

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

@@ -23,6 +23,14 @@
 
                 </div>
             </div>
+            <div class="layui-form-item layui-col-xs6">
+                <label class="layui-form-label">性质<i class="red">*</i></label>
+                <div class="layui-input-block">
+                    <select id="natureId" name="natureId" lay-filter="natureId" lay-search="" win-verify="required">
+
+                    </select>
+                </div>
+            </div>
             <div class="layui-form-item layui-col-xs12">
                 <label class="layui-form-label">套餐</label>
                 <div class="layui-input-block">

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

@@ -43,6 +43,11 @@
                             <option value="10">已取消</option>
                         </select>
                     </div>
+                    <label class="layui-form-label">订单性质</label>
+                    <div class="layui-input-inline">
+                        <select id="natureId" name="natureId" lay-filter="natureId" lay-search="">
+                        </select>
+                    </div>
                     <button type="reset" class="layui-btn layui-btn-primary list-form-search"><language showName="com.skyeye.reset"></language></button>
                     <button class="layui-btn list-form-search" lay-submit lay-filter="formSearch"><language showName="com.skyeye.search2"></language></button>
                 </div>

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

@@ -24,6 +24,23 @@ var shopUtil = {
         }
     },
 
+    /**
+     * 获取套餐订单已启用的性质管理列表
+     *
+     * @param callback 回执函数
+     */
+    queryMealOrderNatureList: function (callback){
+        AjaxPostUtil.request({url: shopBasePath + "queryMealOrderNatureList", params: {enabled: 1}, type: 'json', method: "POST", callback: function(json) {
+            if(json.returnCode == 0) {
+                if(typeof(callback) == "function") {
+                    callback(json);
+                }
+            } else {
+                winui.window.msg(json.returnMessage, {icon: 2, time: 2000});
+            }
+        }, async: false});
+    },
+
     /**
      * 获取套餐订单是否赠送的字段信息
      *