Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
doc_wei
Skyeye
提交
18d950fc
S
Skyeye
项目概览
doc_wei
/
Skyeye
通知
1172
Star
154
Fork
127
代码
文件
提交
分支
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看板
提交
18d950fc
编写于
5月 26, 2022
作者:
doc_wei
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ERP仓库人员选择整改
上级
f89e0c97
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
81 addition
and
102 deletion
+81
-102
erp/src/main/resources/template/js/storehouse/storehouseadd.js
...rc/main/resources/template/js/storehouse/storehouseadd.js
+12
-30
erp/src/main/resources/template/js/storehouse/storehouseedit.js
...c/main/resources/template/js/storehouse/storehouseedit.js
+18
-36
erp/src/main/resources/template/tpl/storehouse/storehouseinfo.html
...ain/resources/template/tpl/storehouse/storehouseinfo.html
+1
-1
erp/src/main/resources/template/tpl/storehouse/storehouselist.html
...ain/resources/template/tpl/storehouse/storehouselist.html
+34
-34
web/src/main/resources/template/assets/lib/layui/customer/systemCommonUtil.js
...es/template/assets/lib/layui/customer/systemCommonUtil.js
+16
-1
未找到文件。
erp/src/main/resources/template/js/storehouse/storehouseadd.js
浏览文件 @
18d950fc
var
userReturnList
=
new
Array
();
//选择用户返回的集合或者进行回显的集合
var
chooseOrNotMy
=
"
1
"
;
//人员列表中是否包含自己--1.包含;其他参数不包含
var
chooseOrNotEmail
=
"
1
"
;
//人员列表中是否必须绑定邮箱--1.必须;其他参数没必要
var
checkType
=
"
1
"
;
//人员选择类型,1.多选;其他。单选
layui
.
config
({
base
:
basePath
,
version
:
skyeyeVersion
...
...
@@ -48,7 +43,7 @@ layui.config({
}
AjaxPostUtil
.
request
({
url
:
flowableBasePath
+
"
storehouse002
"
,
params
:
params
,
type
:
'
json
'
,
callback
:
function
(
json
){
if
(
json
.
returnCode
==
0
){
if
(
json
.
returnCode
==
0
)
{
parent
.
layer
.
close
(
index
);
parent
.
refreshCode
=
'
0
'
;
}
else
{
...
...
@@ -78,30 +73,17 @@ layui.config({
}
});
//仓库负责人选择
$
(
"
body
"
).
on
(
"
click
"
,
"
#principalUserIdSelPeople
"
,
function
(
e
){
userReturnList
=
[].
concat
(
chooseUser
);
_openNewWindows
({
url
:
"
../../tpl/common/sysusersel.html
"
,
title
:
"
人员选择
"
,
pageId
:
"
sysuserselpage
"
,
area
:
[
'
80vw
'
,
'
80vh
'
],
callBack
:
function
(
refreshCode
){
if
(
refreshCode
==
'
0
'
)
{
//移除所有tag
var
tags
=
$
(
'
#principal
'
).
tagEditor
(
'
getTags
'
)[
0
].
tags
;
for
(
i
=
0
;
i
<
tags
.
length
;
i
++
)
{
$
(
'
#principal
'
).
tagEditor
(
'
removeTag
'
,
tags
[
i
]);
}
chooseUser
=
[].
concat
(
userReturnList
);
//添加新的tag
$
.
each
(
chooseUser
,
function
(
i
,
item
){
$
(
'
#principal
'
).
tagEditor
(
'
addTag
'
,
item
.
name
);
});
}
else
if
(
refreshCode
==
'
-9999
'
)
{
winui
.
window
.
msg
(
systemLanguage
[
"
com.skyeye.operationFailed
"
][
languageType
],
{
icon
:
2
,
time
:
2000
});
}
}});
// 仓库负责人选择
$
(
"
body
"
).
on
(
"
click
"
,
"
#principalUserIdSelPeople
"
,
function
(
e
)
{
systemCommonUtil
.
userReturnList
=
[].
concat
(
chooseUser
);
systemCommonUtil
.
chooseOrNotMy
=
"
1
"
;
// 人员列表中是否包含自己--1.包含;其他参数不包含
systemCommonUtil
.
chooseOrNotEmail
=
"
1
"
;
// 人员列表中是否必须绑定邮箱--1.必须;其他参数没必要
systemCommonUtil
.
checkType
=
"
1
"
;
// 人员选择类型,1.多选;其他。单选
systemCommonUtil
.
openSysUserStaffChoosePage
(
function
(
staffChooseList
)
{
chooseUser
=
[].
concat
(
staffChooseList
);
// 重置数据
systemCommonUtil
.
tagEditorResetData
(
'
principal
'
,
chooseUser
);
});
});
$
(
"
body
"
).
on
(
"
click
"
,
"
#cancle
"
,
function
(){
...
...
erp/src/main/resources/template/js/storehouse/storehouseedit.js
浏览文件 @
18d950fc
var
userReturnList
=
new
Array
();
//选择用户返回的集合或者进行回显的集合
var
chooseOrNotMy
=
"
1
"
;
//人员列表中是否包含自己--1.包含;其他参数不包含
var
chooseOrNotEmail
=
"
1
"
;
//人员列表中是否必须绑定邮箱--1.必须;其他参数没必要
var
checkType
=
"
1
"
;
//人员选择类型,1.多选;其他。单选
layui
.
config
({
base
:
basePath
,
version
:
skyeyeVersion
...
...
@@ -23,17 +18,18 @@ layui.config({
url
:
flowableBasePath
+
"
storehouse003
"
,
params
:
{
rowId
:
parent
.
rowId
},
pagination
:
false
,
method
:
'
GET
'
,
template
:
$
(
"
#beanTemplate
"
).
html
(),
ajaxSendLoadBefore
:
function
(
hdb
){
ajaxSendLoadBefore
:
function
(
hdb
)
{
},
ajaxSendAfter
:
function
(
json
)
{
ajaxSendAfter
:
function
(
json
)
{
//设置是否默认
$
(
"
input:radio[name=isDefault][value=
"
+
json
.
bean
.
isDefault
+
"
]
"
).
attr
(
"
checked
"
,
true
);
//仓库负责人
var
userNames
=
[];
chooseUser
=
[].
concat
(
json
.
bean
.
chooseUser
);
$
.
each
(
chooseUser
,
function
(
i
,
item
){
$
.
each
(
chooseUser
,
function
(
i
,
item
)
{
userNames
.
push
(
item
.
name
);
});
...
...
@@ -78,7 +74,7 @@ layui.config({
};
//仓库负责人
if
(
chooseUser
.
length
>
0
&&
!
isNull
(
$
(
'
#principal
'
).
tagEditor
(
'
getTags
'
)[
0
].
tags
)){
if
(
chooseUser
.
length
>
0
&&
!
isNull
(
$
(
'
#principal
'
).
tagEditor
(
'
getTags
'
)[
0
].
tags
))
{
var
userId
=
""
;
$
.
each
(
chooseUser
,
function
(
i
,
item
)
{
userId
+=
item
.
id
+
'
,
'
;
...
...
@@ -86,11 +82,11 @@ layui.config({
params
.
principal
=
userId
;
}
AjaxPostUtil
.
request
({
url
:
flowableBasePath
+
"
storehouse005
"
,
params
:
params
,
type
:
'
json
'
,
callback
:
function
(
json
){
if
(
json
.
returnCode
==
0
){
AjaxPostUtil
.
request
({
url
:
flowableBasePath
+
"
storehouse005
"
,
params
:
params
,
type
:
'
json
'
,
callback
:
function
(
json
)
{
if
(
json
.
returnCode
==
0
)
{
parent
.
layer
.
close
(
index
);
parent
.
refreshCode
=
'
0
'
;
}
else
{
}
else
{
winui
.
window
.
msg
(
json
.
returnMessage
,
{
icon
:
2
,
time
:
2000
});
}
}});
...
...
@@ -100,30 +96,16 @@ layui.config({
}
});
//仓库负责人选择
$
(
"
body
"
).
on
(
"
click
"
,
"
#principalUserIdSelPeople
"
,
function
(
e
){
userReturnList
=
[].
concat
(
chooseUser
);
_openNewWindows
({
url
:
"
../../tpl/common/sysusersel.html
"
,
title
:
"
人员选择
"
,
pageId
:
"
sysuserselpage
"
,
area
:
[
'
80vw
'
,
'
80vh
'
],
callBack
:
function
(
refreshCode
){
if
(
refreshCode
==
'
0
'
)
{
//移除所有tag
var
tags
=
$
(
'
#principal
'
).
tagEditor
(
'
getTags
'
)[
0
].
tags
;
for
(
i
=
0
;
i
<
tags
.
length
;
i
++
)
{
$
(
'
#principal
'
).
tagEditor
(
'
removeTag
'
,
tags
[
i
]);
}
chooseUser
=
[].
concat
(
userReturnList
);
//添加新的tag
$
.
each
(
chooseUser
,
function
(
i
,
item
){
$
(
'
#principal
'
).
tagEditor
(
'
addTag
'
,
item
.
name
);
});
}
else
if
(
refreshCode
==
'
-9999
'
)
{
winui
.
window
.
msg
(
systemLanguage
[
"
com.skyeye.operationFailed
"
][
languageType
],
{
icon
:
2
,
time
:
2000
});
}
}});
// 仓库负责人选择
$
(
"
body
"
).
on
(
"
click
"
,
"
#principalUserIdSelPeople
"
,
function
(
e
)
{
systemCommonUtil
.
userReturnList
=
[].
concat
(
chooseUser
);
systemCommonUtil
.
chooseOrNotMy
=
"
1
"
;
// 人员列表中是否包含自己--1.包含;其他参数不包含
systemCommonUtil
.
chooseOrNotEmail
=
"
1
"
;
// 人员列表中是否必须绑定邮箱--1.必须;其他参数没必要
systemCommonUtil
.
checkType
=
"
1
"
;
// 人员选择类型,1.多选;其他。单选
systemCommonUtil
.
openSysUserStaffChoosePage
(
function
(
staffChooseList
)
{
// 重置数据
chooseUser
=
[].
concat
(
systemCommonUtil
.
tagEditorResetData
(
'
principal
'
,
staffChooseList
));
});
});
$
(
"
body
"
).
on
(
"
click
"
,
"
#cancle
"
,
function
(){
...
...
erp/src/main/resources/template/tpl/storehouse/storehouseinfo.html
浏览文件 @
18d950fc
...
...
@@ -41,7 +41,7 @@
<
label
class
=
"
layui-form-label
"
>
负责人
:
<
/label
>
<
div
class
=
"
layui-input-block ver-center
"
>
{{
#
each
chooseUser
}}
{{
name
}}
,
<
span
class
=
"
layui-badge layui-bg-blue skyeye-badge
"
>
{{
name
}}
<
/span
>
{{
/
each
}}
<
/div
>
<
/div
>
...
...
erp/src/main/resources/template/tpl/storehouse/storehouselist.html
浏览文件 @
18d950fc
...
...
@@ -7,45 +7,45 @@
<link
href=
"../../assets/lib/winui/css/winui.css"
rel=
"stylesheet"
/>
</head>
<body>
<div
class=
"txtcenter"
style=
"margin:0 auto;padding-top:10px;"
>
<form
class=
"layui-form layui-form-pane"
action=
""
autocomplete=
"off"
>
<div
class=
"layui-form-item"
>
<div
class=
"layui-inline"
>
<label
class=
"layui-form-label"
>
仓库名称
</label>
<div
class=
"layui-input-inline"
>
<input
type=
"text"
id=
"houseName"
name=
"houseName"
placeholder=
"请输入仓库名称"
class=
"layui-input"
/>
<div
class=
"txtcenter"
style=
"margin:0 auto;padding-top:10px;"
>
<form
class=
"layui-form layui-form-pane"
action=
""
autocomplete=
"off"
>
<div
class=
"layui-form-item"
>
<div
class=
"layui-inline"
>
<label
class=
"layui-form-label"
>
仓库名称
</label>
<div
class=
"layui-input-inline"
>
<input
type=
"text"
id=
"houseName"
name=
"houseName"
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>
<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>
</form>
</div>
<div
class=
"winui-toolbar"
>
<div
class=
"winui-tool"
>
<button
id=
"reloadTable"
class=
"winui-toolbtn"
><i
class=
"fa fa-refresh"
aria-hidden=
"true"
></i><language
showName=
"com.skyeye.refreshDataBtn"
></language></button>
<button
id=
"addBean"
class=
"winui-toolbtn"
auth=
"1568523956068"
><i
class=
"fa fa-plus"
aria-hidden=
"true"
></i>
新增仓库
</button>
</div>
</form>
</div>
<div
class=
"winui-toolbar"
>
<div
class=
"winui-tool"
>
<button
id=
"reloadTable"
class=
"winui-toolbtn"
><i
class=
"fa fa-refresh"
aria-hidden=
"true"
></i><language
showName=
"com.skyeye.refreshDataBtn"
></language></button>
<button
id=
"addBean"
class=
"winui-toolbtn"
auth=
"1568523956068"
><i
class=
"fa fa-plus"
aria-hidden=
"true"
></i>
新增仓库
</button>
</div>
</div>
<div
style=
"margin:auto 10px;"
>
<table
id=
"messageTable"
lay-filter=
"messageTable"
></table>
<div
style=
"margin:auto 10px;"
>
<table
id=
"messageTable"
lay-filter=
"messageTable"
></table>
<script
type=
"text/html"
id=
"tableBar"
>
{{
#
if
(
auth
(
'
1568524015623
'
)){
}}
<
a
class
=
"
layui-btn layui-btn-xs
"
lay
-
event
=
"
edit
"
><
language
showName
=
"
com.skyeye.editBtn
"
><
/language></
a
>
{{
#
}
}}
{{
#
if
(
auth
(
'
1568523987812
'
)){
}}
<
a
class
=
"
layui-btn layui-btn-danger layui-btn-xs
"
lay
-
event
=
"
delete
"
><
language
showName
=
"
com.skyeye.deleteBtn
"
><
/language></
a
>
{{
#
}
}}
{{
#
if
(
d
.
isDefault
==
2
&&
auth
(
'
1568526024398
'
)){
}}
<
a
class
=
"
layui-btn layui-btn-xs
"
lay
-
event
=
"
default
"
>
设置默认
<
/a
>
{{
#
}
}}
<script
type=
"text/html"
id=
"tableBar"
>
{{
#
if
(
auth
(
'
1568524015623
'
)){
}}
<
a
class
=
"
layui-btn layui-btn-xs
"
lay
-
event
=
"
edit
"
><
language
showName
=
"
com.skyeye.editBtn
"
><
/language></
a
>
{{
#
}
}}
{{
#
if
(
auth
(
'
1568523987812
'
)){
}}
<
a
class
=
"
layui-btn layui-btn-danger layui-btn-xs
"
lay
-
event
=
"
delete
"
><
language
showName
=
"
com.skyeye.deleteBtn
"
><
/language></
a
>
{{
#
}
}}
{{
#
if
(
d
.
isDefault
==
2
&&
auth
(
'
1568526024398
'
)){
}}
<
a
class
=
"
layui-btn layui-btn-xs
"
lay
-
event
=
"
default
"
>
设置默认
<
/a
>
{{
#
}
}}
</script>
</div>
<script
src=
"../../assets/lib/layui/layui.js"
></script>
<script
src=
"../../assets/lib/layui/custom.js"
></script>
<script
type=
"text/javascript"
>
layui
.
config
({
base
:
'
../../js/storehouse/
'
}).
use
(
'
storehouselist
'
);
</script>
</div>
<script
src=
"../../assets/lib/layui/layui.js"
></script>
<script
src=
"../../assets/lib/layui/custom.js"
></script>
<script
type=
"text/javascript"
>
layui
.
config
({
base
:
'
../../js/storehouse/
'
}).
use
(
'
storehouselist
'
);
</script>
</body>
</html>
\ No newline at end of file
web/src/main/resources/template/assets/lib/layui/customer/systemCommonUtil.js
浏览文件 @
18d950fc
...
...
@@ -283,13 +283,28 @@ var systemCommonUtil = {
*
* @param id 对象id
*/
tagEditorRemoveAll
:
function
(
id
){
tagEditorRemoveAll
:
function
(
id
)
{
var
tags
=
$
(
'
#
'
+
id
).
tagEditor
(
'
getTags
'
)[
0
].
tags
;
for
(
i
=
0
;
i
<
tags
.
length
;
i
++
)
{
$
(
'
#
'
+
id
).
tagEditor
(
'
removeTag
'
,
tags
[
i
]);
}
},
/**
* tagEditor组件重置数据
*
* @param id 对象id
*/
tagEditorResetData
:
function
(
id
,
data
)
{
// 移除所有tag
systemCommonUtil
.
tagEditorRemoveAll
(
id
);
// 添加新的tag
$
.
each
(
data
,
function
(
i
,
item
){
$
(
'
#
'
+
id
).
tagEditor
(
'
addTag
'
,
item
.
name
);
});
return
data
;
},
/**
* 表格禁止指定行数据选择
*
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录