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
5d6c57f4
Commit
5d6c57f4
authored
Mar 27, 2026
by
qinjianhui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 补胚完成功能开发
parent
cfdabd67
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
4 deletions
+27
-4
src/api/factoryOrderNew.ts
+7
-0
src/views/order/factoryOrderNew/component/PickCompleteDialog.vue
+16
-3
src/views/order/factoryOrderNew/index.vue
+4
-1
No files found.
src/api/factoryOrderNew.ts
View file @
5d6c57f4
...
@@ -214,6 +214,13 @@ export function pickCompleteApi(ids: (number | string)[]) {
...
@@ -214,6 +214,13 @@ export function pickCompleteApi(ids: (number | string)[]) {
)
)
}
}
export
function
replenishmentCompleteApi
(
ids
:
(
number
|
string
)[])
{
return
axios
.
post
<
never
,
BaseRespData
<
void
>>
(
'factory/podOrderOperation/replenishmentComplete'
,
ids
,
)
}
export
function
pickFailApi
(
ids
:
(
number
|
string
)[])
{
export
function
pickFailApi
(
ids
:
(
number
|
string
)[])
{
return
axios
.
post
<
never
,
BaseRespData
<
PickFailData
[]
>>
(
return
axios
.
post
<
never
,
BaseRespData
<
PickFailData
[]
>>
(
'factory/orderNew/pickFail'
,
'factory/orderNew/pickFail'
,
...
...
src/views/order/factoryOrderNew/component/PickCompleteDialog.vue
View file @
5d6c57f4
<
template
>
<
template
>
<ElDialog
<ElDialog
v-model=
"visible"
v-model=
"visible"
title=
"拣胚完成
"
:title=
"dialogTitle
"
width=
"1400px"
width=
"1400px"
:close-on-click-modal=
"false"
:close-on-click-modal=
"false"
@
close=
"handleClose"
@
close=
"handleClose"
...
@@ -92,8 +92,10 @@ import { ElMessage } from 'element-plus'
...
@@ -92,8 +92,10 @@ import { ElMessage } from 'element-plus'
import
{
import
{
pickCompleteByIdsDataApi
,
pickCompleteByIdsDataApi
,
pickCompleteApi
,
pickCompleteApi
,
replenishmentCompleteApi
,
}
from
'@/api/factoryOrderNew'
}
from
'@/api/factoryOrderNew'
import
type
{
PickCompleteData
}
from
'@/types/api/factoryOrderNew'
import
type
{
PickCompleteData
}
from
'@/types/api/factoryOrderNew'
import
type
{
BaseRespData
}
from
'@/types/api'
import
TableView
from
'@/components/TableView.vue'
import
TableView
from
'@/components/TableView.vue'
import
Icon
from
'@/components/Icon.vue'
import
Icon
from
'@/components/Icon.vue'
import
OperateDetailsDialog
from
'./OperateDetailsDialog.vue'
import
OperateDetailsDialog
from
'./OperateDetailsDialog.vue'
...
@@ -111,6 +113,10 @@ const emit = defineEmits<{
...
@@ -111,6 +113,10 @@ const emit = defineEmits<{
const
visible
=
ref
(
false
)
const
visible
=
ref
(
false
)
const
pickData
=
ref
<
PickData
|
null
>
(
null
)
const
pickData
=
ref
<
PickData
|
null
>
(
null
)
const
selections
=
ref
<
PickCompleteData
[]
>
([])
const
selections
=
ref
<
PickCompleteData
[]
>
([])
const
dialogTitle
=
ref
(
'拣胚完成'
)
const
submitApi
=
ref
<
(
ids
:
(
number
|
string
)[])
=>
Promise
<
BaseRespData
<
void
>>>
(
pickCompleteApi
,
)
const
columns
=
[
const
columns
=
[
{
{
...
@@ -191,10 +197,17 @@ const open = async (
...
@@ -191,10 +197,17 @@ const open = async (
ids
:
(
number
|
string
)[],
ids
:
(
number
|
string
)[],
adjustOrderIds
?:
number
[],
adjustOrderIds
?:
number
[],
selectedRow
?:
PickCompleteData
,
selectedRow
?:
PickCompleteData
,
options
?:
{
title
?:
string
submitType
?:
'pick'
|
'replenish'
},
)
=>
{
)
=>
{
const
previousPickList
=
pickData
.
value
?.
pickingSituationList
??
[]
const
previousPickList
=
pickData
.
value
?.
pickingSituationList
??
[]
selections
.
value
=
[]
selections
.
value
=
[]
pickData
.
value
=
null
pickData
.
value
=
null
dialogTitle
.
value
=
options
?.
title
||
'拣胚完成'
submitApi
.
value
=
options
?.
submitType
===
'replenish'
?
replenishmentCompleteApi
:
pickCompleteApi
const
loading
=
ElLoading
.
service
({
const
loading
=
ElLoading
.
service
({
text
:
'操作中...'
,
text
:
'操作中...'
,
background
:
'rgba(0, 0, 0, 0.3)'
,
background
:
'rgba(0, 0, 0, 0.3)'
,
...
@@ -252,9 +265,9 @@ const handleSubmit = async () => {
...
@@ -252,9 +265,9 @@ const handleSubmit = async () => {
?.
map
((
item
)
=>
item
.
availableOrderIds
)
?.
map
((
item
)
=>
item
.
availableOrderIds
)
.
flat
()
.
flat
()
try
{
try
{
const
res
=
await
pickCompleteApi
(
orderIds
as
(
number
|
string
)[])
const
res
=
await
submitApi
.
value
(
orderIds
as
(
number
|
string
)[])
if
(
res
.
code
!==
200
)
return
if
(
res
.
code
!==
200
)
return
ElMessage
.
success
(
'拣胚完成'
)
ElMessage
.
success
(
dialogTitle
.
value
)
visible
.
value
=
false
visible
.
value
=
false
emit
(
'success'
)
emit
(
'success'
)
}
catch
(
e
)
{
}
catch
(
e
)
{
...
...
src/views/order/factoryOrderNew/index.vue
View file @
5d6c57f4
...
@@ -2191,7 +2191,10 @@ const handleSyncAddress = async () => {
...
@@ -2191,7 +2191,10 @@ const handleSyncAddress = async () => {
}
}
const
handleReplenishComplete
=
()
=>
{
const
handleReplenishComplete
=
()
=>
{
if
(
!
ensureSelection
())
return
if
(
!
ensureSelection
())
return
pickCompleteDialogRef
.
value
?.
open
(
getSelectedIds
())
pickCompleteDialogRef
.
value
?.
open
(
getSelectedIds
(),
undefined
,
undefined
,
{
title
:
'补胚完成'
,
submitType
:
'replenish'
,
}
)
}
}
const
handleReplenishFail
=
()
=>
{
const
handleReplenishFail
=
()
=>
{
if
(
!
ensureSelection
())
return
if
(
!
ensureSelection
())
return
...
...
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