Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Skyeye云
Skyeye
提交
708c1de1
S
Skyeye
项目概览
Skyeye云
/
Skyeye
通知
1436
Star
162
Fork
130
代码
文件
提交
分支
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看板
提交
708c1de1
编写于
3月 16, 2022
作者:
Skyeye云
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
BUG0089 保养订单,查询项缺失5个(已和产品确认 需要添加)
上级
ca2b131c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
73 addition
and
2 deletion
+73
-2
shop/src/main/resources/template/js/keepFitOrder/storeKeepFitOrderList.js
...sources/template/js/keepFitOrder/storeKeepFitOrderList.js
+24
-2
shop/src/main/resources/template/tpl/keepFitOrder/allKeepFitOrderList.html
...ources/template/tpl/keepFitOrder/allKeepFitOrderList.html
+14
-0
shop/src/main/resources/template/tpl/keepFitOrder/storeKeepFitOrderList.html
...rces/template/tpl/keepFitOrder/storeKeepFitOrderList.html
+14
-0
web/src/main/resources/template/assets/lib/layui/customer/shopUtil.js
.../resources/template/assets/lib/layui/customer/shopUtil.js
+21
-0
未找到文件。
shop/src/main/resources/template/js/keepFitOrder/storeKeepFitOrderList.js
浏览文件 @
708c1de1
...
...
@@ -5,17 +5,30 @@ layui.config({
version
:
skyeyeVersion
}).
extend
({
window
:
'
js/winui.window
'
}).
define
([
'
window
'
,
'
table
'
,
'
jquery
'
,
'
winui
'
,
'
form
'
],
function
(
exports
)
{
}).
define
([
'
window
'
,
'
table
'
,
'
jquery
'
,
'
winui
'
,
'
form
'
,
'
laydate
'
],
function
(
exports
)
{
winui
.
renderColor
();
var
$
=
layui
.
$
,
form
=
layui
.
form
,
laydate
=
layui
.
laydate
,
table
=
layui
.
table
;
var
selOption
=
getFileContent
(
'
tpl/template/select-option.tpl
'
);
// 加载我所在的门店
shopUtil
.
queryStaffBelongStoreList
(
function
(
json
){
$
(
"
#storeId
"
).
html
(
getDataUseHandlebars
(
$
(
"
#selectTemplate
"
).
html
(),
json
));
});
// 加载所有门店
shopUtil
.
queryAllStoreList
(
function
(
json
){
$
(
"
#mealByStoreId
"
).
html
(
getDataUseHandlebars
(
selOption
,
json
));
form
.
render
(
'
select
'
);
});
laydate
.
render
({
elem
:
'
#createTime
'
,
range
:
'
~
'
});
form
.
on
(
'
select(storeId)
'
,
function
(
data
)
{
table
.
reload
(
"
messageTable
"
,
{
page
:
{
curr
:
1
},
where
:
getTableParams
()})
});
...
...
@@ -177,16 +190,25 @@ layui.config({
if
(
isNull
(
storeId
)){
storeId
=
"
-
"
;
}
var
startTime
=
""
,
endTime
=
""
;
if
(
!
isNull
(
$
(
"
#createTime
"
).
val
())){
startTime
=
$
(
"
#createTime
"
).
val
().
split
(
'
~
'
)[
0
].
trim
()
+
'
00:00:00
'
;
endTime
=
$
(
"
#createTime
"
).
val
().
split
(
'
~
'
)[
1
].
trim
()
+
'
23:59:59
'
;
}
return
{
orderNum
:
$
(
"
#orderNum
"
).
val
(),
memberName
:
$
(
"
#memberName
"
).
val
(),
memberPhone
:
$
(
"
#memberPhone
"
).
val
(),
state
:
$
(
"
#state
"
).
val
(),
vinCode
:
$
(
"
#vinCode
"
).
val
(),
memberCarPlate
:
$
(
"
#memberCarPlate
"
).
val
(),
type
:
$
(
"
#type
"
).
val
(),
serviceTechnicianName
:
$
(
"
#serviceTechnicianName
"
).
val
(),
createName
:
$
(
"
#createName
"
).
val
(),
storeId
:
storeId
mealByStoreId
:
$
(
"
#mealByStoreId
"
).
val
(),
storeId
:
storeId
,
startTime
:
startTime
,
endTime
:
endTime
};
}
...
...
shop/src/main/resources/template/tpl/keepFitOrder/allKeepFitOrderList.html
浏览文件 @
708c1de1
...
...
@@ -35,6 +35,10 @@
<div
class=
"layui-input-inline"
>
<input
type=
"text"
id=
"memberPhone"
name=
"memberPhone"
placeholder=
"请输入会员手机号"
class=
"layui-input"
/>
</div>
<label
class=
"layui-form-label"
>
VIN码
</label>
<div
class=
"layui-input-inline"
>
<input
type=
"text"
id=
"vinCode"
name=
"vinCode"
placeholder=
"请输入VIN码"
class=
"layui-input"
/>
</div>
<label
class=
"layui-form-label"
>
订单状态
</label>
<div
class=
"layui-input-inline"
>
<select
id=
"state"
name=
"state"
lay-filter=
"state"
lay-search=
""
>
...
...
@@ -61,10 +65,20 @@
<div
class=
"layui-input-inline"
>
<input
type=
"text"
id=
"serviceTechnicianName"
name=
"serviceTechnicianName"
placeholder=
"请输入维修技师"
class=
"layui-input"
/>
</div>
<label
class=
"layui-form-label"
>
缴费门店
</label>
<div
class=
"layui-input-inline"
>
<select
id=
"mealBuyStoreId"
name=
"mealBuyStoreId"
lay-filter=
"mealBuyStoreId"
lay-search=
""
>
</select>
</div>
<label
class=
"layui-form-label"
>
车牌号
</label>
<div
class=
"layui-input-inline"
>
<input
type=
"text"
id=
"memberCarPlate"
name=
"memberCarPlate"
placeholder=
"请输入车牌号"
class=
"layui-input"
/>
</div>
<label
class=
"layui-form-label"
>
操作时间
</label>
<div
class=
"layui-input-inline"
>
<input
type=
"text"
id=
"createTime"
name=
"createTime"
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/keepFitOrder/storeKeepFitOrderList.html
浏览文件 @
708c1de1
...
...
@@ -30,6 +30,10 @@
<div
class=
"layui-input-inline"
>
<input
type=
"text"
id=
"memberPhone"
name=
"memberPhone"
placeholder=
"请输入会员手机号"
class=
"layui-input"
/>
</div>
<label
class=
"layui-form-label"
>
VIN码
</label>
<div
class=
"layui-input-inline"
>
<input
type=
"text"
id=
"vinCode"
name=
"vinCode"
placeholder=
"请输入VIN码"
class=
"layui-input"
/>
</div>
<label
class=
"layui-form-label"
>
订单状态
</label>
<div
class=
"layui-input-inline"
>
<select
id=
"state"
name=
"state"
lay-filter=
"state"
lay-search=
""
>
...
...
@@ -56,10 +60,20 @@
<div
class=
"layui-input-inline"
>
<input
type=
"text"
id=
"serviceTechnicianName"
name=
"serviceTechnicianName"
placeholder=
"请输入维修技师"
class=
"layui-input"
/>
</div>
<label
class=
"layui-form-label"
>
缴费门店
</label>
<div
class=
"layui-input-inline"
>
<select
id=
"mealByStoreId"
name=
"mealByStoreId"
lay-filter=
"mealByStoreId"
lay-search=
""
>
</select>
</div>
<label
class=
"layui-form-label"
>
车牌号
</label>
<div
class=
"layui-input-inline"
>
<input
type=
"text"
id=
"memberCarPlate"
name=
"memberCarPlate"
placeholder=
"请输入车牌号"
class=
"layui-input"
/>
</div>
<label
class=
"layui-form-label"
>
操作时间
</label>
<div
class=
"layui-input-inline"
>
<input
type=
"text"
id=
"createTime"
name=
"createTime"
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/shopUtil.js
浏览文件 @
708c1de1
...
...
@@ -214,6 +214,27 @@ var shopUtil = {
},
async
:
false
});
},
/**
* 获取所有门店列表
*
* @param callback 回执函数
*/
queryAllStoreList
:
function
(
callback
){
var
params
=
{
limit
:
1000
,
page
:
1
};
AjaxPostUtil
.
request
({
url
:
shopBasePath
+
"
store001
"
,
params
:
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录