Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Skyeye云
Skyeye
提交
a201214d
S
Skyeye
项目概览
Skyeye云
/
Skyeye
通知
1433
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看板
提交
a201214d
编写于
8月 09, 2022
作者:
W
weizhiqiang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
【ADM】用品管理功能整改
上级
56e2dbef
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
169 addition
and
161 deletion
+169
-161
admin-assistant/src/main/resources/template/js/assetArticles/assetArticlesAdd.js
...n/resources/template/js/assetArticles/assetArticlesAdd.js
+1
-1
admin-assistant/src/main/resources/template/js/assetArticles/assetArticlesDetails.js
...sources/template/js/assetArticles/assetArticlesDetails.js
+2
-2
admin-assistant/src/main/resources/template/js/assetArticles/assetArticlesEdit.js
.../resources/template/js/assetArticles/assetArticlesEdit.js
+7
-7
admin-assistant/src/main/resources/template/tpl/assetArticles/assetArticlesDetails.html
...rces/template/tpl/assetArticles/assetArticlesDetails.html
+89
-0
admin-assistant/src/main/resources/template/tpl/assetArticles/assetArticlesDetailsTemplate.tpl
...mplate/tpl/assetArticles/assetArticlesDetailsTemplate.tpl
+0
-85
admin-assistant/src/main/resources/template/tpl/assetArticles/assetArticlesEdit.html
...sources/template/tpl/assetArticles/assetArticlesEdit.html
+69
-0
admin-assistant/src/main/resources/template/tpl/assetArticles/assetArticlesEditTemplate.tpl
.../template/tpl/assetArticles/assetArticlesEditTemplate.tpl
+0
-65
admin-assistant/src/main/resources/template/tpl/assetArticles/assetArticlesList.html
...sources/template/tpl/assetArticles/assetArticlesList.html
+1
-1
未找到文件。
admin-assistant/src/main/resources/template/js/assetArticles/assetArticlesAdd.js
浏览文件 @
a201214d
...
...
@@ -32,7 +32,7 @@ layui.config({
enclosureInfo
:
skyeyeEnclosure
.
getEnclosureIdsByBoxId
(
'
enclosureUpload
'
),
assetAdmin
:
systemCommonUtil
.
tagEditorGetItemData
(
'
assetAdmin
'
,
userList
)
};
AjaxPostUtil
.
request
({
url
:
flowableBasePath
+
"
assetarticles011
"
,
params
:
params
,
type
:
'
json
'
,
callback
:
function
(
json
)
{
AjaxPostUtil
.
request
({
url
:
flowableBasePath
+
"
writeAssetArticlesMation
"
,
params
:
params
,
type
:
'
json
'
,
method
:
"
POST
"
,
callback
:
function
(
json
)
{
parent
.
layer
.
close
(
index
);
parent
.
refreshCode
=
'
0
'
;
}});
...
...
admin-assistant/src/main/resources/template/js/assetArticles/assetArticlesDetails.js
浏览文件 @
a201214d
...
...
@@ -13,9 +13,9 @@ layui.config({
showGrid
({
id
:
"
showForm
"
,
url
:
flowableBasePath
+
"
assetarticles013
"
,
params
:
{
rowId
:
parent
.
rowId
},
params
:
{
rowId
:
parent
.
rowId
},
pagination
:
false
,
template
:
getFileContent
(
'
tpl/assetArticles/assetArticlesDetailsTemplate.tpl
'
),
template
:
$
(
"
#beanTemplate
"
).
html
(
),
ajaxSendLoadBefore
:
function
(
hdb
){
},
ajaxSendAfter
:
function
(
json
)
{
...
...
admin-assistant/src/main/resources/template/js/assetArticles/assetArticlesEdit.js
浏览文件 @
a201214d
...
...
@@ -18,10 +18,10 @@ layui.config({
url
:
flowableBasePath
+
"
assetarticles015
"
,
params
:
{
rowId
:
parent
.
rowId
},
pagination
:
false
,
template
:
getFileContent
(
'
tpl/assetArticles/assetArticlesEditTemplate.tpl
'
),
ajaxSendLoadBefore
:
function
(
hdb
){
hdb
.
registerHelper
(
"
compare1
"
,
function
(
v1
,
options
){
if
(
isNull
(
v1
))
{
template
:
$
(
"
#beanTemplate
"
).
html
(
),
ajaxSendLoadBefore
:
function
(
hdb
)
{
hdb
.
registerHelper
(
"
compare1
"
,
function
(
v1
,
options
)
{
if
(
isNull
(
v1
))
{
return
path
+
"
assets/img/uploadPic.png
"
;
}
else
{
return
basePath
+
v1
;
...
...
@@ -54,19 +54,19 @@ layui.config({
form
.
on
(
'
submit(formEditBean)
'
,
function
(
data
)
{
if
(
winui
.
verifyForm
(
data
.
elem
))
{
var
params
=
{
rowI
d
:
parent
.
rowId
,
i
d
:
parent
.
rowId
,
articlesName
:
$
(
"
#articlesName
"
).
val
(),
typeId
:
$
(
"
#typeId
"
).
val
(),
specifications
:
$
(
"
#specifications
"
).
val
(),
unitOfMeasurement
:
$
(
"
#unitOfMeasurement
"
).
val
(),
initialNum
:
$
(
"
#initialNum
"
).
val
()
,
initialNum
:
json
.
bean
.
initialNum
,
residualNum
:
$
(
"
#residualNum
"
).
val
(),
storageArea
:
$
(
"
#storageArea
"
).
val
(),
roomAddDesc
:
$
(
"
#roomAddDesc
"
).
val
(),
enclosureInfo
:
skyeyeEnclosure
.
getEnclosureIdsByBoxId
(
'
enclosureUpload
'
),
assetAdmin
:
systemCommonUtil
.
tagEditorGetItemData
(
'
assetAdmin
'
,
userList
)
};
AjaxPostUtil
.
request
({
url
:
flowableBasePath
+
"
assetarticles016
"
,
params
:
params
,
type
:
'
json
'
,
callback
:
function
(
json
)
{
AjaxPostUtil
.
request
({
url
:
flowableBasePath
+
"
writeAssetArticlesMation
"
,
params
:
params
,
type
:
'
json
'
,
method
:
"
POST
"
,
callback
:
function
(
json
)
{
parent
.
layer
.
close
(
index
);
parent
.
refreshCode
=
'
0
'
;
}});
...
...
admin-assistant/src/main/resources/template/tpl/assetArticles/assetArticlesDetails.html
浏览文件 @
a201214d
...
...
@@ -12,6 +12,95 @@
</form>
</div>
<script
type=
"text/x-handlebars-template"
id=
"beanTemplate"
>
{{
#
bean
}}
<
div
class
=
"
layui-form-item
"
>
<
label
class
=
"
layui-form-label
"
>
名称
:
<
/label
>
<
div
class
=
"
layui-input-block ver-center
"
>
{{
articlesName
}}
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item
"
>
<
label
class
=
"
layui-form-label
"
>
类别
:
<
/label
>
<
div
class
=
"
layui-input-block ver-center
"
>
{{
typeName
}}
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item
"
>
<
label
class
=
"
layui-form-label
"
>
编号
:
<
/label
>
<
div
class
=
"
layui-input-block ver-center
"
>
{{
articlesNum
}}
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item
"
>
<
label
class
=
"
layui-form-label
"
>
规格
:
<
/label
>
<
div
class
=
"
layui-input-block ver-center
"
>
{{
specifications
}}
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item
"
>
<
label
class
=
"
layui-form-label
"
>
计量单位
:
<
/label
>
<
div
class
=
"
layui-input-block ver-center
"
>
{{
unitOfMeasurement
}}
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item
"
>
<
label
class
=
"
layui-form-label
"
>
初始化数量
:
<
/label
>
<
div
class
=
"
layui-input-block ver-center
"
>
{{
initialNum
}}
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item
"
>
<
label
class
=
"
layui-form-label
"
>
当前数量
:
<
/label
>
<
div
class
=
"
layui-input-block ver-center
"
>
{{
residualNum
}}
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item
"
>
<
label
class
=
"
layui-form-label
"
>
存放区域
:
<
/label
>
<
div
class
=
"
layui-input-block ver-center
"
>
{{
storageArea
}}
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item
"
>
<
label
class
=
"
layui-form-label
"
>
管理人
:
<
/label
>
<
div
class
=
"
layui-input-block ver-center
"
>
{{
assetAdmin
}}
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item
"
>
<
label
class
=
"
layui-form-label
"
>
相关描述
:
<
/label
>
<
div
class
=
"
layui-input-block ver-center
"
>
{{
roomAddDesc
}}
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item
"
>
<
label
class
=
"
layui-form-label
"
>
相关附件
:
<
/label
>
<
div
class
=
"
layui-input-block ver-center
"
id
=
"
enclosureUploadBtn
"
>
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item
"
>
<
label
class
=
"
layui-form-label
"
>
所属公司
:
<
/label
>
<
div
class
=
"
layui-input-block ver-center
"
>
{{
company
}}
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item
"
>
<
label
class
=
"
layui-form-label
"
>
创建人
:
<
/label
>
<
div
class
=
"
layui-input-block ver-center
"
>
{{
createName
}}
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item
"
>
<
label
class
=
"
layui-form-label
"
>
创建时间
:
<
/label
>
<
div
class
=
"
layui-input-block ver-center
"
>
{{
createTime
}}
<
/div
>
<
/div
>
{{
/
bean
}}
</script>
<script
src=
"../../assets/lib/layui/layui.js"
></script>
<script
src=
"../../assets/lib/layui/custom.js"
></script>
<script
type=
"text/javascript"
>
...
...
admin-assistant/src/main/resources/template/tpl/assetArticles/assetArticlesDetailsTemplate.tpl
已删除
100644 → 0
浏览文件 @
56e2dbef
{{
#
bean
}}
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
名称:
</label>
<div
class=
"layui-input-block ver-center"
>
{
{
articlesName
}
}
</div>
</div>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
类别:
</label>
<div
class=
"layui-input-block ver-center"
>
{
{
typeName
}
}
</div>
</div>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
编号:
</label>
<div
class=
"layui-input-block ver-center"
>
{
{
articlesNum
}
}
</div>
</div>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
规格:
</label>
<div
class=
"layui-input-block ver-center"
>
{
{
specifications
}
}
</div>
</div>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
计量单位:
</label>
<div
class=
"layui-input-block ver-center"
>
{
{
unitOfMeasurement
}
}
</div>
</div>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
初始化数量:
</label>
<div
class=
"layui-input-block ver-center"
>
{
{
initialNum
}
}
</div>
</div>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
当前数量:
</label>
<div
class=
"layui-input-block ver-center"
>
{
{
residualNum
}
}
</div>
</div>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
存放区域:
</label>
<div
class=
"layui-input-block ver-center"
>
{
{
storageArea
}
}
</div>
</div>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
管理人:
</label>
<div
class=
"layui-input-block ver-center"
>
{
{
assetAdmin
}
}
</div>
</div>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
相关描述:
</label>
<div
class=
"layui-input-block ver-center"
>
{
{
roomAddDesc
}
}
</div>
</div>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
相关附件:
</label>
<div
class=
"layui-input-block ver-center"
id=
"enclosureUploadBtn"
>
</div>
</div>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
所属公司:
</label>
<div
class=
"layui-input-block ver-center"
>
{
{
company
}
}
</div>
</div>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
创建人:
</label>
<div
class=
"layui-input-block ver-center"
>
{
{
createName
}
}
</div>
</div>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
创建时间:
</label>
<div
class=
"layui-input-block ver-center"
>
{
{
createTime
}
}
</div>
</div>
{
{/
bean
}
}
\ No newline at end of file
admin-assistant/src/main/resources/template/tpl/assetArticles/assetArticlesEdit.html
浏览文件 @
a201214d
...
...
@@ -12,6 +12,75 @@
</form>
</div>
<script
type=
"text/x-handlebars-template"
id=
"beanTemplate"
>
{{
#
bean
}}
<
div
class
=
"
layui-form-item
"
>
<
label
class
=
"
layui-form-label
"
>
名称
<
i
class
=
"
red
"
>*<
/i></
label
>
<
div
class
=
"
layui-input-block
"
>
<
input
type
=
"
text
"
id
=
"
articlesName
"
name
=
"
articlesName
"
win
-
verify
=
"
required
"
placeholder
=
"
请输入用品名称
"
class
=
"
layui-input
"
value
=
"
{{articlesName}}
"
/>
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item
"
>
<
label
class
=
"
layui-form-label
"
>
用品类别
<
i
class
=
"
red
"
>*<
/i></
label
>
<
div
class
=
"
layui-input-block
"
>
<
select
lay
-
filter
=
"
typeId
"
lay
-
search
=
""
id
=
"
typeId
"
win
-
verify
=
"
required
"
>
<
/select
>
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item
"
>
<
label
class
=
"
layui-form-label
"
>
规格
<
/label
>
<
div
class
=
"
layui-input-block
"
>
<
input
type
=
"
text
"
id
=
"
specifications
"
name
=
"
specifications
"
placeholder
=
"
请输入用品规格
"
class
=
"
layui-input
"
value
=
"
{{specifications}}
"
/>
<
div
class
=
"
layui-form-mid layui-word-aux
"
>
例如
:
投影仪
、
白板
、
录影设备等
<
/div
>
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item
"
>
<
label
class
=
"
layui-form-label
"
>
计量单位
<
i
class
=
"
red
"
>*<
/i></
label
>
<
div
class
=
"
layui-input-block
"
>
<
input
type
=
"
text
"
id
=
"
unitOfMeasurement
"
name
=
"
unitOfMeasurement
"
win
-
verify
=
"
required
"
placeholder
=
"
请输入计量单位,如:厘米,千克,本,个等
"
class
=
"
layui-input
"
value
=
"
{{unitOfMeasurement}}
"
/>
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item
"
>
<
label
class
=
"
layui-form-label
"
>
初始化数量
<
/label
>
<
div
class
=
"
layui-input-block ver-center
"
>
{{
initialNum
}}
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item
"
>
<
label
class
=
"
layui-form-label
"
>
存放区域
<
/label
>
<
div
class
=
"
layui-input-block
"
>
<
input
type
=
"
text
"
id
=
"
storageArea
"
name
=
"
storageArea
"
placeholder
=
"
请输入用品的存放区域
"
class
=
"
layui-input
"
value
=
"
{{storageArea}}
"
/>
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item
"
>
<
label
class
=
"
layui-form-label
"
>
管理人
<
/label
>
<
div
class
=
"
layui-input-block
"
>
<
input
type
=
"
text
"
id
=
"
assetAdmin
"
name
=
"
assetAdmin
"
placeholder
=
"
请选择用品管理人
"
class
=
"
layui-input
"
/>
<
i
class
=
"
fa fa-user-plus input-icon
"
id
=
"
userNameSelPeople
"
><
/i
>
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item
"
>
<
label
class
=
"
layui-form-label
"
>
相关描述
<
/label
>
<
div
class
=
"
layui-input-block
"
>
<
textarea
id
=
"
roomAddDesc
"
name
=
"
roomAddDesc
"
placeholder
=
"
请输入用品相关描述
"
class
=
"
layui-textarea
"
style
=
"
height: 100px;
"
maxlength
=
"
200
"
>
{{
roomAddDesc
}}
<
/textarea
>
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item
"
>
<
label
class
=
"
layui-form-label
"
>
相关附件
<
/label
>
<
div
class
=
"
layui-input-block
"
id
=
"
enclosureUpload
"
>
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item layui-col-xs12
"
>
<
div
class
=
"
layui-input-block
"
>
<
button
class
=
"
winui-btn
"
id
=
"
cancle
"
><
language
showName
=
"
com.skyeye.cancel
"
><
/language></
button
>
<
button
class
=
"
winui-btn
"
lay
-
submit
lay
-
filter
=
"
formEditBean
"
><
language
showName
=
"
com.skyeye.save
"
><
/language></
button
>
<
/div
>
<
/div
>
{{
/
bean
}}
</script>
<script
src=
"../../assets/lib/layui/layui.js"
></script>
<script
src=
"../../assets/lib/layui/custom.js"
></script>
<script
type=
"text/javascript"
>
...
...
admin-assistant/src/main/resources/template/tpl/assetArticles/assetArticlesEditTemplate.tpl
已删除
100644 → 0
浏览文件 @
56e2dbef
{{
#
bean
}}
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
名称
<i
class=
"red"
>
*
</i></label>
<div
class=
"layui-input-block"
>
<input
type=
"text"
id=
"articlesName"
name=
"articlesName"
win-verify=
"required"
placeholder=
"请输入用品名称"
class=
"layui-input"
value=
"{
{
articlesName
}
}"
/>
</div>
</div>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
用品类别
<i
class=
"red"
>
*
</i></label>
<div
class=
"layui-input-block"
>
<select
lay-filter=
"typeId"
lay-search=
""
id=
"typeId"
win-verify=
"required"
>
</select>
</div>
</div>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
规格
</label>
<div
class=
"layui-input-block"
>
<input
type=
"text"
id=
"specifications"
name=
"specifications"
placeholder=
"请输入用品规格"
class=
"layui-input"
value=
"{
{
specifications
}
}"
/>
<div
class=
"layui-form-mid layui-word-aux"
>
例如:投影仪、白板、录影设备等
</div>
</div>
</div>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
计量单位
<i
class=
"red"
>
*
</i></label>
<div
class=
"layui-input-block"
>
<input
type=
"text"
id=
"unitOfMeasurement"
name=
"unitOfMeasurement"
win-verify=
"required"
placeholder=
"请输入计量单位,如:厘米,千克,本,个等"
class=
"layui-input"
value=
"{
{
unitOfMeasurement
}
}"
/>
</div>
</div>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
初始化数量
</label>
<div
class=
"layui-input-block ver-center"
>
{
{
initialNum
}
}
</div>
</div>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
存放区域
</label>
<div
class=
"layui-input-block"
>
<input
type=
"text"
id=
"storageArea"
name=
"storageArea"
placeholder=
"请输入用品的存放区域"
class=
"layui-input"
value=
"{
{
storageArea
}
}"
/>
</div>
</div>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
管理人
</label>
<div
class=
"layui-input-block"
>
<input
type=
"text"
id=
"assetAdmin"
name=
"assetAdmin"
placeholder=
"请选择用品管理人"
class=
"layui-input"
/>
<i
class=
"fa fa-user-plus input-icon"
id=
"userNameSelPeople"
></i>
</div>
</div>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
相关描述
</label>
<div
class=
"layui-input-block"
>
<textarea
id=
"roomAddDesc"
name=
"roomAddDesc"
placeholder=
"请输入用品相关描述"
class=
"layui-textarea"
style=
"height: 100px;"
maxlength=
"200"
>
{
{
roomAddDesc
}
}
</textarea>
</div>
</div>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
相关附件
</label>
<div
class=
"layui-input-block"
id=
"enclosureUpload"
>
</div>
</div>
<div
class=
"layui-form-item layui-col-xs12"
>
<div
class=
"layui-input-block"
>
<button
class=
"winui-btn"
id=
"cancle"
><language
showName=
"com.skyeye.cancel"
></language></button>
<button
class=
"winui-btn"
lay-submit
lay-filter=
"formEditBean"
><language
showName=
"com.skyeye.save"
></language></button>
</div>
</div>
{
{/
bean
}
}
\ No newline at end of file
admin-assistant/src/main/resources/template/tpl/assetArticles/assetArticlesList.html
浏览文件 @
a201214d
...
...
@@ -37,7 +37,7 @@
<div
style=
"margin:auto 10px;"
>
<table
id=
"liebiaoTable"
lay-filter=
"liebiaoTable"
></table>
<script
type=
"text/html"
id=
"liebiaoTableBar"
>
{{
#
if
(
auth
(
'
15658373
9298
7
'
)){
}}
{{
#
if
(
auth
(
'
15658373
1081
7
'
)){
}}
<
a
class
=
"
layui-btn layui-btn-xs
"
lay
-
event
=
"
liebiaoEdit
"
><
language
showName
=
"
com.skyeye.editBtn
"
><
/language></
a
>
{{
#
}
}}
{{
#
if
(
auth
(
'
1565837373353
'
)){
}}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录