提交 32ea27f1 编写于 作者: Skyeye云's avatar Skyeye云

10.套餐订单新增员工标签字段

11.员工新增员工标签字段
上级 dc91f976
......@@ -53,6 +53,7 @@ layui.config({
return shopUtil.getMealOrderStateName(d);
}},
{ field: 'natureName', title: '订单性质', width: 80, rowspan: '2', align: "center"},
{ field: 'label', title: '员工标签', width: 120, 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){
......@@ -119,6 +120,7 @@ layui.config({
memberName: $("#memberName").val(),
memberPhone: $("#memberPhone").val(),
natureId: $("#natureId").val(),
label: $("#label").val(),
state: $("#state").val(),
areaId: $("#areaId").val(),
storeId: $("#storeId").val()
......
......@@ -39,6 +39,7 @@ layui.config({
return shopUtil.getMealOrderStateName(d);
}},
{ field: 'natureName', title: '订单性质', width: 80, align: "center"},
{ field: 'label', title: '员工标签', width: 120, align: "left"},
{ field: 'payTime', title: '支付时间', align: 'center', width: 150 },
{ field: 'type', title: '订单来源', width: 80, align: "center", templet: function(d){
if(d.type == 1){
......
......@@ -31,6 +31,11 @@ layui.config({
memberMation = parent.memberMation;
$("#memberName").html(memberMation.contacts);
// 获取当前登录员工信息
systemCommonUtil.getSysCurrentLoginUserMation(function (json){
$("#label").html(json.bean.label);
});
// 加载我所在的门店
shopUtil.queryStaffBelongStoreList(function (json){
$("#storeId").html(getDataUseHandlebars($("#selectTemplate").html(), json));
......@@ -108,6 +113,7 @@ layui.config({
natureId: $("#natureId").val(),
memberId: memberMation.id,
remark: $("#remark").val(),
label: $("#label").html(),
type: 2,
source: 2,
mealList: JSON.stringify(tableData)
......
......@@ -51,6 +51,7 @@ layui.config({
return shopUtil.getMealOrderStateName(d);
}},
{ field: 'natureName', title: '订单性质', width: 80, align: "center"},
{ field: 'label', title: '员工标签', width: 120, align: "left"},
{ field: 'payTime', title: '支付时间', align: 'center', width: 150 },
{ field: 'type', title: '订单来源', width: 80, align: "center", templet: function(d){
if(d.type == 1){
......@@ -210,6 +211,7 @@ layui.config({
memberName: $("#memberName").val(),
memberPhone: $("#memberPhone").val(),
natureId: $("#natureId").val(),
label: $("#label").val(),
state: $("#state").val(),
storeId: storeId
};
......
......@@ -53,6 +53,10 @@
<select id="natureId" name="natureId" lay-filter="natureId" lay-search="">
</select>
</div>
<label class="layui-form-label">员工标签</label>
<div class="layui-input-inline">
<input type="text" id="label" name="label" placeholder="请输入员工标签" class="layui-input" />
</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>
......
......@@ -31,6 +31,12 @@
</select>
</div>
</div>
<div class="layui-form-item layui-col-xs6">
<label class="layui-form-label">员工标签</label>
<div class="layui-input-block ver-center" id="label">
</div>
</div>
<div class="layui-form-item layui-col-xs12">
<label class="layui-form-label">套餐</label>
<div class="layui-input-block">
......
......@@ -48,6 +48,10 @@
<select id="natureId" name="natureId" lay-filter="natureId" lay-search="">
</select>
</div>
<label class="layui-form-label">员工标签</label>
<div class="layui-input-inline">
<input type="text" id="label" name="label" placeholder="请输入员工标签" class="layui-input" />
</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>
......
......@@ -88,6 +88,7 @@ layui.config({
return "<span class='state-down'>未分配</span>";
}
}},
{ field: 'label', title: '员工标签', width: 120, align: "left"},
{ field: 'userIdCard', title: '身份证', rowspan: '3', align: 'center', width: 160 },
{ field: 'workTimeNum', title: '考勤班次', rowspan: '3', align: 'center', width: 80 },
{ field: 'userSex', title: '性别', width: 60, rowspan: '3', align: 'center', templet: function(d){
......@@ -429,6 +430,7 @@ layui.config({
userName:$("#userName").val(),
userSex:$("#userSex").val(),
userIdCard:$("#userIdCard").val(),
label: $("#label").val(),
companyName:companyId,
departmentName:departmentId,
jobName:jobId
......
......@@ -47,6 +47,10 @@
</select>
</div>
<label class="layui-form-label">员工标签</label>
<div class="layui-input-inline">
<input type="text" id="label" name="label" placeholder="请输入员工标签" class="layui-input" />
</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>
......
......@@ -28,6 +28,23 @@ var systemCommonUtil = {
}, async: false});
},
/**
* 获取当前登录员工信息
*
* @param callback 回执函数
*/
getSysCurrentLoginUserMation: function (callback){
AjaxPostUtil.request({url: reqBasePath + "login002", params: {}, 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});
},
/**
* 获取系统企业信息
*
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册