Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
doc_wei
Skyeye
提交
b604b3f8
S
Skyeye
项目概览
doc_wei
/
Skyeye
通知
1168
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看板
提交
b604b3f8
编写于
6月 15, 2024
作者:
L
LAPTOP-UV1MNL38\18023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat:新增质检单列表
上级
5b60e126
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
264 addition
and
7 deletion
+264
-7
erp/src/main/resources/template/js/purchaseDeliveryNote/deliveryToQualityInspection.js
...te/js/purchaseDeliveryNote/deliveryToQualityInspection.js
+53
-0
erp/src/main/resources/template/js/purchaseQualityInspection/purchaseQualityInspectionList.js
...urchaseQualityInspection/purchaseQualityInspectionList.js
+148
-0
erp/src/main/resources/template/tpl/purchaseDeliveryNote/deliveryToQualityInspection.html
...tpl/purchaseDeliveryNote/deliveryToQualityInspection.html
+21
-2
erp/src/main/resources/template/tpl/purchaseQualityInspection/purchaseQualityInspectionList.html
...chaseQualityInspection/purchaseQualityInspectionList.html
+37
-3
web/src/main/resources/template/js/common/sysusersel.js
web/src/main/resources/template/js/common/sysusersel.js
+1
-1
web/src/main/resources/template/json/skyeyeClassEnum.json
web/src/main/resources/template/json/skyeyeClassEnum.json
+3
-1
web/src/main/resources/template/json/sysServiceMation.json
web/src/main/resources/template/json/sysServiceMation.json
+1
-0
未找到文件。
erp/src/main/resources/template/js/purchaseDeliveryNote/deliveryToQualityInspection.js
浏览文件 @
b604b3f8
// 以下两个参数开启团队权限时有值
var
objectId
=
''
,
objectKey
=
''
;
// 根据以下两个参数判断:工作流的判断是否要根据serviceClassName的判断
var
serviceClassName
;
layui
.
config
({
base
:
basePath
,
version
:
skyeyeVersion
}).
extend
({
window
:
'
js/winui.window
'
}).
define
([
'
window
'
,
'
table
'
,
'
jquery
'
],
function
(
exports
)
{
winui
.
renderColor
();
var
index
=
parent
.
layer
.
getFrameIndex
(
window
.
name
);
var
$
=
layui
.
$
;
var
id
=
GetUrlParam
(
"
id
"
);
// 到货单转质检单
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
erpBasePath
+
"
queryPurchaseDeliveryTransById
"
,
params
:
{
id
:
id
},
type
:
'
json
'
,
method
:
'
GET
'
,
callback
:
function
(
json
)
{
let
data
=
json
.
bean
;
// 采购质检的【编辑布局】
data
.
qualityInspectionItemList
=
data
.
erpOrderItemList
dsFormUtil
.
initEditPageForStatic
(
'
content
'
,
'
FP2024061300002
'
,
data
,
{
savePreParams
:
function
(
params
)
{
},
saveData
:
function
(
params
)
{
// 保存数据
AjaxPostUtil
.
request
({
url
:
sysMainMation
.
erpBasePath
+
"
deliveryToQualityInspection
"
,
params
:
params
,
type
:
'
json
'
,
method
:
"
POST
"
,
callback
:
function
(
json
)
{
parent
.
layer
.
close
(
index
);
parent
.
refreshCode
=
'
0
'
;
}});
},
loadComponentCallback
:
function
()
{
$
(
"
div[controlType='supplier']
"
).
remove
();
$
(
"
div[controlType='purchaseOrderFromType']
"
).
remove
();
},
tableAddRowCallback
:
function
(
tableId
)
{
$
(
"
#addRow
"
+
tableId
).
remove
();
$
(
"
div[controlType='simpleTable']
"
).
find
(
"
.unitPrice
"
).
prop
(
'
disabled
'
,
true
);
$
(
"
div[controlType='simpleTable']
"
).
find
(
"
.amountOfMoney
"
).
prop
(
'
disabled
'
,
true
);
$
(
"
div[controlType='simpleTable']
"
).
find
(
"
.taxRate
"
).
prop
(
'
disabled
'
,
true
);
$
(
"
div[controlType='simpleTable']
"
).
find
(
"
.taxMoney
"
).
prop
(
'
disabled
'
,
true
);
$
(
"
div[controlType='simpleTable']
"
).
find
(
"
.taxUnitPrice
"
).
prop
(
'
disabled
'
,
true
);
$
(
"
div[controlType='simpleTable']
"
).
find
(
"
.taxLastMoney
"
).
prop
(
'
disabled
'
,
true
);
$
(
"
div[controlType='simpleTable']
"
).
find
(
"
.chooseProductBtn
"
).
prop
(
'
disabled
'
,
true
);
$
(
"
div[controlType='simpleTable']
"
).
find
(
"
.normsId
"
).
prop
(
'
disabled
'
,
true
);
}
});
}});
});
\ No newline at end of file
erp/src/main/resources/template/js/purchaseQualityInspection/purchaseQualityInspectionList.js
浏览文件 @
b604b3f8
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
;
var
serviceClassName
=
sysServiceMation
[
"
purchaseQualityInspection
"
][
"
key
"
];
authBtn
(
'
1718282987406
'
);
//新增
table
.
render
({
id
:
'
messageTable
'
,
elem
:
'
#messageTable
'
,
method
:
'
post
'
,
url
:
sysMainMation
.
erpBasePath
+
'
queryQualityInspectionList
'
,
where
:
getTableParams
(),
even
:
true
,
page
:
true
,
limits
:
getLimits
(),
limit
:
getLimit
(),
cols
:
[[
{
title
:
systemLanguage
[
"
com.skyeye.serialNumber
"
][
languageType
],
type
:
'
numbers
'
,
rowspan
:
'
2
'
},
{
field
:
'
oddNumber
'
,
title
:
'
单号
'
,
rowspan
:
'
2
'
,
width
:
200
,
align
:
'
center
'
,
templet
:
function
(
d
)
{
return
'
<a lay-event="details" class="notice-title-click">
'
+
d
.
oddNumber
+
'
</a>
'
;
if
(
!
isNull
(
d
.
fromId
))
{
str
+=
'
<span class="state-new">[转]</span>
'
;
}
return
str
;
}},
{
field
:
'
holderMation
'
,
title
:
'
供应商
'
,
rowspan
:
'
2
'
,
align
:
'
left
'
,
width
:
150
,
templet
:
function
(
d
)
{
return
getNotUndefinedVal
(
d
.
holderMation
?.
name
);
}},
{
field
:
'
totalPrice
'
,
title
:
'
合计金额
'
,
rowspan
:
'
2
'
,
align
:
'
left
'
,
width
:
120
},
{
field
:
'
operTime
'
,
title
:
'
单据日期
'
,
rowspan
:
'
2
'
,
align
:
'
center
'
,
width
:
140
},
{
colspan
:
'
2
'
,
title
:
'
来源单据信息
'
,
align
:
'
center
'
},
{
field
:
'
processInstanceId
'
,
title
:
'
流程ID
'
,
rowspan
:
'
2
'
,
width
:
100
,
templet
:
function
(
d
)
{
return
'
<a lay-event="processDetails" class="notice-title-click">
'
+
getNotUndefinedVal
(
d
.
processInstanceId
)
+
'
</a>
'
;
}},
{
field
:
'
state
'
,
title
:
'
状态
'
,
rowspan
:
'
2
'
,
width
:
90
,
templet
:
function
(
d
)
{
return
skyeyeClassEnumUtil
.
getEnumDataNameByCodeAndKey
(
"
erpOrderStateEnum
"
,
'
id
'
,
d
.
state
,
'
name
'
);
}},
{
field
:
'
returnState
'
,
title
:
'
退货状态
'
,
rowspan
:
'
2
'
,
width
:
90
,
templet
:
function
(
d
)
{
return
skyeyeClassEnumUtil
.
getEnumDataNameByCodeAndKey
(
"
qualityInspectionReturnState
"
,
'
id
'
,
d
.
returnState
,
'
name
'
);
}},
{
field
:
'
putState
'
,
title
:
'
入库状态
'
,
rowspan
:
'
2
'
,
width
:
150
,
templet
:
function
(
d
)
{
return
skyeyeClassEnumUtil
.
getEnumDataNameByCodeAndKey
(
"
qualityInspectionPutState
"
,
'
id
'
,
d
.
putState
,
'
name
'
);
}},
{
field
:
'
createName
'
,
title
:
systemLanguage
[
"
com.skyeye.createName
"
][
languageType
],
rowspan
:
'
2
'
,
width
:
120
},
{
field
:
'
createTime
'
,
title
:
systemLanguage
[
"
com.skyeye.createTime
"
][
languageType
],
rowspan
:
'
2
'
,
align
:
'
center
'
,
width
:
150
},
{
field
:
'
lastUpdateName
'
,
title
:
systemLanguage
[
"
com.skyeye.lastUpdateName
"
][
languageType
],
rowspan
:
'
2
'
,
align
:
'
left
'
,
width
:
120
},
{
field
:
'
lastUpdateTime
'
,
title
:
systemLanguage
[
"
com.skyeye.lastUpdateTime
"
][
languageType
],
rowspan
:
'
2
'
,
align
:
'
center
'
,
width
:
150
},
{
title
:
systemLanguage
[
"
com.skyeye.operation
"
][
languageType
],
rowspan
:
'
2
'
,
fixed
:
'
right
'
,
align
:
'
center
'
,
width
:
200
,
toolbar
:
'
#tableBar
'
}
],
[
{
field
:
'
fromTypeId
'
,
title
:
'
来源类型
'
,
width
:
150
,
templet
:
function
(
d
)
{
return
skyeyeClassEnumUtil
.
getEnumDataNameByCodeAndKey
(
"
purchaseOrderFromType
"
,
'
id
'
,
d
.
fromTypeId
,
'
name
'
);
}},
{
field
:
'
fromId
'
,
title
:
'
单据编号
'
,
width
:
200
,
templet
:
function
(
d
)
{
return
getNotUndefinedVal
(
d
.
fromMation
?.
oddNumber
);
}}
]],
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
'
)
{
//删除
erpOrderUtil
.
deleteOrderMation
(
data
.
id
,
serviceClassName
,
function
()
{
loadTable
();
});
}
else
if
(
layEvent
===
'
details
'
)
{
//详情
details
(
data
);
}
else
if
(
layEvent
===
'
edit
'
)
{
//编辑
edit
(
data
);
}
else
if
(
layEvent
===
'
subApproval
'
)
{
//提交审核
erpOrderUtil
.
submitOrderMation
(
data
.
id
,
serviceClassName
,
function
()
{
loadTable
();
});
}
else
if
(
layEvent
===
'
processDetails
'
)
{
// 工作流流程详情查看
activitiUtil
.
activitiDetails
(
data
);
}
else
if
(
layEvent
===
'
revoke
'
)
{
//撤销
erpOrderUtil
.
revokeOrderMation
(
data
.
processInstanceId
,
serviceClassName
,
function
()
{
loadTable
();
});
}
});
// 添加
$
(
"
body
"
).
on
(
"
click
"
,
"
#addBean
"
,
function
()
{
_openNewWindows
({
url
:
systemCommonUtil
.
getUrl
(
'
FP2024061300001
'
,
null
),
title
:
systemLanguage
[
"
com.skyeye.addPageTitle
"
][
languageType
],
pageId
:
"
purchaseQualityInspectionAdd
"
,
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
(
'
FP2024061300002&id=
'
+
data
.
id
,
null
),
title
:
systemLanguage
[
"
com.skyeye.editPageTitle
"
][
languageType
],
pageId
:
"
purchaseQualityInspectionEdit
"
,
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
(
'
FP2024061300003&id=
'
+
data
.
id
,
null
),
title
:
systemLanguage
[
"
com.skyeye.detailsPageTitle
"
][
languageType
],
pageId
:
"
purchaseQualityInspectionDetails
"
,
area
:
[
'
90vw
'
,
'
90vh
'
],
callBack
:
function
(
refreshCode
)
{
}});
}
form
.
render
();
$
(
"
body
"
).
on
(
"
click
"
,
"
#reloadTable
"
,
function
()
{
loadTable
();
});
function
loadTable
()
{
table
.
reloadData
(
"
messageTable
"
,
{
where
:
getTableParams
()});
}
function
getTableParams
()
{
return
$
.
extend
(
true
,
{},
initTableSearchUtil
.
getSearchValue
(
"
messageTable
"
));
}
exports
(
'
queryQualityInspectionList
'
,
{});
});
erp/src/main/resources/template/tpl/purchaseDeliveryNote/deliveryToQualityInspection.html
浏览文件 @
b604b3f8
<!DOCTYPE html>
<html
lang=
"en"
>
<html>
<head>
<meta
charset=
"UTF-8"
>
<title>
Title
</title>
<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
id=
"content"
></div>
<div
class=
"layui-form-item layui-col-xs12"
>
<div
class=
"layui-input-block"
>
<button
class=
"winui-btn"
type=
"button"
id=
"cancle"
><language
showName=
"com.skyeye.cancel"
></language></button>
<button
class=
"winui-btn"
lay-submit
lay-filter=
"formSaveDraft"
id=
"formSaveDraft"
>
保存为草稿
</button>
`
<button
class=
"winui-btn"
lay-submit
lay-filter=
"formWriteBean"
id=
"formWriteBean"
>
提交
</button>
</div>
</div>
</form>
</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/purchaseDeliveryNote/
'
}).
use
(
'
deliveryToQualityInspection
'
);
</script>
</body>
</html>
\ No newline at end of file
erp/src/main/resources/template/tpl/purchaseQualityInspection/purchaseQualityInspectionList.html
浏览文件 @
b604b3f8
<!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=
"1596958747047"
><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
(
'
1718283008391
'
))
{
}}
<
a
class
=
"
layui-btn layui-btn-xs
"
lay
-
event
=
"
subApproval
"
>
提交审批
<
/a
>
{{
#
}
}}
{{
#
if
(
auth
(
'
1718282987406
'
))
{
}}
<
a
class
=
"
layui-btn layui-btn-xs layui-btn-normal
"
lay
-
event
=
"
edit
"
><
language
showName
=
"
com.skyeye.editBtn
"
><
/language></
a
>
{{
#
}
}}
{{
#
if
(
auth
(
'
1718283023135
'
))
{
}}
<
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
(
'
1718283040132
'
))
{
}}
<
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/purchaseQualityInspection/
'
}).
use
(
'
purchaseQualityInspectionList
'
);
</script>
</body>
</html>
\ No newline at end of file
web/src/main/resources/template/js/common/sysusersel.js
浏览文件 @
b604b3f8
...
...
@@ -69,7 +69,7 @@ layui.config({
$
(
"
#showInfo
"
).
html
(
s
);
//树节点类型赋值
if
(
checkType
==
=
"
1
"
){
if
(
checkType
==
"
1
"
){
ztreeCheckType
=
"
checkbox
"
;
}
else
{
ztreeCheckType
=
"
radio
"
;
...
...
web/src/main/resources/template/json/skyeyeClassEnum.json
浏览文件 @
b604b3f8
...
...
@@ -199,5 +199,7 @@
"supplierContractChildStateEnum"
:
{
"name"
:
"ERP-采购合同是否转采购订单状态"
,
"className"
:
"skyeye-erp#com.skyeye.contract.classenum.SupplierContractChildStateEnum"
},
"orderQualityInspectionType"
:
{
"name"
:
"ERP-采购订单质检状态"
,
"className"
:
"skyeye-erp#com.skyeye.business.classenum.OrderQualityInspectionType"
},
"deliveryPutState"
:
{
"name"
:
"ERP-采购到货单免检商品入库状态"
,
"className"
:
"skyeye-erp#com.skyeye.purchase.classenum.DeliveryPutState"
}
"deliveryPutState"
:
{
"name"
:
"ERP-采购到货单免检商品入库状态"
,
"className"
:
"skyeye-erp#com.skyeye.purchase.classenum.DeliveryPutState"
},
"qualityInspectionPutState"
:
{
"name"
:
"ERP-采购质检单商品入库状态"
,
"className"
:
"skyeye-erp#com.skyeye.inspection.classenum.QualityInspectionPutState"
},
"qualityInspectionReturnState"
:
{
"name"
:
"ERP-采购质检单商品退货状态"
,
"className"
:
"skyeye-erp#com.skyeye.inspection.classenum.QualityInspectionReturnState"
}
}
\ No newline at end of file
web/src/main/resources/template/json/sysServiceMation.json
浏览文件 @
b604b3f8
...
...
@@ -9,6 +9,7 @@
"purchaseOrder"
:
{
"name"
:
"采购订单申请"
,
"key"
:
"com.skyeye.purchase.service.impl.PurchaseOrderServiceImpl"
},
"purchaseRequest"
:
{
"name"
:
"采购申请"
,
"key"
:
"com.skyeye.request.service.impl.PurchaseRequestServiceImpl"
},
"puchaseDeliveryNoteList"
:
{
"name"
:
"采购到货单"
,
"key"
:
"com.skyeye.purchase.service.impl.PurchaseDeliveryServiceImpl"
},
"purchaseQualityInspection"
:
{
"name"
:
"采购质检单"
,
"key"
:
"com.skyeye.inspection.service.impl.QualityInspectionServiceImpl"
},
"putIsOthers"
:
{
"name"
:
"其他入库单申请"
,
"key"
:
"com.skyeye.other.service.impl.OtherWareHousServiceImpl"
},
"outIsOthers"
:
{
"name"
:
"其他出库单申请"
,
"key"
:
"com.skyeye.other.service.impl.OtherOutLetsServiceImpl"
},
"splitListOrder"
:
{
"name"
:
"拆分订单"
,
"key"
:
"com.skyeye.other.service.impl.SplitListServiceImpl"
},
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录