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
24f36f38
Commit
24f36f38
authored
May 28, 2026
by
qinjianhui
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev_factory_new_order_filter' into 'dev'
fix: 类型修复 See merge request
!197
parents
bfcc7948
2deff80e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
4 deletions
+7
-4
src/views/order/factoryOrderNew/index.vue
+7
-4
No files found.
src/views/order/factoryOrderNew/index.vue
View file @
24f36f38
...
@@ -1036,6 +1036,7 @@ import PrintWarehouseSkuTag from '@/views/order/components/printWarehouseSkuTag.
...
@@ -1036,6 +1036,7 @@ import PrintWarehouseSkuTag from '@/views/order/components/printWarehouseSkuTag.
import
UpdateAddress
from
'@/views/order/podCN/components/updateAddress.vue'
import
UpdateAddress
from
'@/views/order/podCN/components/updateAddress.vue'
import
{
ResultInfoDataItem
}
from
'@/types/api/order/common'
import
{
ResultInfoDataItem
}
from
'@/types/api/order/common'
import
type
{
FactoryOrderSearchQueryVisibilityContext
}
from
'@/types/api/factoryOrderNew/searchQueryVisibility'
import
type
{
FactoryOrderSearchQueryVisibilityContext
}
from
'@/types/api/factoryOrderNew/searchQueryVisibility'
import
type
{
StatusTreeNode
}
from
'@/types/api/order/factoryOrderNew'
import
{
useOrderDictionaries
}
from
'./hooks/useOrderDictionaries'
import
{
useOrderDictionaries
}
from
'./hooks/useOrderDictionaries'
import
{
useOrderSearchForm
}
from
'./hooks/useOrderSearchForm'
import
{
useOrderSearchForm
}
from
'./hooks/useOrderSearchForm'
import
{
useOrderStatusTree
}
from
'./hooks/useOrderStatusTree'
import
{
useOrderStatusTree
}
from
'./hooks/useOrderStatusTree'
...
@@ -1113,14 +1114,16 @@ const {
...
@@ -1113,14 +1114,16 @@ const {
onRefreshCurrentView
:
()
=>
{
}
,
onRefreshCurrentView
:
()
=>
{
}
,
}
)
}
)
// 查询状态树
// 查询状态树
const
statusTreeChildren
=
computed
(()
=>
{
const
statusTreeChildren
=
computed
(():
StatusTreeNode
[]
=>
{
const
tree
=
JSON
.
parse
(
JSON
.
stringify
(
statusTree
.
value
?.[
0
]?.
children
))
const
tree
=
JSON
.
parse
(
JSON
.
stringify
(
statusTree
.
value
?.[
0
]?.
children
))
as
|
StatusTreeNode
[]
|
undefined
if
(
!
tree
)
return
[]
if
(
!
tree
)
return
[]
tree
.
forEach
((
item
:
any
)
=>
{
tree
.
forEach
((
item
)
=>
{
if
(
item
.
status
===
'PICKING'
)
item
.
children
=
[]
if
(
item
.
status
===
'PICKING'
)
item
.
children
=
[]
}
)
}
)
return
tree
.
filter
(
return
tree
.
filter
(
(
item
:
any
)
=>
(
item
)
=>
item
.
status
!==
'AWAITING_RESTOCK'
&&
item
.
status
!==
'BATCH_MANAGE'
,
item
.
status
!==
'AWAITING_RESTOCK'
&&
item
.
status
!==
'BATCH_MANAGE'
,
)
)
}
)
}
)
...
...
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