Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
doc_wei
Skyeye
提交
2fb02aa2
S
Skyeye
项目概览
doc_wei
/
Skyeye
通知
1171
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看板
提交
2fb02aa2
编写于
7月 14, 2024
作者:
L
LAPTOP-NDCM9L6Q\王丽雅
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update:整单委外单
上级
78b1f096
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
223 addition
and
4 deletion
+223
-4
erp-produce/src/main/resources/template/js/departmentMachining/departmentMachiningList.js
...emplate/js/departmentMachining/departmentMachiningList.js
+0
-0
erp-produce/src/main/resources/template/js/wholeOut/wholeOutList.js
...e/src/main/resources/template/js/wholeOut/wholeOutList.js
+167
-0
erp-produce/src/main/resources/template/tpl/departmentMachining/departmentMachiningList.html
...late/tpl/departmentMachining/departmentMachiningList.html
+10
-0
erp-produce/src/main/resources/template/tpl/wholeOut/wholeOutList.html
...rc/main/resources/template/tpl/wholeOut/wholeOutList.html
+37
-3
erp/src/main/resources/template/js/erpcommon/loadStock.js
erp/src/main/resources/template/js/erpcommon/loadStock.js
+8
-1
web/src/main/resources/template/json/skyeyeClassEnum.json
web/src/main/resources/template/json/skyeyeClassEnum.json
+1
-0
未找到文件。
erp-produce/src/main/resources/template/js/departmentMachining/departmentMachiningList.js
0 → 100644
浏览文件 @
2fb02aa2
erp-produce/src/main/resources/template/js/wholeOut/wholeOutList.js
浏览文件 @
2fb02aa2
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
(
'
1720835673573
'
);
table
.
render
({
id
:
'
messageTable
'
,
elem
:
'
#messageTable
'
,
method
:
'
post
'
,
url
:
sysMainMation
.
erpBasePath
+
'
queryWholeOrderOutList
'
,
where
:
getTableParams
(),
even
:
true
,
page
:
true
,
limits
:
getLimits
(),
limit
:
getLimit
(),
cols
:
[[
{
title
:
systemLanguage
[
"
com.skyeye.serialNumber
"
][
languageType
],
type
:
'
numbers
'
},
{
field
:
'
oddNumber
'
,
title
:
'
生产单号
'
,
align
:
'
center
'
,
width
:
200
,
templet
:
function
(
d
)
{
return
'
<a lay-event="details" class="notice-title-click">
'
+
d
.
oddNumber
+
'
</a>
'
;
}},
{
field
:
'
salesOrderNum
'
,
width
:
200
,
title
:
'
关联销售单
'
,
align
:
'
center
'
,
templet
:
function
(
d
)
{
return
isNull
(
d
.
sealOrderMation
)
?
''
:
d
.
sealOrderMation
.
oddNumber
}},
{
field
:
'
name
'
,
title
:
'
产品名称
'
,
align
:
'
left
'
,
width
:
150
,
templet
:
function
(
d
)
{
return
isNull
(
d
.
materialMation
)
?
''
:
d
.
materialMation
.
name
}},
{
field
:
'
model
'
,
title
:
'
产品型号
'
,
align
:
'
left
'
,
width
:
150
,
templet
:
function
(
d
)
{
return
isNull
(
d
.
materialMation
)
?
''
:
d
.
materialMation
.
model
}},
{
field
:
'
norms
'
,
title
:
'
产品规格
'
,
align
:
'
left
'
,
width
:
150
,
templet
:
function
(
d
)
{
return
isNull
(
d
.
normsMation
)
?
''
:
d
.
normsMation
.
name
}},
{
field
:
'
number
'
,
width
:
100
,
title
:
'
计划生产数量
'
},
{
field
:
'
processInstanceId
'
,
title
:
'
流程ID
'
,
width
:
100
,
templet
:
function
(
d
)
{
return
'
<a lay-event="processDetails" class="notice-title-click">
'
+
getNotUndefinedVal
(
d
.
processInstanceId
)
+
'
</a>
'
;
}},
{
field
:
'
state
'
,
title
:
'
状态
'
,
width
:
90
,
templet
:
function
(
d
)
{
return
skyeyeClassEnumUtil
.
getEnumDataNameByCodeAndKey
(
"
flowableStateEnum
"
,
'
id
'
,
d
.
state
,
'
name
'
);
}},
{
field
:
'
planStartDate
'
,
width
:
150
,
align
:
'
center
'
,
title
:
'
计划开始时间
'
},
{
field
:
'
planComplateDate
'
,
width
:
150
,
align
:
'
center
'
,
title
:
'
计划结束时间
'
},
{
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
:
240
,
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
===
'
delete
'
)
{
//删除
del
(
data
,
obj
);
}
else
if
(
layEvent
===
'
edit
'
)
{
//编辑
edit
(
data
);
}
else
if
(
layEvent
===
'
details
'
)
{
//详情
details
(
data
);
}
else
if
(
layEvent
===
'
subApproval
'
)
{
//提交审核
subApproval
(
data
);
}
else
if
(
layEvent
===
'
processDetails
'
)
{
// 工作流流程详情查看
activitiUtil
.
activitiDetails
(
data
);
}
else
if
(
layEvent
===
'
revoke
'
)
{
//撤销
revoke
(
data
);
}
});
// 新增
$
(
"
body
"
).
on
(
"
click
"
,
"
#addBean
"
,
function
()
{
_openNewWindows
({
url
:
systemCommonUtil
.
getUrl
(
'
FP2024071300002
'
,
null
),
title
:
systemLanguage
[
"
com.skyeye.addPageTitle
"
][
languageType
],
pageId
:
"
erpProductionAdd
"
,
area
:
[
'
90vw
'
,
'
90vh
'
],
callBack
:
function
(
refreshCode
)
{
winui
.
window
.
msg
(
systemLanguage
[
"
com.skyeye.successfulOperation
"
][
languageType
],
{
icon
:
1
,
time
:
2000
});
loadTable
();
}});
});
// 编辑
function
edit
(
data
)
{
_openNewWindows
({
url
:
systemCommonUtil
.
getUrl
(
'
FP2024071300003&id=
'
+
data
.
id
,
null
),
title
:
systemLanguage
[
"
com.skyeye.editPageTitle
"
][
languageType
],
pageId
:
"
erpProductionEdit
"
,
area
:
[
'
90vw
'
,
'
90vh
'
],
callBack
:
function
(
refreshCode
)
{
winui
.
window
.
msg
(
systemLanguage
[
"
com.skyeye.successfulOperation
"
][
languageType
],
{
icon
:
1
,
time
:
2000
});
loadTable
();
}});
}
// 详情
function
details
(
data
)
{
_openNewWindows
({
url
:
systemCommonUtil
.
getUrl
(
'
FP2024071300004&id=
'
+
data
.
id
,
null
),
title
:
systemLanguage
[
"
com.skyeye.detailsPageTitle
"
][
languageType
],
pageId
:
"
erpProductionDetail
"
,
area
:
[
'
90vw
'
,
'
90vh
'
],
callBack
:
function
(
refreshCode
)
{
}});
}
// // 删除
// function del(data, obj) {
// layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function (index) {
// layer.close(index);
// AjaxPostUtil.request({url: sysMainMation.erpBasePath + "deleteProductionById", 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 subApproval(data) {
// layer.confirm(systemLanguage["com.skyeye.approvalOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.approvalOperation"][languageType]}, function (index) {
// layer.close(index);
// activitiUtil.startProcess(data.serviceClassName, null, function (approvalId) {
// var params = {
// id: data.id,
// approvalId: approvalId
// };
// AjaxPostUtil.request({url: sysMainMation.erpBasePath + "erpproduction007", params: params, type: 'json', method: 'POST', callback: function (json) {
// winui.window.msg("提交成功", {icon: 1, time: 2000});
// loadTable();
// }});
// });
// });
// }
// // 撤销
// function revoke(data) {
// layer.confirm('确认撤销该申请吗?', { icon: 3, title: '撤销操作' }, function (index) {
// layer.close(index);
// AjaxPostUtil.request({url: sysMainMation.erpBasePath + "revokeProduction", params: {processInstanceId: data.processInstanceId}, type: 'json', method: "PUT", callback: function (json) {
// winui.window.msg("提交成功", {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
(
'
wholeOutList
'
,
{});
});
erp-produce/src/main/resources/template/tpl/departmentMachining/departmentMachiningList.html
0 → 100644
浏览文件 @
2fb02aa2
<!DOCTYPE html>
<html
lang=
"en"
>
<head>
<meta
charset=
"UTF-8"
>
<title>
Title
</title>
</head>
<body>
</body>
</html>
erp-produce/src/main/resources/template/tpl/wholeOut/wholeOutList.html
浏览文件 @
2fb02aa2
<!DOCTYPE html>
<html
lang=
"en"
>
<html>
<head>
<meta
charset=
"UTF-8"
>
<title>
Title
</title>
<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=
"1590913527206"
><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
(
d
.
editRow
==
1
)
{
}}
{{
#
if
(
auth
(
'
1720705286166
'
))
{
}}
<
a
class
=
"
layui-btn layui-btn-xs
"
lay
-
event
=
"
subApproval
"
>
提交审批
<
/a
>
{{
#
}
}}
{{
#
if
(
auth
(
'
1590913527206
'
))
{
}}
<
a
class
=
"
layui-btn layui-btn-xs layui-btn-normal
"
lay
-
event
=
"
edit
"
><
language
showName
=
"
com.skyeye.editBtn
"
><
/language></
a
>
{{
#
}
}}
{{
#
if
(
auth
(
'
1590926876459
'
))
{
}}
<
a
class
=
"
layui-btn layui-btn-danger layui-btn-xs
"
lay
-
event
=
"
delete
"
><
language
showName
=
"
com.skyeye.deleteBtn
"
><
/language></
a
>
{{
#
}
}}
{{
#
}
}}
{{
#
if
(
d
.
editRow
==
2
)
{
}}
{{
#
if
(
auth
(
'
1696246760629
'
))
{
}}
<
a
class
=
"
layui-btn layui-btn-xs layui-btn-danger
"
lay
-
event
=
"
revoke
"
>
撤销
<
/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/wholeOut/
'
}).
use
(
'
wholeOutList
'
);
</script>
</body>
</html>
\ No newline at end of file
erp/src/main/resources/template/js/erpcommon/loadStock.js
浏览文件 @
2fb02aa2
...
...
@@ -85,8 +85,9 @@ function inTableDataArrayByAssetarId(materialId, unitId, array) {
* @param allChooseProduct 商品对象
* @param unitPriceKey 单价显示的key,不用的单据类型展示不同的商品价格类型(零售价,最低售价,销售价等)
* @param calcPriceCallback 计算价格回调的函数
* @param callback 变化回调函数
*/
function
mUnitChangeEvent
(
form
,
allChooseProduct
,
unitPriceKey
,
calcPriceCallback
)
{
function
mUnitChangeEvent
(
form
,
allChooseProduct
,
unitPriceKey
,
calcPriceCallback
,
callback
)
{
// 商品规格加载变化事件
form
.
on
(
'
select(selectUnitProperty)
'
,
function
(
data
)
{
var
thisRowValue
=
data
.
value
;
...
...
@@ -101,6 +102,9 @@ function mUnitChangeEvent(form, allChooseProduct, unitPriceKey, calcPriceCallbac
var
unitPrice
=
parseFloat
(
bean
[
unitPriceKey
]).
toFixed
(
2
);
$
(
"
#unitPrice
"
+
thisRowKey
).
val
(
unitPrice
);
$
(
"
#amountOfMoney
"
+
thisRowKey
).
val
((
rkNum
*
parseFloat
(
unitPrice
)).
toFixed
(
2
));
if
(
typeof
callback
==
"
function
"
)
{
callback
(
thisRowKey
,
bean
);
}
return
false
;
}
});
...
...
@@ -108,6 +112,9 @@ function mUnitChangeEvent(form, allChooseProduct, unitPriceKey, calcPriceCallbac
// 重置单价以及金额为空
$
(
"
#unitPrice
"
+
thisRowKey
).
val
(
"
0.00
"
);
$
(
"
#amountOfMoney
"
+
thisRowKey
).
val
(
"
0.00
"
);
if
(
typeof
callback
==
"
function
"
)
{
callback
(
thisRowKey
,
null
);
}
}
var
depotId
=
isNull
(
$
(
"
#depotId
"
).
val
())
?
""
:
$
(
"
#depotId
"
).
val
();
// 加载库存
...
...
web/src/main/resources/template/json/skyeyeClassEnum.json
浏览文件 @
2fb02aa2
...
...
@@ -83,6 +83,7 @@
"depotOutState"
:
{
"name"
:
"仓库出库单出库状态"
,
"className"
:
"skyeye-erp#com.skyeye.depot.classenum.DepotOutState"
},
"depotPutFromType"
:
{
"name"
:
"仓库入库单来源单据类型"
,
"className"
:
"skyeye-erp#com.skyeye.depot.classenum.DepotPutFromType"
},
"depotPutState"
:
{
"name"
:
"仓库入库单入库状态"
,
"className"
:
"skyeye-erp#com.skyeye.depot.classenum.DepotPutState"
},
"productionChildFromType"
:
{
"name"
:
"生产计划单子单据生产类型"
,
"className"
:
"skyeye-erp#com.skyeye.production.classenum.ProductionChildType"
},
"skyeyeView"
:
{
"name"
:
"视图类型"
,
"className"
:
"skyeye-pro#com.skyeye.common.SkyeyeViewEnum"
},
"widthScale"
:
{
"name"
:
"宽度比例"
,
"className"
:
"skyeye-pro#com.skyeye.attr.classenum.WidthScale"
},
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录