Commit 24f36f38 by qinjianhui

Merge branch 'dev_factory_new_order_filter' into 'dev'

fix: 类型修复

See merge request !197
parents bfcc7948 2deff80e
...@@ -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',
) )
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment