Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
factory_front
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
qinjianhui
factory_front
Commits
0f920a0e
Commit
0f920a0e
authored
Apr 13, 2026
by
qinjianhui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 拣胚完成功能修改
parent
0c9bff78
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
23 deletions
+28
-23
src/views/order/factoryOrderNew/component/PickCompleteDialog.vue
+28
-23
No files found.
src/views/order/factoryOrderNew/component/PickCompleteDialog.vue
View file @
0f920a0e
...
...
@@ -82,7 +82,7 @@
ref=
"operateDetailsDialogRef"
title=
"调整拣胚顺序"
:pickable=
"true"
@
adjust-pick-order-success=
"o
pen
"
@
adjust-pick-order-success=
"o
nAdjustPickOrderSuccess
"
/>
<ReceiptProductDialog
ref=
"receiptProductDialogRef"
...
...
@@ -339,7 +339,6 @@ const columns = [
minWidth
:
120
,
},
{
key
:
'skuImage'
,
label
:
'SKU图片'
,
width
:
100
,
align
:
'center'
,
...
...
@@ -359,14 +358,12 @@ const columns = [
align
:
'center'
,
},
{
key
:
'thirdSkuCode'
,
prop
:
'thirdSkuCode'
,
label
:
'库存SKU'
,
align
:
'center'
,
width
:
180
,
},
{
key
:
'selectedQuantity'
,
prop
:
'selectedQuantity'
,
label
:
'本次拣胚数量'
,
width
:
110
,
...
...
@@ -398,7 +395,6 @@ const columns = [
align
:
'right'
,
},
{
key
:
'pickStatus'
,
label
:
'拣胚情况'
,
width
:
130
,
align
:
'center'
,
...
...
@@ -409,14 +405,13 @@ const columns = [
const
open
=
async
(
ids
:
(
number
|
string
)[],
adjustOrderIds
?:
number
[],
selectedRow
?:
PickCompleteData
,
_
adjustOrderIds
?:
number
[],
_
selectedRow
?:
PickCompleteData
,
options
?:
{
title
?:
string
submitType
?:
'pick'
|
'replenish'
},
)
=>
{
const
previousPickList
=
pickData
.
value
?.
pickingSituationList
??
[]
selections
.
value
=
[]
pickData
.
value
=
null
dialogTitle
.
value
=
options
?.
title
||
'拣胚完成'
...
...
@@ -429,20 +424,7 @@ const open = async (
background
:
'rgba(0, 0, 0, 0.3)'
,
})
try
{
let
pickIds
if
(
selectedRow
&&
adjustOrderIds
&&
adjustOrderIds
.
length
>
0
&&
!
ids
)
{
const
adjustPickData
=
previousPickList
.
find
(
(
item
:
PickCompleteData
)
=>
item
.
thirdSkuCode
===
selectedRow
.
thirdSkuCode
,
)
if
(
adjustPickData
)
{
adjustPickData
.
allOrderIds
=
adjustOrderIds
}
pickIds
=
previousPickList
.
map
((
item
:
PickCompleteData
)
=>
item
.
allOrderIds
)
.
flat
()
}
const
res
=
await
pickCompleteByIdsDataApi
(
ids
||
pickIds
)
const
res
=
await
pickCompleteByIdsDataApi
(
ids
)
if
(
res
.
code
!==
200
)
return
pickData
.
value
=
res
.
data
||
null
visible
.
value
=
true
...
...
@@ -453,6 +435,27 @@ const open = async (
}
}
const
onAdjustPickOrderSuccess
=
async
(
_
:
unknown
,
adjustOrderIds
:
number
[],
selectedRow
:
PickCompleteData
,
)
=>
{
const
previousPickList
=
pickData
.
value
?.
pickingSituationList
??
[]
if
(
selectedRow
&&
adjustOrderIds
&&
adjustOrderIds
.
length
>
0
)
{
const
adjustPickData
=
previousPickList
.
find
(
(
item
:
PickCompleteData
)
=>
item
.
thirdSkuCode
===
selectedRow
.
thirdSkuCode
,
)
if
(
adjustPickData
)
{
adjustPickData
.
availableOrderIds
=
adjustOrderIds
}
}
pickData
.
value
=
{
...
pickData
.
value
,
pickingSituationList
:
previousPickList
,
}
}
const
handleClose
=
()
=>
{
pickData
.
value
=
null
}
...
...
@@ -530,8 +533,10 @@ const handleSubmit = async () => {
?.
map
((
item
)
=>
item
.
availableOrderIds
)
.
flat
()
try
{
if
(
orderIds
&&
orderIds
.
length
>
0
)
{
const
res
=
await
submitApi
.
value
(
orderIds
as
(
number
|
string
)[])
if
(
res
.
code
!==
200
)
return
}
const
pickFailedOrderList
=
pickData
.
value
?.
pickingSituationList
?.
filter
(
(
item
)
=>
item
.
pickingStatus
!==
'success'
,
)
...
...
@@ -561,7 +566,7 @@ const handleSubmit = async () => {
console
.
error
(
e
)
}
}
ElMessage
.
success
(
dialogTitle
.
value
)
ElMessage
.
success
(
'操作成功'
)
visible
.
value
=
false
emit
(
'success'
)
}
catch
(
e
)
{
...
...
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