feat: 产品迭代7月份
All checks were successful
构建并部署前端到测试环境 / build-and-deploy (push) Successful in 5m51s

This commit is contained in:
luo
2026-07-27 16:30:29 +08:00
parent cc6fc9243e
commit f0a2b84e53
75 changed files with 2926 additions and 534 deletions

View File

@@ -228,6 +228,13 @@
:inactive-value="CommonStatus.DISABLED"
/>
</ElFormItem>
<ElFormItem v-if="dialogType === 'edit'" label="C 端登录">
<ElSwitch
v-model="formData.client_login_disabled"
active-text="禁止新登录"
inactive-text="允许登录"
/>
</ElFormItem>
</ElForm>
<template #footer>
<div class="dialog-footer">
@@ -322,9 +329,11 @@
import { ShopService, RoleService } from '@/api/modules'
import type { SearchFormItem } from '@/types'
import type {
CreateShopParams,
ShopBusinessOwnerCandidate,
ShopResponse,
ShopRoleResponse
ShopRoleResponse,
UpdateShopParams
} from '@/types/api'
import { RoleType, RoleStatus } from '@/types/api'
import { formatDateTime } from '@/utils/business/format'
@@ -609,7 +618,8 @@
formData.address = row.address || ''
formData.contact_name = row.contact_name || ''
formData.contact_phone = row.contact_phone || ''
formData.business_owner_account_id = row.business_owner_account_id ?? null
formData.business_owner_account_id = row.business_owner_account_id ?? null
formData.client_login_disabled = row.client_login_disabled
formData.status = row.status
formData.init_username = ''
formData.init_password = ''
@@ -627,7 +637,8 @@
formData.address = ''
formData.contact_name = ''
formData.contact_phone = ''
formData.business_owner_account_id = null
formData.business_owner_account_id = null
formData.client_login_disabled = false
formData.status = CommonStatus.ENABLED
formData.init_username = ''
formData.init_password = ''
@@ -729,13 +740,19 @@
label: '联系电话',
width: 130
},
{
prop: 'business_owner_username',
label: '平台业务员',
minWidth: 180,
showOverflowTooltip: true,
formatter: (row: ShopResponse) => formatBusinessOwner(row)
},
{
prop: 'business_owner_username',
label: '平台业务员',
minWidth: 180,
showOverflowTooltip: true,
formatter: (row: ShopResponse) => formatBusinessOwner(row)
},
{
prop: 'client_login_disabled',
label: 'C 端登录',
width: 110,
formatter: (row: ShopResponse) => (row.client_login_disabled ? '已限制' : '正常')
},
...(canModifyShopStatus
? [
{
@@ -825,7 +842,8 @@
init_password: '',
init_phone: '',
default_role_id: undefined as number | undefined,
business_owner_account_id: null as number | null
business_owner_account_id: null as number | null,
client_login_disabled: false
})
// 处理编码生成
@@ -987,14 +1005,15 @@
submitLoading.value = true
try {
if (dialogType.value === 'add') {
const data: any = {
const data: CreateShopParams = {
shop_name: formData.shop_name,
shop_code: formData.shop_code,
init_username: formData.init_username,
init_password: formData.init_password,
init_phone: formData.init_phone,
default_role_id: formData.default_role_id,
business_owner_account_id: formData.business_owner_account_id
default_role_id: formData.default_role_id!,
business_owner_account_id: formData.business_owner_account_id,
client_login_disabled: formData.client_login_disabled
}
// 可选字段 - parent_id 可能是数组(级联选择器)或数字
@@ -1013,10 +1032,11 @@
await ShopService.createShop(data)
ElMessage.success('新增成功')
} else {
const data: any = {
const data: UpdateShopParams = {
shop_name: formData.shop_name,
status: formData.status,
business_owner_account_id: formData.business_owner_account_id
business_owner_account_id: formData.business_owner_account_id,
client_login_disabled: formData.client_login_disabled
}
// 可选字段