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
df805aff
Commit
df805aff
authored
Mar 26, 2026
by
qinjianhui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 拣胚完成功能开发
parent
2e37c7e2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
4 deletions
+27
-4
src/views/order/factoryOrderNew/component/OperateDetailsDialog.vue
+7
-2
src/views/order/factoryOrderNew/component/PickCompleteDialog.vue
+20
-2
No files found.
src/views/order/factoryOrderNew/component/OperateDetailsDialog.vue
View file @
df805aff
...
...
@@ -336,7 +336,7 @@ const handleConfirm = async () => {
`<div>
<span>当前库存数量:
${
selectedRow
.
value
?.
inventory
}
<
/span
>
<
span
style
=
"margin: 0 4px"
>
生产中数量
:
$
{
selectedRow
.
value
?.
producingQuantity
}
<
/span
>
<
span
>
最多只能拣胚
$
{
selectedRow
.
value
?.
a
ll
OrderIds
?.
length
}
个
<
/span
>
<
span
>
最多只能拣胚
$
{
selectedRow
.
value
?.
a
vailable
OrderIds
?.
length
}
个
<
/span
>
<
div
>
请重新选择
!<
/div
>
<
/div>`
,
'提示'
,
...
...
@@ -347,7 +347,12 @@ const handleConfirm = async () => {
},
)
}
emit
(
'adjustPickOrderSuccess'
,
selectedItems
.
value
.
map
((
item
)
=>
item
.
id
))
emit
(
'adjustPickOrderSuccess'
,
null
,
selectedItems
.
value
.
map
((
item
)
=>
item
.
id
),
selectedRow
.
value
,
)
visible
.
value
=
false
}
...
...
src/views/order/factoryOrderNew/component/PickCompleteDialog.vue
View file @
df805aff
...
...
@@ -187,7 +187,12 @@ const columns = [
},
]
const
open
=
async
(
ids
:
(
number
|
string
)[])
=>
{
const
open
=
async
(
ids
:
(
number
|
string
)[],
adjustOrderIds
:
number
[],
selectedRow
:
PickCompleteData
,
)
=>
{
const
previousPickList
=
pickData
.
value
?.
pickingSituationList
??
[]
selections
.
value
=
[]
pickData
.
value
=
null
const
loading
=
ElLoading
.
service
({
...
...
@@ -195,7 +200,20 @@ const open = async (ids: (number | string)[]) => {
background
:
'rgba(0, 0, 0, 0.3)'
,
})
try
{
const
res
=
await
pickCompleteByIdsDataApi
(
ids
)
let
pickIds
if
(
selectedRow
&&
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
)
if
(
res
.
code
!==
200
)
return
pickData
.
value
=
res
.
data
||
null
visible
.
value
=
true
...
...
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