fix: some
Some checks failed
构建并部署前端到测试环境 / build-and-deploy (push) Failing after 28m40s

This commit is contained in:
luo
2026-09-18 18:11:53 +08:00
parent 5e7f5eaba4
commit 08889d2e42
55 changed files with 2888 additions and 414 deletions

View File

@@ -424,7 +424,6 @@
import { formatDateTime } from '@/utils/business/format'
import { getCompatibleNumericId } from '@/utils/business/id'
import {
BUSINESS_USER_GROUP_BUSINESS_LINE_OPTIONS,
CommonStatus,
getBusinessUserGroupBusinessLineLabel,
getStatusText,
@@ -568,7 +567,6 @@
status: undefined as number | undefined,
business_owner_account_id: undefined as number | undefined,
business_user_group_id: undefined as number | undefined,
business_line: undefined as string | undefined,
ungrouped: undefined as number | undefined
}
@@ -722,19 +720,6 @@
value: group.id
}))
},
{
label: '业务线',
prop: 'business_line',
type: 'select' as const,
config: {
clearable: true,
placeholder: '请选择业务线'
},
options: BUSINESS_USER_GROUP_BUSINESS_LINE_OPTIONS.map((item) => ({
label: item.label,
value: item.value
}))
},
{
label: '未分组',
prop: 'ungrouped',
@@ -933,8 +918,7 @@
const businessLine = getBusinessUserGroupBusinessLineLabel(
row.business_user_group_business_line
)
const text =
businessLine && businessLine !== '-' ? `${name}${businessLine}` : name
const text = businessLine && businessLine !== '-' ? `${name}${businessLine}` : name
if (row.business_user_group_enabled) return text
return h(ElTag, { type: 'danger', size: 'small' }, { default: () => `${text}(已停用)` })
}
@@ -1204,9 +1188,7 @@
...(!isAgentAccount.value && {
business_owner_account_id: searchForm.business_owner_account_id,
business_user_group_id: searchForm.business_user_group_id,
business_line: searchForm.business_line || undefined,
ungrouped:
searchForm.ungrouped === undefined ? undefined : searchForm.ungrouped === 1
ungrouped: searchForm.ungrouped === undefined ? undefined : searchForm.ungrouped === 1
})
}
const res = await ShopService.getShops(params)