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
0bcce179
Commit
0bcce179
authored
Jul 29, 2024
by
jingnan
👀
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ERP相关_退库管理功能修改
parent
bf59e813
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
5 deletions
+14
-5
index.vue
...eComponents/components/ERP_AddInStorageBackItem/index.vue
+3
-2
my-task.vue
...ns/dee-task-center/src/views/home/compontents/my-task.vue
+11
-3
No files found.
applications/dee-mes/src/privateComponents/components/ERP_AddInStorageBackItem/index.vue
View file @
0bcce179
...
...
@@ -108,6 +108,7 @@ export default {
if
(
val
.
retirementItems
)
{
this
.
tableData
=
val
.
retirementItems
.
map
(
item
=>
{
item
.
operator
=
'MODIFY'
item
.
uniqueId
=
item
.
id
if
(
item
.
jobResponseSorting
)
{
if
(
item
.
jobResponseSorting
.
erpSortingItem
&&
item
.
jobResponseSorting
.
erpSortingItem
.
erpSorting
)
{
item
.
reqNo
=
item
.
jobResponseSorting
.
erpSortingItem
.
erpSorting
.
reqNo
||
''
...
...
@@ -118,7 +119,7 @@ export default {
item
.
scrapCount
=
null
item
.
unit
=
item
.
jobResponseSorting
.
erpInventory
&&
item
.
jobResponseSorting
.
erpInventory
.
unit
item
.
testNo
=
item
.
jobResponseSorting
.
erpInventory
&&
item
.
jobResponseSorting
.
erpInventory
.
testNo
item
.
uniqueId
=
item
.
jobResponseSorting
.
id
//
item.uniqueId = item.jobResponseSorting.id
}
}
if
(
item
.
oldOutStorage
)
{
...
...
@@ -131,7 +132,7 @@ export default {
item
.
scrapCount
=
item
.
oldOutStorage
.
scrapCount
item
.
unit
=
item
.
oldOutStorage
.
inventory
&&
item
.
oldOutStorage
.
inventory
.
extUnit
&&
item
.
oldOutStorage
.
inventory
.
extUnit
.
unitName
item
.
testNo
=
item
.
oldOutStorage
.
inventory
&&
item
.
oldOutStorage
.
inventory
.
testNo
item
.
uniqueId
=
item
.
oldOutStorage
.
id
//
item.uniqueId = item.oldOutStorage.id
}
}
return
item
...
...
applications/dee-task-center/src/views/home/compontents/my-task.vue
View file @
0bcce179
...
...
@@ -120,6 +120,11 @@ export default {
type
:
'ERP_SortAdjust'
,
appId
:
1626782774851
},
{
taskType
:
'配套自动退库确认'
,
type
:
'ERP_MatchAutoReturnConfirm'
,
appId
:
1626782774851
},
{
taskType
:
'库内退库确认'
,
type
:
'ERP_StockBackConfirm'
,
...
...
@@ -215,9 +220,9 @@ export default {
get
(
`/indexTask/task/ProdTask`
,
{}).
then
(
res
=>
{
this
.
$set
(
this
.
quickAccessList
[
index
],
'taskCount'
,
res
.
items
.
count
)
})
}
else
if
(
item
.
type
===
'ERP_SortAdjust'
||
item
.
type
===
'ERP_operatorConfirm'
)
{
}
else
if
(
item
.
type
===
'ERP_SortAdjust'
||
item
.
type
===
'ERP_operatorConfirm'
||
item
.
type
===
'ERP_MatchAutoReturnConfirm'
)
{
post
(
`/ErpSorting/currentUserSortingTaskCount`
,
{}).
then
(
res
=>
{
const
resKey
=
item
.
type
===
'ERP_SortAdjust'
?
'准备工任务数量'
:
'操作工任务数量
'
const
resKey
=
item
.
type
===
'ERP_SortAdjust'
?
'准备工任务数量'
:
item
.
type
===
'ERP_operatorConfirm'
?
'操作工任务数量'
:
'自动配套退库任务
'
this
.
$set
(
this
.
quickAccessList
[
index
],
'taskCount'
,
res
.
items
[
resKey
])
})
}
else
if
(
item
.
type
===
'ERP_StockBackConfirm'
)
{
...
...
@@ -261,7 +266,7 @@ export default {
}
})
this
.
$store
.
dispatch
(
'app/closeSideBar'
,
false
)
}
else
if
(
item
.
taskType
===
'准备工出库调整'
||
item
.
taskType
===
'操作工确认'
||
item
.
taskType
===
'库内退库确认'
)
{
}
else
if
(
item
.
taskType
===
'准备工出库调整'
||
item
.
taskType
===
'操作工确认'
||
item
.
taskType
===
'
配套自动退库确认'
||
item
.
taskType
===
'
库内退库确认'
)
{
let
pageNo
=
''
switch
(
item
.
taskType
)
{
case
'准备工出库调整'
:
...
...
@@ -270,6 +275,9 @@ export default {
case
'操作工确认'
:
pageNo
=
'038a430e-facf-4fcb-9b98-2bf75c226681'
break
case
'配套自动退库确认'
:
pageNo
=
'102e307a-342e-4786-8a9a-a50465ab1721'
break
case
'库内退库确认'
:
pageNo
=
'219cf48e-020a-4048-85d7-d5c2b83537f4'
break
...
...
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