fix: 超时时间改为90s, 分配店铺查询
All checks were successful
构建并部署前端到测试环境 / build-and-deploy (push) Successful in 6m11s
All checks were successful
构建并部署前端到测试环境 / build-and-deploy (push) Successful in 6m11s
This commit is contained in:
@@ -112,6 +112,7 @@
|
||||
v-model="allocateForm.to_shop_id"
|
||||
:options="shopCascadeOptions"
|
||||
:props="shopCascadeProps"
|
||||
:before-filter="handleAllocateShopBeforeFilter"
|
||||
placeholder="请选择目标店铺"
|
||||
clearable
|
||||
filterable
|
||||
@@ -1523,6 +1524,62 @@
|
||||
|
||||
// 店铺相关
|
||||
const shopCascadeOptions = ref<any[]>([])
|
||||
let allocateShopSearchRequestId = 0
|
||||
const mapShopCascadeNodes = (items: any[]) => {
|
||||
const seen = new Set<number>()
|
||||
|
||||
return items.reduce<any[]>((nodes, item) => {
|
||||
if (seen.has(item.id)) return nodes
|
||||
|
||||
seen.add(item.id)
|
||||
nodes.push({
|
||||
value: item.id,
|
||||
label: item.shop_name,
|
||||
leaf: !item.has_children
|
||||
})
|
||||
return nodes
|
||||
}, [])
|
||||
}
|
||||
const handleAllocateShopBeforeFilter = async (query: string) => {
|
||||
const keyword = query.trim()
|
||||
if (!keyword) return true
|
||||
|
||||
const requestId = ++allocateShopSearchRequestId
|
||||
try {
|
||||
const shopResponse = await ShopService.getShops({
|
||||
page: 1,
|
||||
page_size: 20,
|
||||
shop_name: keyword
|
||||
})
|
||||
if (requestId !== allocateShopSearchRequestId) return false
|
||||
if (shopResponse.code !== 0) {
|
||||
shopCascadeOptions.value = []
|
||||
return false
|
||||
}
|
||||
|
||||
const parentIds = Array.from(
|
||||
new Set((shopResponse.data.items || []).map((shop) => shop.parent_id ?? null))
|
||||
)
|
||||
const cascadeResponses = await Promise.all(
|
||||
parentIds.map((parentId) =>
|
||||
ShopService.getShopsCascade({
|
||||
shop_name: keyword,
|
||||
parent_id: parentId ?? undefined
|
||||
})
|
||||
)
|
||||
)
|
||||
if (requestId !== allocateShopSearchRequestId) return false
|
||||
|
||||
shopCascadeOptions.value = mapShopCascadeNodes(
|
||||
cascadeResponses.flatMap((response) => (response.code === 0 ? response.data || [] : []))
|
||||
)
|
||||
return true
|
||||
} catch (error) {
|
||||
if (requestId === allocateShopSearchRequestId) shopCascadeOptions.value = []
|
||||
console.error('搜索批量分配目标店铺失败:', error)
|
||||
return false
|
||||
}
|
||||
}
|
||||
const shopCascadeProps = {
|
||||
lazy: true,
|
||||
checkStrictly: true,
|
||||
@@ -1533,12 +1590,7 @@
|
||||
try {
|
||||
const res = await ShopService.getShopsCascade({ parent_id: parentId })
|
||||
if (res.code === 0) {
|
||||
const nodes = (res.data || []).map((item: any) => ({
|
||||
value: item.id,
|
||||
label: item.shop_name,
|
||||
leaf: !item.has_children
|
||||
}))
|
||||
resolve(nodes)
|
||||
resolve(mapShopCascadeNodes(res.data || []))
|
||||
} else {
|
||||
resolve([])
|
||||
}
|
||||
@@ -1555,11 +1607,7 @@
|
||||
try {
|
||||
const res = await ShopService.getShopsCascade({ parent_id: undefined })
|
||||
if (res.code === 0) {
|
||||
shopCascadeOptions.value = (res.data || []).map((item: any) => ({
|
||||
value: item.id,
|
||||
label: item.shop_name,
|
||||
leaf: !item.has_children
|
||||
}))
|
||||
shopCascadeOptions.value = mapShopCascadeNodes(res.data || [])
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('加载顶级店铺失败:', error)
|
||||
@@ -2486,6 +2534,7 @@
|
||||
return
|
||||
}
|
||||
allocateDialogVisible.value = true
|
||||
shopCascadeOptions.value = []
|
||||
Object.assign(allocateForm, {
|
||||
selection_type: CardSelectionType.LIST,
|
||||
to_shop_id: undefined,
|
||||
@@ -2700,10 +2749,7 @@
|
||||
|
||||
const showEnterpriseCardRecallDialog = async () => {
|
||||
resetEnterpriseCardRecallForm()
|
||||
await Promise.all([
|
||||
handleSearchEnterprise(),
|
||||
loadAllocateCarrierOptions()
|
||||
])
|
||||
await Promise.all([handleSearchEnterprise(), loadAllocateCarrierOptions()])
|
||||
enterpriseCardRecallDialogVisible.value = true
|
||||
enterpriseCardRecallFormRef.value?.clearValidate()
|
||||
}
|
||||
@@ -2823,10 +2869,7 @@
|
||||
selection_type:
|
||||
selectedCards.value.length > 0 ? CardSelectionType.LIST : CardSelectionType.FILTER
|
||||
})
|
||||
await Promise.all([
|
||||
loadPackageSeriesList(),
|
||||
loadAllocateCarrierOptions()
|
||||
])
|
||||
await Promise.all([loadPackageSeriesList(), loadAllocateCarrierOptions()])
|
||||
seriesBindingDialogVisible.value = true
|
||||
seriesBindingFormRef.value?.clearValidate()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user