提交 0c1dc1bb 编写于 作者: Skyeye云's avatar Skyeye云

套餐订单新增是否赠送的字段

上级 e6ce4843
...@@ -67,6 +67,9 @@ layui.config({ ...@@ -67,6 +67,9 @@ layui.config({
return "线下下单"; return "线下下单";
} }
}}, }},
{ field: 'whetherGive', title: '是否赠送', width: 100, align: "center", rowspan: '2', templet: function(d){
return shopUtil.getMealOrderWhetherGiveName(d);
}},
{ field: 'createName', title: '服务顾问', width: 120, rowspan: '2' }, { field: 'createName', title: '服务顾问', width: 120, rowspan: '2' },
{ field: 'createTime', title: '操作时间', align: 'center', width: 150, rowspan: '2' }, { field: 'createTime', title: '操作时间', align: 'center', width: 150, rowspan: '2' },
],[ ],[
......
...@@ -21,6 +21,7 @@ layui.config({ ...@@ -21,6 +21,7 @@ layui.config({
json.bean.remark = stringManipulation.textAreaShow(json.bean.remark); json.bean.remark = stringManipulation.textAreaShow(json.bean.remark);
json.bean.userType = json.bean.userType == 1 ? '匿名客户' : '会员'; json.bean.userType = json.bean.userType == 1 ? '匿名客户' : '会员';
json.bean.state = shopUtil.getKeepFitOrderStateName(json.bean); json.bean.state = shopUtil.getKeepFitOrderStateName(json.bean);
json.bean.whetherGive = shopUtil.getMealOrderWhetherGiveName(json.bean);
json.bean.type = json.bean.type == 1 ? '线上下单' : '线下下单'; json.bean.type = json.bean.type == 1 ? '线上下单' : '线下下单';
}, },
ajaxSendAfter:function(json){ ajaxSendAfter:function(json){
......
...@@ -63,6 +63,9 @@ layui.config({ ...@@ -63,6 +63,9 @@ layui.config({
return "线下下单"; return "线下下单";
} }
}}, }},
{ field: 'whetherGive', title: '是否赠送', width: 100, align: "center", rowspan: '2', templet: function(d){
return shopUtil.getMealOrderWhetherGiveName(d);
}},
{ field: 'createName', title: '服务顾问', width: 120 }, { field: 'createName', title: '服务顾问', width: 120 },
{ field: 'createTime', title: '操作时间', align: 'center', width: 150 }, { field: 'createTime', title: '操作时间', align: 'center', width: 150 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'} { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'}
......
...@@ -55,6 +55,9 @@ layui.config({ ...@@ -55,6 +55,9 @@ layui.config({
return "线下下单"; return "线下下单";
} }
}}, }},
{ field: 'whetherGive', title: '是否赠送', width: 100, align: "center", rowspan: '2', templet: function(d){
return shopUtil.getMealOrderWhetherGiveName(d);
}},
{ field: 'createName', title: '专属顾问', width: 120, rowspan: '2' }, { field: 'createName', title: '专属顾问', width: 120, rowspan: '2' },
{ field: 'createTime', title: '创建时间', align: 'center', width: 150, rowspan: '2' }, { field: 'createTime', title: '创建时间', align: 'center', width: 150, rowspan: '2' },
],[ ],[
......
...@@ -46,6 +46,9 @@ layui.config({ ...@@ -46,6 +46,9 @@ layui.config({
return "线下下单"; return "线下下单";
} }
}}, }},
{ field: 'whetherGive', title: '是否赠送', width: 100, align: "center", templet: function(d){
return shopUtil.getMealOrderWhetherGiveName(d);
}},
{ field: 'createName', title: '专属顾问', width: 120 }, { field: 'createName', title: '专属顾问', width: 120 },
{ field: 'createTime', title: '创建时间', align: 'center', width: 150 }, { field: 'createTime', title: '创建时间', align: 'center', width: 150 },
]], ]],
......
...@@ -20,6 +20,7 @@ layui.config({ ...@@ -20,6 +20,7 @@ layui.config({
ajaxSendLoadBefore: function(hdb, json){ ajaxSendLoadBefore: function(hdb, json){
json.bean.remark = stringManipulation.textAreaShow(json.bean.remark); json.bean.remark = stringManipulation.textAreaShow(json.bean.remark);
json.bean.state = shopUtil.getMealOrderStateName(json.bean); json.bean.state = shopUtil.getMealOrderStateName(json.bean);
json.bean.whetherGive = shopUtil.getMealOrderWhetherGiveName(json.bean);
json.bean.type = json.bean.type == 1 ? '线上下单' : '线下下单'; json.bean.type = json.bean.type == 1 ? '线上下单' : '线下下单';
}, },
ajaxSendAfter:function(json){ ajaxSendAfter:function(json){
......
...@@ -50,6 +50,9 @@ layui.config({ ...@@ -50,6 +50,9 @@ layui.config({
return "线下下单"; return "线下下单";
} }
}}, }},
{ field: 'whetherGive', title: '是否赠送', width: 100, align: "center", templet: function(d){
return shopUtil.getMealOrderWhetherGiveName(d);
}},
{ field: 'createName', title: '专属顾问', width: 120 }, { field: 'createName', title: '专属顾问', width: 120 },
{ field: 'createTime', title: '创建时间', align: 'center', width: 150 }, { field: 'createTime', title: '创建时间', align: 'center', width: 150 },
{ title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'} { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 200, toolbar: '#tableBar'}
......
...@@ -111,6 +111,12 @@ ...@@ -111,6 +111,12 @@
{{payTime}} {{payTime}}
</div> </div>
</div>--> </div>-->
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">套餐内消耗</label>
<div class="layui-input-block ver-center">
{{mealSinglePrice}}
</div>
</div>
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">备注</label> <label class="layui-form-label">备注</label>
<div class="layui-input-block ver-center"> <div class="layui-input-block ver-center">
...@@ -127,9 +133,9 @@ ...@@ -127,9 +133,9 @@
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs6"> <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"> <div class="layui-input-block ver-center">
{{mealSinglePrice}} {{whetherGive}}
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
......
...@@ -98,6 +98,12 @@ ...@@ -98,6 +98,12 @@
{{payTime}} {{payTime}}
</div> </div>
</div> </div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">是否赠送</label>
<div class="layui-input-block ver-center">
{{whetherGive}}
</div>
</div>
<div class="layui-form-item layui-col-xs12"> <div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">备注</label> <label class="layui-form-label">备注</label>
<div class="layui-input-block ver-center"> <div class="layui-input-block ver-center">
......
...@@ -24,6 +24,22 @@ var shopUtil = { ...@@ -24,6 +24,22 @@ var shopUtil = {
} }
}, },
/**
* 获取套餐订单是否赠送的字段信息
*
* @param data
* @returns {string}
*/
getMealOrderWhetherGiveName: function (data){
if (data.whetherGive == 1) {
return "";
} else if (data.whetherGive == 2) {
return "";
} else {
return "";
}
},
/** /**
* 套餐订单获取状态名称 * 套餐订单获取状态名称
* *
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册