1
This commit is contained in:
parent
d86c65d0df
commit
0265323c09
@ -507,8 +507,8 @@ export function applyExpressInterfaceRowToForm(
|
||||
warehouse_id: toFormOptionalNumber(row.warehouse_id),
|
||||
shop_id: toFormOptionalNumber(row.shop_id ?? row.shopId),
|
||||
name: toFormString(row.name),
|
||||
express_code: signedExpressCode,
|
||||
sys_express_code: customExpressCode,
|
||||
express_code: customExpressCode,
|
||||
sys_express_code: signedExpressCode,
|
||||
is_system_express_code: toFormOptionalNumber(row.is_system_express_code) ?? 1,
|
||||
platform_code: toFormString(row.platform_code),
|
||||
express_name: toFormString(row.express_name || row.express?.name),
|
||||
@ -579,9 +579,14 @@ function omitOptionalNumber(val: unknown): number | undefined {
|
||||
export function buildExpressInterfaceCreatePayload(
|
||||
form: Record<string, any>
|
||||
): ExpressInterfaceCreateParams {
|
||||
const isCustomExpressCode = (omitOptionalNumber(form.is_system_express_code) ?? 1) === 0
|
||||
const expressCode = isCustomExpressCode
|
||||
? String(form.express_code || '').trim()
|
||||
: String(form.sys_express_code || form.express_code || '').trim()
|
||||
|
||||
const payload: ExpressInterfaceCreateParams = {
|
||||
name: String(form.name || '').trim(),
|
||||
express_code: String(form.express_code || '').trim(),
|
||||
express_code: expressCode,
|
||||
platform_code: String(form.platform_code || '').trim()
|
||||
}
|
||||
|
||||
@ -643,14 +648,10 @@ export function buildExpressInterfaceCreatePayload(
|
||||
|
||||
/** setting.expressInterface.update 请求体 */
|
||||
export function buildExpressInterfaceUpdatePayload(form: Record<string, any>): Record<string, any> {
|
||||
const sourceExpressCode = String(form.express_code || '').trim()
|
||||
const customExpressCode = String(form.sys_express_code || '').trim()
|
||||
const basePayload = buildExpressInterfaceCreatePayload(form)
|
||||
|
||||
return {
|
||||
...basePayload,
|
||||
express_code: customExpressCode || sourceExpressCode,
|
||||
sys_express_code: sourceExpressCode || undefined,
|
||||
id: form.id
|
||||
}
|
||||
}
|
||||
|
||||
@ -191,10 +191,10 @@
|
||||
</el-col>
|
||||
|
||||
<el-col :span="12">
|
||||
<el-form-item label="已签约快递" prop="express_code">
|
||||
<el-form-item label="已签约快递" prop="sys_express_code">
|
||||
<div class="signed-express-row">
|
||||
<el-select
|
||||
v-model="formData.express_code"
|
||||
v-model="formData.sys_express_code"
|
||||
class="signed-express-select"
|
||||
filterable
|
||||
clearable
|
||||
@ -207,7 +207,7 @@
|
||||
v-for="item in dialogExpressOptions"
|
||||
:key="item.code"
|
||||
:label="item.label || item.name"
|
||||
:value="item.code"
|
||||
:value="item.sysExpressCode || item.code"
|
||||
/>
|
||||
</el-select>
|
||||
<el-switch
|
||||
@ -221,9 +221,9 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col v-if="useCustomExpressCode" :span="12">
|
||||
<el-form-item label="自定义快递编码" prop="sys_express_code">
|
||||
<el-form-item label="自定义快递编码" prop="express_code">
|
||||
<el-select
|
||||
v-model="formData.sys_express_code"
|
||||
v-model="formData.express_code"
|
||||
filterable
|
||||
clearable
|
||||
:loading="customExpressLoading"
|
||||
@ -514,7 +514,7 @@ import {
|
||||
buildExpressInterfaceUpdatePayload
|
||||
} from './express-interface-config'
|
||||
|
||||
type ExpressOption = { code: string; name: string; label?: string }
|
||||
type ExpressOption = { code: string; name: string; label?: string; sysExpressCode?: string }
|
||||
type PlatformOption = { code: string; name: string; label?: string }
|
||||
type ShopOption = { value: number | string; label: string }
|
||||
type ServiceOption = { code: string; name: string; raw: Record<string, any> }
|
||||
@ -708,9 +708,17 @@ const flatServiceFields = computed<ServiceFlatField[]>(() => {
|
||||
})
|
||||
|
||||
const dialogSiteOptions = computed<SiteOption[]>(() => {
|
||||
const expressCode = String(formData.express_code || '').trim()
|
||||
if (!expressCode) return []
|
||||
return shopExpressSitesMap.value[expressCode] || []
|
||||
const selectedSignedCode = String(formData.sys_express_code || '').trim()
|
||||
const selectedSignedExpress = dialogExpressOptions.value.find(
|
||||
(item) => String(item.sysExpressCode || item.code || '').trim() === selectedSignedCode
|
||||
)
|
||||
const selectedSysCode = String(selectedSignedExpress?.sysExpressCode || formData.express_code || '').trim()
|
||||
if (!selectedSignedCode && !selectedSysCode) return []
|
||||
return (
|
||||
shopExpressSitesMap.value[selectedSignedCode] ||
|
||||
shopExpressSitesMap.value[selectedSysCode] ||
|
||||
[]
|
||||
)
|
||||
})
|
||||
|
||||
const selectedSite = computed<SiteOption | null>(() => {
|
||||
@ -806,7 +814,7 @@ const rules = computed<FormRules>(() => {
|
||||
sys_express_code: [
|
||||
{
|
||||
validator: (_rule, value, callback) => {
|
||||
if (!useCustomExpressCode.value) {
|
||||
if (!selectedShopId.value || dialogExpressOptions.value.length === 0) {
|
||||
callback()
|
||||
return
|
||||
}
|
||||
@ -822,15 +830,7 @@ const rules = computed<FormRules>(() => {
|
||||
express_code: [
|
||||
{
|
||||
validator: (_rule, value, callback) => {
|
||||
if (dialogMode.value === 'create') {
|
||||
if (value === null || value === undefined || String(value).trim() === '') {
|
||||
callback(new Error('请选择快递编码'))
|
||||
return
|
||||
}
|
||||
callback()
|
||||
return
|
||||
}
|
||||
if (!selectedShopId.value || dialogExpressOptions.value.length === 0) {
|
||||
if (!useCustomExpressCode.value) {
|
||||
callback()
|
||||
return
|
||||
}
|
||||
@ -1118,10 +1118,10 @@ async function loadPrintPlatformTemplateOptions(sourceExpressCode?: string, sour
|
||||
}
|
||||
|
||||
async function loadCustomExpressOptions(sourceExpressCode?: string) {
|
||||
const expressCode = String(sourceExpressCode ?? formData.express_code ?? '').trim().toUpperCase()
|
||||
const expressCode = String(sourceExpressCode ?? formData.sys_express_code ?? '').trim().toUpperCase()
|
||||
if (!expressCode) {
|
||||
customExpressOptions.value = []
|
||||
formData.sys_express_code = ''
|
||||
formData.express_code = ''
|
||||
return
|
||||
}
|
||||
if (customExpressLoading.value) return
|
||||
@ -1138,18 +1138,21 @@ async function loadCustomExpressOptions(sourceExpressCode?: string) {
|
||||
}
|
||||
const nextOptions = (res?.data || [])
|
||||
.map((item: any) => ({
|
||||
code: String(item?.code || item?.custom_code || item?.sys_express_code || item?.express_code || '').trim(),
|
||||
code: String(item?.sys_express_code || item?.code || item?.custom_code || item?.express_code || '').trim(),
|
||||
name: String(item?.name || item?.express_name || item?.code || '').trim(),
|
||||
label: String(item?.label || item?.name || item?.code || '').trim()
|
||||
label: String(item?.label || item?.name || item?.code || '').trim(),
|
||||
sysExpressCode: String(item?.sys_express_code || '').trim()
|
||||
}))
|
||||
.filter((item: ExpressOption) => !!item.code)
|
||||
customExpressOptions.value = nextOptions
|
||||
|
||||
const currentCustomCode = String(formData.sys_express_code || '').trim()
|
||||
const currentCustomCode = String(formData.express_code || '').trim()
|
||||
if (!currentCustomCode) return
|
||||
const exists = nextOptions.some((item: ExpressOption) => item.code === currentCustomCode)
|
||||
const exists = nextOptions.some((item: ExpressOption) => {
|
||||
return String(item.sysExpressCode || item.code || '').trim() === currentCustomCode
|
||||
})
|
||||
if (!exists) {
|
||||
formData.sys_express_code = ''
|
||||
formData.express_code = ''
|
||||
}
|
||||
} catch {
|
||||
customExpressOptions.value = []
|
||||
@ -1211,11 +1214,12 @@ async function loadShopExpressOptions(shopId: string | number) {
|
||||
dialogExpressOptions.value = list
|
||||
.map((item: any) => {
|
||||
const code = item?.wp_code || item?.express_code || item?.code
|
||||
const sysExpressCode = String(item?.sys_express_code || item?.express_code || item?.code || '').trim()
|
||||
const name = item?.wp_name || item?.express_name || item?.name
|
||||
const label = item?.label || name
|
||||
if (code) {
|
||||
const accounts = Array.isArray(item?.accounts) ? item.accounts : []
|
||||
siteMap[code] = accounts.map((acc: any, idx: number) => {
|
||||
const mappedSites = accounts.map((acc: any, idx: number) => {
|
||||
const shipAddresses = Array.isArray(acc?.ship_addresses) ? acc.ship_addresses : []
|
||||
const addresses = (shipAddresses.length > 0 ? shipAddresses : [{}]).map((address: any, adx: number) => {
|
||||
const raw = {
|
||||
@ -1304,10 +1308,39 @@ async function loadShopExpressOptions(shopId: string | number) {
|
||||
addresses
|
||||
}
|
||||
})
|
||||
siteMap[code] = mappedSites
|
||||
if (sysExpressCode && sysExpressCode !== code) {
|
||||
siteMap[sysExpressCode] = mappedSites
|
||||
}
|
||||
}
|
||||
return { code, name, label }
|
||||
return { code, name, label, sysExpressCode }
|
||||
})
|
||||
.filter((item: ExpressOption) => !!item.code)
|
||||
|
||||
const currentSignedCode = String(formData.sys_express_code || '').trim()
|
||||
const hasMatchedSignedCode = dialogExpressOptions.value.some(
|
||||
(item) => String(item.sysExpressCode || item.code || '').trim() === currentSignedCode
|
||||
)
|
||||
if (!hasMatchedSignedCode) {
|
||||
const currentSignedOrCustomCode = String(formData.sys_express_code || formData.express_code || '').trim()
|
||||
if (currentSignedOrCustomCode) {
|
||||
const matchedBySignedCode = dialogExpressOptions.value.find((item) => {
|
||||
const optionValue = String(item.sysExpressCode || item.code || '').trim()
|
||||
const wpCode = String(item.code || '').trim()
|
||||
const sysCode = String(item.sysExpressCode || '').trim()
|
||||
return (
|
||||
optionValue === currentSignedOrCustomCode ||
|
||||
sysCode === currentSignedOrCustomCode ||
|
||||
wpCode === currentSignedOrCustomCode
|
||||
)
|
||||
})
|
||||
if (matchedBySignedCode) {
|
||||
formData.sys_express_code = String(
|
||||
matchedBySignedCode.sysExpressCode || matchedBySignedCode.code || ''
|
||||
).trim()
|
||||
}
|
||||
}
|
||||
}
|
||||
shopExpressSitesMap.value = siteMap
|
||||
} catch {
|
||||
dialogExpressOptions.value = []
|
||||
@ -1507,19 +1540,28 @@ function syncExtDataByServiceSelection() {
|
||||
}
|
||||
|
||||
async function handleExpressCodeChange() {
|
||||
const currentExpressCode = String(formData.express_code || '').trim()
|
||||
const selectedSignedExpress = dialogExpressOptions.value.find(
|
||||
(item) =>
|
||||
String(item.sysExpressCode || item.code || '').trim() === String(formData.sys_express_code || '').trim()
|
||||
)
|
||||
const currentExpressCode = String(
|
||||
selectedSignedExpress?.sysExpressCode || formData.sys_express_code || ''
|
||||
).trim()
|
||||
selectedSiteKey.value = ''
|
||||
selectedAddressKey.value = ''
|
||||
formData.site_code = ''
|
||||
formData.shipperno = ''
|
||||
formData.sys_express_code = ''
|
||||
customExpressOptions.value = []
|
||||
if (useCustomExpressCode.value) {
|
||||
formData.express_code = ''
|
||||
}
|
||||
formData.template_url = ''
|
||||
templateOptions.value = []
|
||||
applyAddressRaw(undefined)
|
||||
serviceValueMap.value = {}
|
||||
syncExtDataByServiceSelection()
|
||||
await loadPrintPlatformTemplateOptions(currentExpressCode, formData.platform_code)
|
||||
console.log('handleExpressCodeChange', { currentExpressCode, platformCode: formData.platform_code })
|
||||
await loadPrintPlatformTemplateOptions(currentExpressCode, formData.sys_platform_code)
|
||||
if (!useCustomExpressCode.value || !currentExpressCode) return
|
||||
await loadCustomExpressOptions(currentExpressCode)
|
||||
}
|
||||
@ -1532,12 +1574,12 @@ async function handleCustomExpressSwitchChange(value: boolean) {
|
||||
useCustomExpressCode.value = value
|
||||
formData.is_system_express_code = value ? 0 : 1
|
||||
if (!value) {
|
||||
formData.sys_express_code = ''
|
||||
customExpressOptions.value = []
|
||||
formRef.value?.clearValidate('sys_express_code')
|
||||
formRef.value?.clearValidate('express_code')
|
||||
return
|
||||
}
|
||||
await loadCustomExpressOptions(formData.express_code)
|
||||
formData.express_code = ''
|
||||
await loadCustomExpressOptions(formData.sys_express_code)
|
||||
}
|
||||
|
||||
async function handlePlatformCodeChange(value: string | number | undefined) {
|
||||
@ -1657,7 +1699,7 @@ async function openEdit(row: ExpressInterfaceRecord) {
|
||||
useCustomExpressCode.value = !!String(formData.sys_express_code || '').trim()
|
||||
}
|
||||
if (useCustomExpressCode.value) {
|
||||
await loadCustomExpressOptions(formData.express_code)
|
||||
await loadCustomExpressOptions(formData.sys_express_code)
|
||||
}
|
||||
editExpressRelation.value =
|
||||
row.express && typeof row.express === 'object' ? (row.express as Record<string, any>) : null
|
||||
@ -1718,9 +1760,10 @@ async function openEdit(row: ExpressInterfaceRecord) {
|
||||
} else if (formData.express_code) {
|
||||
dialogExpressOptions.value = [
|
||||
{
|
||||
code: formData.express_code,
|
||||
name: formData.express_code,
|
||||
label: formData.express_code
|
||||
code: formData.sys_express_code || formData.express_code,
|
||||
name: formData.sys_express_code || formData.express_code,
|
||||
label: formData.sys_express_code || formData.express_code,
|
||||
sysExpressCode: formData.sys_express_code || formData.express_code
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user