Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Skyeye云
Skyeye
提交
3f710e67
S
Skyeye
项目概览
Skyeye云
/
Skyeye
通知
1434
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看板
提交
3f710e67
编写于
4月 20, 2023
作者:
Skyeye云
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
计量单位托管到表单布局
上级
c4b23886
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
1 addition
and
389 deletion
+1
-389
common/src/main/resources/template/js/dsFormPage/editPageContentIsTable.js
...esources/template/js/dsFormPage/editPageContentIsTable.js
+1
-1
erp/src/main/resources/template/js/materialUnit/materialUnitAdd.js
...ain/resources/template/js/materialUnit/materialUnitAdd.js
+0
-57
erp/src/main/resources/template/js/materialUnit/materialUnitEdit.js
...in/resources/template/js/materialUnit/materialUnitEdit.js
+0
-78
erp/src/main/resources/template/js/materialUnit/materialUnitList.js
...in/resources/template/js/materialUnit/materialUnitList.js
+0
-108
erp/src/main/resources/template/tpl/materialUnit/materialUnitAdd.html
.../resources/template/tpl/materialUnit/materialUnitAdd.html
+0
-57
erp/src/main/resources/template/tpl/materialUnit/materialUnitEdit.html
...resources/template/tpl/materialUnit/materialUnitEdit.html
+0
-54
erp/src/main/resources/template/tpl/materialUnit/materialUnitList.html
...resources/template/tpl/materialUnit/materialUnitList.html
+0
-34
未找到文件。
common/src/main/resources/template/js/dsFormPage/editPageContentIsTable.js
浏览文件 @
3f710e67
...
...
@@ -143,7 +143,7 @@ layui.config({
$
.
each
(
tableDataList
,
function
(
i
,
item
)
{
// 限制条件
var
require
=
isNull
(
item
.
require
)
?
''
:
item
.
require
.
toString
(
);
var
require
=
isNull
(
item
.
require
)
?
''
:
(
$
.
isArray
(
item
.
require
)
?
item
.
require
.
toString
()
:
JSON
.
parse
(
item
.
require
).
toString
()
);
skyeyeClassEnumUtil
.
showEnumDataListByClassName
(
"
verificationParams
"
,
'
verificationSelect
'
,
"
require
"
+
item
.
id
,
require
,
form
,
null
,
'
formerRequirement
'
);
// 数据源
...
...
erp/src/main/resources/template/js/materialUnit/materialUnitAdd.js
已删除
100644 → 0
浏览文件 @
c4b23886
layui
.
config
({
base
:
basePath
,
version
:
skyeyeVersion
}).
extend
({
window
:
'
js/winui.window
'
}).
define
([
'
window
'
,
'
jquery
'
,
'
winui
'
],
function
(
exports
)
{
winui
.
renderColor
();
layui
.
use
([
'
form
'
],
function
(
form
)
{
var
index
=
parent
.
layer
.
getFrameIndex
(
window
.
name
);
var
$
=
layui
.
$
;
initTableChooseUtil
.
initTable
({
id
:
"
unitList
"
,
cols
:
[
{
id
:
'
name
'
,
title
:
'
单位名称
'
,
formType
:
'
input
'
,
width
:
'
80
'
,
className
:
'
change-input
'
,
verify
:
'
required
'
},
{
id
:
'
number
'
,
title
:
'
数量
'
,
formType
:
'
input
'
,
width
:
'
80
'
,
className
:
'
change-input
'
,
verify
:
'
required|number
'
}
],
deleteRowCallback
:
function
(
trcusid
)
{},
addRowCallback
:
function
(
trcusid
)
{},
form
:
form
});
matchingLanguage
();
form
.
render
();
form
.
on
(
'
submit(formAddBean)
'
,
function
(
data
)
{
if
(
winui
.
verifyForm
(
data
.
elem
))
{
var
result
=
initTableChooseUtil
.
getDataList
(
'
unitList
'
);
if
(
!
result
.
checkResult
)
{
return
false
;
}
var
dataList
=
result
.
dataList
;
$
.
each
(
result
.
dataList
,
function
(
i
,
item
)
{
item
[
"
baseUnit
"
]
=
2
;
});
dataList
.
push
({
name
:
$
(
"
#unitName
"
).
val
(),
number
:
1
,
baseUnit
:
1
});
var
params
=
{
name
:
$
(
"
#name
"
).
val
(),
unitList
:
JSON
.
stringify
(
dataList
)
};
AjaxPostUtil
.
request
({
url
:
flowableBasePath
+
"
writeMaterialUnitMation
"
,
params
:
params
,
type
:
'
json
'
,
method
:
'
POST
'
,
callback
:
function
(
json
)
{
parent
.
layer
.
close
(
index
);
parent
.
refreshCode
=
'
0
'
;
}});
}
return
false
;
});
$
(
"
body
"
).
on
(
"
click
"
,
"
#cancle
"
,
function
()
{
parent
.
layer
.
close
(
index
);
});
});
});
\ No newline at end of file
erp/src/main/resources/template/js/materialUnit/materialUnitEdit.js
已删除
100644 → 0
浏览文件 @
c4b23886
layui
.
config
({
base
:
basePath
,
version
:
skyeyeVersion
}).
extend
({
window
:
'
js/winui.window
'
}).
define
([
'
window
'
,
'
jquery
'
,
'
winui
'
],
function
(
exports
)
{
winui
.
renderColor
();
layui
.
use
([
'
form
'
],
function
(
form
)
{
var
index
=
parent
.
layer
.
getFrameIndex
(
window
.
name
);
var
$
=
layui
.
$
;
showGrid
({
id
:
"
showForm
"
,
url
:
flowableBasePath
+
"
materialunit004
"
,
params
:
{
id
:
parent
.
rowId
},
pagination
:
false
,
method
:
'
GET
'
,
template
:
$
(
"
#beanTemplate
"
).
html
(),
ajaxSendAfter
:
function
(
json
)
{
initTableChooseUtil
.
initTable
({
id
:
"
unitList
"
,
cols
:
[
{
id
:
'
name
'
,
title
:
'
单位名称
'
,
formType
:
'
input
'
,
width
:
'
80
'
,
className
:
'
change-input
'
,
verify
:
'
required
'
},
{
id
:
'
number
'
,
title
:
'
数量
'
,
formType
:
'
input
'
,
width
:
'
80
'
,
className
:
'
change-input
'
,
verify
:
'
required|number
'
}
],
deleteRowCallback
:
function
(
trcusid
)
{},
addRowCallback
:
function
(
trcusid
)
{},
form
:
form
});
initTableChooseUtil
.
deleteAllRow
(
'
unitList
'
);
$
.
each
(
json
.
bean
.
unitList
,
function
(
i
,
item
)
{
if
(
item
.
baseUnit
==
1
)
{
$
(
"
#unitName
"
).
val
(
item
.
name
);
}
if
(
item
.
baseUnit
==
2
)
{
initTableChooseUtil
.
resetData
(
'
unitList
'
,
item
);
}
});
matchingLanguage
();
form
.
render
();
form
.
on
(
'
submit(formEditBean)
'
,
function
(
data
)
{
if
(
winui
.
verifyForm
(
data
.
elem
))
{
var
result
=
initTableChooseUtil
.
getDataList
(
'
unitList
'
);
if
(
!
result
.
checkResult
)
{
return
false
;
}
var
dataList
=
result
.
dataList
;
$
.
each
(
result
.
dataList
,
function
(
i
,
item
)
{
item
[
"
baseUnit
"
]
=
2
;
});
dataList
.
push
({
name
:
$
(
"
#unitName
"
).
val
(),
number
:
1
,
baseUnit
:
1
});
var
params
=
{
name
:
$
(
"
#name
"
).
val
(),
unitList
:
JSON
.
stringify
(
dataList
),
id
:
parent
.
rowId
};
AjaxPostUtil
.
request
({
url
:
flowableBasePath
+
"
writeMaterialUnitMation
"
,
params
:
params
,
type
:
'
json
'
,
method
:
'
POST
'
,
callback
:
function
(
json
)
{
parent
.
layer
.
close
(
index
);
parent
.
refreshCode
=
'
0
'
;
}});
}
return
false
;
});
}
});
$
(
"
body
"
).
on
(
"
click
"
,
"
#cancle
"
,
function
()
{
parent
.
layer
.
close
(
index
);
});
});
});
\ No newline at end of file
erp/src/main/resources/template/js/materialUnit/materialUnitList.js
已删除
100644 → 0
浏览文件 @
c4b23886
var
rowId
=
""
;
layui
.
config
({
base
:
basePath
,
version
:
skyeyeVersion
}).
extend
({
window
:
'
js/winui.window
'
}).
define
([
'
window
'
,
'
table
'
,
'
jquery
'
,
'
winui
'
,
'
form
'
],
function
(
exports
)
{
winui
.
renderColor
();
var
$
=
layui
.
$
,
form
=
layui
.
form
,
table
=
layui
.
table
;
authBtn
(
'
1569160351079
'
);
table
.
render
({
id
:
'
messageTable
'
,
elem
:
'
#messageTable
'
,
method
:
'
post
'
,
url
:
flowableBasePath
+
'
materialunit001
'
,
where
:
getTableParams
(),
even
:
true
,
page
:
true
,
limits
:
getLimits
(),
limit
:
getLimit
(),
cols
:
[[
{
title
:
systemLanguage
[
"
com.skyeye.serialNumber
"
][
languageType
],
type
:
'
numbers
'
},
{
field
:
'
name
'
,
title
:
'
组名
'
,
align
:
'
left
'
,
width
:
120
},
{
field
:
'
unitName
'
,
title
:
'
计量单位
'
,
align
:
'
left
'
,
width
:
300
},
{
field
:
'
createName
'
,
title
:
systemLanguage
[
"
com.skyeye.createName
"
][
languageType
],
width
:
120
},
{
field
:
'
createTime
'
,
title
:
systemLanguage
[
"
com.skyeye.createTime
"
][
languageType
],
align
:
'
center
'
,
width
:
150
},
{
field
:
'
lastUpdateName
'
,
title
:
systemLanguage
[
"
com.skyeye.lastUpdateName
"
][
languageType
],
align
:
'
left
'
,
width
:
120
},
{
field
:
'
lastUpdateTime
'
,
title
:
systemLanguage
[
"
com.skyeye.lastUpdateTime
"
][
languageType
],
align
:
'
center
'
,
width
:
150
},
{
title
:
systemLanguage
[
"
com.skyeye.operation
"
][
languageType
],
fixed
:
'
right
'
,
align
:
'
center
'
,
width
:
150
,
toolbar
:
'
#tableBar
'
}
]],
done
:
function
(
json
)
{
matchingLanguage
();
initTableSearchUtil
.
initAdvancedSearch
(
this
,
json
.
searchFilter
,
form
,
"
请输入组名
"
,
function
()
{
table
.
reloadData
(
"
messageTable
"
,
{
page
:
{
curr
:
1
},
where
:
getTableParams
()});
});
}
});
table
.
on
(
'
tool(messageTable)
'
,
function
(
obj
)
{
var
data
=
obj
.
data
;
var
layEvent
=
obj
.
event
;
if
(
layEvent
===
'
edit
'
)
{
//编辑
edit
(
data
);
}
else
if
(
layEvent
===
'
delet
'
)
{
//删除
delet
(
data
);
}
});
// 添加
$
(
"
body
"
).
on
(
"
click
"
,
"
#addBean
"
,
function
()
{
_openNewWindows
({
url
:
"
../../tpl/materialUnit/materialUnitAdd.html
"
,
title
:
systemLanguage
[
"
com.skyeye.addPageTitle
"
][
languageType
],
pageId
:
"
materialUnitAdd
"
,
area
:
[
'
90vw
'
,
'
90vh
'
],
callBack
:
function
(
refreshCode
)
{
winui
.
window
.
msg
(
systemLanguage
[
"
com.skyeye.successfulOperation
"
][
languageType
],
{
icon
:
1
,
time
:
2000
});
loadTable
();
}});
});
// 删除
function
delet
(
data
)
{
layer
.
confirm
(
systemLanguage
[
"
com.skyeye.deleteOperationMsg
"
][
languageType
],
{
icon
:
3
,
title
:
systemLanguage
[
"
com.skyeye.deleteOperation
"
][
languageType
]},
function
(
index
)
{
layer
.
close
(
index
);
AjaxPostUtil
.
request
({
url
:
flowableBasePath
+
"
materialunit003
"
,
params
:
{
id
:
data
.
id
},
type
:
'
json
'
,
method
:
'
DELETE
'
,
callback
:
function
(
json
)
{
winui
.
window
.
msg
(
systemLanguage
[
"
com.skyeye.deleteOperationSuccessMsg
"
][
languageType
],
{
icon
:
1
,
time
:
2000
});
loadTable
();
}});
});
}
// 编辑
function
edit
(
data
)
{
rowId
=
data
.
id
;
_openNewWindows
({
url
:
"
../../tpl/materialUnit/materialUnitEdit.html
"
,
title
:
systemLanguage
[
"
com.skyeye.editPageTitle
"
][
languageType
],
pageId
:
"
materialUnitEdit
"
,
area
:
[
'
90vw
'
,
'
90vh
'
],
callBack
:
function
(
refreshCode
)
{
winui
.
window
.
msg
(
systemLanguage
[
"
com.skyeye.successfulOperation
"
][
languageType
],
{
icon
:
1
,
time
:
2000
});
loadTable
();
}
});
}
form
.
render
();
$
(
"
body
"
).
on
(
"
click
"
,
"
#reloadTable
"
,
function
()
{
loadTable
();
});
function
loadTable
()
{
table
.
reloadData
(
"
messageTable
"
,
{
where
:
getTableParams
()});
}
function
getTableParams
()
{
return
$
.
extend
(
true
,
{},
initTableSearchUtil
.
getSearchValue
(
"
messageTable
"
));
}
exports
(
'
materialUnitList
'
,
{});
});
erp/src/main/resources/template/tpl/materialUnit/materialUnitAdd.html
已删除
100644 → 0
浏览文件 @
c4b23886
<!DOCTYPE html>
<html>
<head>
<meta
charset=
"utf-8"
/>
<title></title>
<link
href=
"../../assets/lib/layui/css/layui.css"
rel=
"stylesheet"
/>
<link
href=
"../../assets/lib/winui/css/winui.css"
rel=
"stylesheet"
/>
</head>
<body>
<div
style=
"margin:0 auto;padding:20px;"
>
<form
class=
"layui-form"
action=
""
id=
"showForm"
autocomplete=
"off"
>
<div
class=
"layui-form-item layui-col-xs12"
>
<label
class=
"layui-form-label"
>
组名
<i
class=
"red"
>
*
</i></label>
<div
class=
"layui-input-block"
>
<input
type=
"text"
id=
"name"
name=
"name"
win-verify=
"required"
placeholder=
"请输入组名"
class=
"layui-input"
/>
</div>
</div>
<div
class=
"layui-form-item layui-col-xs12"
>
<label
class=
"layui-form-label"
>
基本单位
<i
class=
"red"
>
*
</i></label>
<div
class=
"layui-input-block"
>
<input
type=
"text"
id=
"unitName"
name=
"unitName"
win-verify=
"required"
placeholder=
"请输入基本单位"
class=
"layui-input"
/>
<div
class=
"layui-form-mid layui-word-aux"
>
基本单位应为最小度量单位
</div>
</div>
</div>
<div
class=
"layui-form-item layui-col-xs12"
>
<label
class=
"layui-form-label"
>
副单位
<i
class=
"red"
>
*
</i></label>
<div
class=
"layui-input-block"
>
<div
class=
"layui-form-mid layui-word-aux"
>
与基础单位之间的转换,例如:一箱=12瓶。
</div>
<div
class=
"layui-col-xs12"
id=
"unitList"
>
</div>
</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=
"formAddBean"
><language
showName=
"com.skyeye.save"
></language></button>
</div>
</div>
</form>
</div>
<script
type=
"text/x-handlebars-template"
id=
"beanTemplate"
>
<
tr
trcusid
=
"
{{trId}}
"
>
<
td
><
input
type
=
"
checkbox
"
rowId
=
"
{{id}}
"
lay
-
filter
=
"
checkboxProperty
"
name
=
"
tableCheckRow
"
/><
/td
>
<
td
><
input
type
=
"
text
"
class
=
"
layui-input
"
id
=
"
{{unitName}}
"
win
-
verify
=
"
required
"
placeholder
=
"
请输入副单位
"
/><
/td
>
<
td
><
input
type
=
"
text
"
class
=
"
layui-input
"
id
=
"
{{unitNum}}
"
win
-
verify
=
"
required
"
placeholder
=
"
请输入数量
"
/><
/td
>
<
td
><
span
class
=
"
baseNameShow
"
>
{{
baseName
}}
<
/span></
td
>
<
/tr
>
</script>
<script
src=
"../../assets/lib/layui/layui.js"
></script>
<script
src=
"../../assets/lib/layui/custom.js"
></script>
<script
type=
"text/javascript"
>
layui
.
config
({
base
:
'
../../js/materialUnit/
'
}).
use
(
'
materialUnitAdd
'
);
</script>
</body>
</html>
\ No newline at end of file
erp/src/main/resources/template/tpl/materialUnit/materialUnitEdit.html
已删除
100644 → 0
浏览文件 @
c4b23886
<!DOCTYPE html>
<html>
<head>
<meta
charset=
"utf-8"
/>
<title></title>
<link
href=
"../../assets/lib/layui/css/layui.css"
rel=
"stylesheet"
/>
<link
href=
"../../assets/lib/winui/css/winui.css"
rel=
"stylesheet"
/>
</head>
<body>
<div
style=
"padding:20px; margin:0 auto;"
>
<form
class=
"layui-form"
action=
""
id=
"showForm"
autocomplete=
"off"
>
</form>
</div>
<script
type=
"text/x-handlebars-template"
id=
"beanTemplate"
>
{{
#
bean
}}
<
div
class
=
"
layui-form-item layui-col-xs12
"
>
<
label
class
=
"
layui-form-label
"
>
组名
<
i
class
=
"
red
"
>*<
/i></
label
>
<
div
class
=
"
layui-input-block
"
>
<
input
type
=
"
text
"
id
=
"
name
"
name
=
"
name
"
win
-
verify
=
"
required
"
placeholder
=
"
请输入组名
"
class
=
"
layui-input
"
value
=
"
{{name}}
"
/>
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item layui-col-xs12
"
>
<
label
class
=
"
layui-form-label
"
>
基本单位
<
i
class
=
"
red
"
>*<
/i></
label
>
<
div
class
=
"
layui-input-block
"
>
<
input
type
=
"
text
"
id
=
"
unitName
"
name
=
"
unitName
"
win
-
verify
=
"
required
"
placeholder
=
"
请输入基本单位
"
class
=
"
layui-input
"
/>
<
div
class
=
"
layui-form-mid layui-word-aux
"
>
基本单位应为最小度量单位
<
/div
>
<
/div
>
<
/div
>
<
div
class
=
"
layui-form-item layui-col-xs12
"
>
<
label
class
=
"
layui-form-label
"
>
副单位
<
i
class
=
"
red
"
>*<
/i></
label
>
<
div
class
=
"
layui-input-block
"
>
<
div
class
=
"
layui-form-mid layui-word-aux
"
>
与基础单位之间的转换
,
例如
:
一箱
=
12
瓶
。
<
/div
>
<
div
class
=
"
layui-col-xs12
"
id
=
"
unitList
"
>
<
/div
>
<
/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"
>
layui
.
config
({
base
:
'
../../js/materialUnit/
'
}).
use
(
'
materialUnitEdit
'
);
</script>
</body>
</html>
\ No newline at end of file
erp/src/main/resources/template/tpl/materialUnit/materialUnitList.html
已删除
100644 → 0
浏览文件 @
c4b23886
<!DOCTYPE html>
<html>
<head>
<meta
charset=
"utf-8"
/>
<title></title>
<link
href=
"../../assets/lib/layui/css/layui.css"
rel=
"stylesheet"
/>
<link
href=
"../../assets/lib/winui/css/winui.css"
rel=
"stylesheet"
/>
</head>
<body>
<div
class=
"winui-toolbar"
>
<div
class=
"winui-tool"
>
<button
id=
"reloadTable"
class=
"winui-toolbtn search-table-btn-right"
><i
class=
"fa fa-refresh"
aria-hidden=
"true"
></i><language
showName=
"com.skyeye.refreshDataBtn"
></language></button>
<button
id=
"addBean"
class=
"winui-toolbtn search-table-btn-right"
auth=
"1569160351079"
><i
class=
"fa fa-plus"
aria-hidden=
"true"
></i><language
showName=
"com.skyeye.addBtn"
></language></button>
</div>
</div>
<div
style=
"margin:auto 10px;"
>
<table
id=
"messageTable"
lay-filter=
"messageTable"
></table>
<script
type=
"text/html"
id=
"tableBar"
>
{{
#
if
(
auth
(
'
1569160351079
'
)){
}}
<
a
class
=
"
layui-btn layui-btn-xs layui-btn-normal
"
lay
-
event
=
"
edit
"
><
language
showName
=
"
com.skyeye.editBtn
"
><
/language></
a
>
{{
#
}
}}
{{
#
if
(
auth
(
'
1569160358971
'
)){
}}
<
a
class
=
"
layui-btn layui-btn-xs layui-btn-danger
"
lay
-
event
=
"
delet
"
><
language
showName
=
"
com.skyeye.deleteBtn
"
><
/language></
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/materialUnit/
'
}).
use
(
'
materialUnitList
'
);
</script>
</body>
</html>
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录