1
This commit is contained in:
parent
8a1cc63a09
commit
b0676bf140
@ -45,6 +45,7 @@ export type ExpressInterfaceCreateParams = {
|
||||
name: string
|
||||
express_code: string
|
||||
platform_code: string
|
||||
platform_shop_id?: string | null
|
||||
shop_id?: number
|
||||
sys_express_code?: string
|
||||
is_system_express_code?: number
|
||||
|
||||
@ -7,6 +7,7 @@ export const expressInterfaceListFieldOrder = [
|
||||
'warehouse_id',
|
||||
'name',
|
||||
'platform_code',
|
||||
'platform_shop_id',
|
||||
'express_code',
|
||||
'sys_express_code',
|
||||
'is_system_express_code',
|
||||
@ -42,6 +43,7 @@ export const expressInterfaceFieldLabels: Record<string, string> = {
|
||||
express_code: '快递编码',
|
||||
sys_express_code: '系统快递编码',
|
||||
platform_code: '平台编码',
|
||||
platform_shop_id: '平台店铺ID',
|
||||
sender_name: '发件人',
|
||||
sender_tel: '发件电话',
|
||||
weight: '默认重量',
|
||||
@ -436,6 +438,7 @@ export const defaultExpressInterfaceForm = {
|
||||
sys_express_code: '',
|
||||
is_system_express_code: 1,
|
||||
platform_code: '',
|
||||
platform_shop_id: null as string | null,
|
||||
express_name: '',
|
||||
sender_name: '',
|
||||
sender_tel: '',
|
||||
@ -511,6 +514,10 @@ export function applyExpressInterfaceRowToForm(
|
||||
sys_express_code: signedExpressCode,
|
||||
is_system_express_code: toFormOptionalNumber(row.is_system_express_code) ?? 1,
|
||||
platform_code: toFormString(row.platform_code),
|
||||
platform_shop_id: (() => {
|
||||
const v = toFormString(row.platform_shop_id ?? row.platformShopId)
|
||||
return v || null
|
||||
})(),
|
||||
express_name: toFormString(row.express_name || row.express?.name),
|
||||
sender_name: toFormString(row.sender_name),
|
||||
sender_tel: toFormString(row.sender_tel),
|
||||
@ -569,6 +576,11 @@ function omitEmptyString(val: unknown): string | undefined {
|
||||
return s || undefined
|
||||
}
|
||||
|
||||
function toNullableString(val: unknown): string | null {
|
||||
const s = String(val ?? '').trim()
|
||||
return s || null
|
||||
}
|
||||
|
||||
function omitOptionalNumber(val: unknown): number | undefined {
|
||||
if (val === null || val === undefined || val === '') return undefined
|
||||
const n = Number(val)
|
||||
@ -587,7 +599,8 @@ export function buildExpressInterfaceCreatePayload(
|
||||
const payload: ExpressInterfaceCreateParams = {
|
||||
name: String(form.name || '').trim(),
|
||||
express_code: expressCode,
|
||||
platform_code: String(form.platform_code || '').trim()
|
||||
platform_code: String(form.platform_code || '').trim(),
|
||||
platform_shop_id: toNullableString(form.platform_shop_id)
|
||||
}
|
||||
|
||||
const optionalStrings = [
|
||||
|
||||
@ -1360,12 +1360,15 @@ const addressFieldKeys = ['full_address', 'detail', 'address', 'send_address']
|
||||
|
||||
function applyAddressRaw(raw?: Record<string, any>) {
|
||||
if (!raw) {
|
||||
formData.platform_shop_id = null
|
||||
formData.province_name = ''
|
||||
formData.city_name = ''
|
||||
formData.district_name = ''
|
||||
formData.address = ''
|
||||
return
|
||||
}
|
||||
const platformShopId = String(raw?.platform_shop_id ?? '').trim()
|
||||
formData.platform_shop_id = platformShopId || null
|
||||
const mappedSenderTel = pickFirstExistingString(raw, senderTelFieldKeys)
|
||||
if (mappedSenderTel) {
|
||||
formData.sender_tel = mappedSenderTel
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user