Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Skyeye云
Skyeye
提交
32ea27f1
S
Skyeye
项目概览
Skyeye云
/
Skyeye
通知
1279
Star
158
Fork
129
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
Skyeye
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
32ea27f1
编写于
3月 12, 2022
作者:
Skyeye云
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
10.套餐订单新增员工标签字段
11.员工新增员工标签字段
上级
dc91f976
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
48 addition
and
0 deletion
+48
-0
shop/src/main/resources/template/js/mealOrder/allMealOrderList.js
.../main/resources/template/js/mealOrder/allMealOrderList.js
+2
-0
shop/src/main/resources/template/js/mealOrder/memberMealOrderList.js
...in/resources/template/js/mealOrder/memberMealOrderList.js
+1
-0
shop/src/main/resources/template/js/mealOrder/storeMealOrderAdd.js
...main/resources/template/js/mealOrder/storeMealOrderAdd.js
+6
-0
shop/src/main/resources/template/js/mealOrder/storeMealOrderList.js
...ain/resources/template/js/mealOrder/storeMealOrderList.js
+2
-0
shop/src/main/resources/template/tpl/mealOrder/allMealOrderList.html
...in/resources/template/tpl/mealOrder/allMealOrderList.html
+4
-0
shop/src/main/resources/template/tpl/mealOrder/storeMealOrderAdd.html
...n/resources/template/tpl/mealOrder/storeMealOrderAdd.html
+6
-0
shop/src/main/resources/template/tpl/mealOrder/storeMealOrderList.html
.../resources/template/tpl/mealOrder/storeMealOrderList.html
+4
-0
userauth/src/main/resources/template/js/syseveuserstaff/syseveuserstafflist.js
...ources/template/js/syseveuserstaff/syseveuserstafflist.js
+2
-0
userauth/src/main/resources/template/tpl/syseveuserstaff/syseveuserstafflist.html
...ces/template/tpl/syseveuserstaff/syseveuserstafflist.html
+4
-0
web/src/main/resources/template/assets/lib/layui/customer/systemCommonUtil.js
...es/template/assets/lib/layui/customer/systemCommonUtil.js
+17
-0
未找到文件。
shop/src/main/resources/template/js/mealOrder/allMealOrderList.js
浏览文件 @
32ea27f1
...
...
@@ -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
()
...
...
shop/src/main/resources/template/js/mealOrder/memberMealOrderList.js
浏览文件 @
32ea27f1
...
...
@@ -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
){
...
...
shop/src/main/resources/template/js/mealOrder/storeMealOrderAdd.js
浏览文件 @
32ea27f1
...
...
@@ -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
)
...
...
shop/src/main/resources/template/js/mealOrder/storeMealOrderList.js
浏览文件 @
32ea27f1
...
...
@@ -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
};
...
...
shop/src/main/resources/template/tpl/mealOrder/allMealOrderList.html
浏览文件 @
32ea27f1
...
...
@@ -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>
...
...
shop/src/main/resources/template/tpl/mealOrder/storeMealOrderAdd.html
浏览文件 @
32ea27f1
...
...
@@ -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"
>
...
...
shop/src/main/resources/template/tpl/mealOrder/storeMealOrderList.html
浏览文件 @
32ea27f1
...
...
@@ -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>
...
...
userauth/src/main/resources/template/js/syseveuserstaff/syseveuserstafflist.js
浏览文件 @
32ea27f1
...
...
@@ -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
...
...
userauth/src/main/resources/template/tpl/syseveuserstaff/syseveuserstafflist.html
浏览文件 @
32ea27f1
...
...
@@ -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>
...
...
web/src/main/resources/template/assets/lib/layui/customer/systemCommonUtil.js
浏览文件 @
32ea27f1
...
...
@@ -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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录