Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
TF-MOM-WEB
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
TFMOM
TF-MOM-WEB
Commits
fc6142dc
Commit
fc6142dc
authored
Oct 16, 2023
by
jingnan
👀
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
入库检验新增履历本信息查看
parent
fddd23bb
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
2 deletions
+33
-2
editDrawer.vue
...urchasingWarehousingProcess_view/component/editDrawer.vue
+2
-1
index.vue
...ts/components/PurchasingWarehousingProcess_view/index.vue
+31
-1
No files found.
applications/dee-mes/src/privateComponents/components/PurchasingWarehousingProcess_view/component/editDrawer.vue
View file @
fc6142dc
...
@@ -7,13 +7,14 @@
...
@@ -7,13 +7,14 @@
<
template
>
<
template
>
<div
class=
"className"
>
<div
class=
"className"
>
<dee-drawer
<dee-drawer
v-if=
"config"
width=
"70%"
width=
"70%"
:title=
"title"
:title=
"title"
:dialog-visible=
"visibile"
:dialog-visible=
"visibile"
@
handleClose=
"onClose"
@
handleClose=
"onClose"
>
>
<dee-as-com
<dee-as-com
v-if=
"config
"
style=
"display:block
"
:lay-config=
"config"
:lay-config=
"config"
:basic-data=
"rowData"
:basic-data=
"rowData"
/>
/>
...
...
applications/dee-mes/src/privateComponents/components/PurchasingWarehousingProcess_view/index.vue
View file @
fc6142dc
...
@@ -90,7 +90,7 @@ export default {
...
@@ -90,7 +90,7 @@ export default {
columns
()
{
columns
()
{
const
tableConlumn
=
[
const
tableConlumn
=
[
{
title
:
'序号'
,
key
:
'parentIndex'
,
align
:
'center'
,
headerAlign
:
'center'
},
{
title
:
'序号'
,
key
:
'parentIndex'
,
align
:
'center'
,
headerAlign
:
'center'
},
{
title
:
'操作'
,
key
:
'operate'
,
align
:
'center'
,
component
:
{
{
title
:
'操作'
,
key
:
'operate'
,
width
:
'140px'
,
align
:
'center'
,
component
:
{
show
:
true
,
show
:
true
,
name
:
'EditTableRow'
,
name
:
'EditTableRow'
,
props
:
{
props
:
{
...
@@ -118,6 +118,19 @@ export default {
...
@@ -118,6 +118,19 @@ export default {
return
(
row
.
subTypeName
===
'InStoragePurchaseItem'
||
row
.
subTypeName
===
'InStorageRecallItem'
||
row
.
subTypeName
===
'InStorageExpireItem'
)
&&
(
row
.
state
===
'Material_Check'
||
row
.
state
===
'In_Confirm'
)
return
(
row
.
subTypeName
===
'InStoragePurchaseItem'
||
row
.
subTypeName
===
'InStorageRecallItem'
||
row
.
subTypeName
===
'InStorageExpireItem'
)
&&
(
row
.
state
===
'Material_Check'
||
row
.
state
===
'In_Confirm'
)
}
}
},
},
{
// 物料检验及入库确认节点展示
operation
:
`履历单信息`
,
handleClick
:
(
row
,
index
)
=>
{
// 查看履历单之前需完成检验单的填写
const
responseInTest
=
this
.
$utils
.
getTargetJobResponses
(
row
,
'JobResponseInTest'
)
if
(
!
responseInTest
||
!
responseInTest
.
testNo
)
return
this
.
$utils
.
showMessageWarning
(
'检验单号不能为空!'
)
this
.
getBiographicData
(
responseInTest
,
row
)
// 查询履历本信息 如有则查看没有则新建
},
icon
:
'/icons/o-doc.png'
,
showFun
:
(
row
)
=>
{
return
(
row
.
subTypeName
===
'InStoragePurchaseItem'
||
row
.
subTypeName
===
'InStorageRecallItem'
||
row
.
subTypeName
===
'InStorageExpireItem'
)
&&
(
row
.
state
===
'Material_Check'
)
}
},
{
// 物料检验阶段及入库确认阶段展示
{
// 物料检验阶段及入库确认阶段展示
operation
:
'理化查看'
,
operation
:
'理化查看'
,
handleClick
:
(
row
,
index
)
=>
{
handleClick
:
(
row
,
index
)
=>
{
...
@@ -269,6 +282,23 @@ export default {
...
@@ -269,6 +282,23 @@ export default {
})
})
},
},
methods
:
{
methods
:
{
getBiographicData
(
responseInTest
,
row
)
{
const
params
=
{
searchItems
:
{
items
:
[{
'fieldName'
:
'responseInTestId'
,
operator
:
'EQ'
,
value
:
responseInTest
.
id
}],
operator
:
'AND'
}
}
this
.
$api
.
searchApi
(
'BiographicData'
,
params
).
then
(
res
=>
{
if
(
res
.
items
&&
res
.
items
.
content
&&
res
.
items
.
content
.
length
)
{
this
.
$refs
.
editDrawer
.
onShow
(
row
,
{
typeName
:
'BiographicData'
,
layKey
:
'defaultInfo'
})
}
else
{
this
.
$refs
.
editDrawer
.
onShow
(
row
,
{
typeName
:
'BiographicData'
,
layKey
:
'addBiographicData'
})
}
}).
catch
(
err
=>
{
console
.
log
(
err
)
})
},
setParams
(
extWorkUnitId
,
currentRow
)
{
setParams
(
extWorkUnitId
,
currentRow
)
{
if
(
currentRow
.
inventoryJobResponses
&&
currentRow
.
inventoryJobResponses
.
length
)
{
if
(
currentRow
.
inventoryJobResponses
&&
currentRow
.
inventoryJobResponses
.
length
)
{
const
targetInventory
=
this
.
$utils
.
getTargetJobResponses
(
currentRow
,
'JobResponseInEntry'
)
const
targetInventory
=
this
.
$utils
.
getTargetJobResponses
(
currentRow
,
'JobResponseInEntry'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment