From 580893127b7c16409d47ac052b10e7db39949177 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Sat, 23 May 2026 00:53:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E9=80=92=E6=8E=A5=E5=8F=A3=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=9B=BA=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index/index.ts | 10 +- .../expressInterface.ts | 1 + .../express-interface-config.ts | 6 +- .../system/setting/expressinterface/index.vue | 824 ++++++++++++------ 4 files changed, 548 insertions(+), 293 deletions(-) diff --git a/src/api/index/index.ts b/src/api/index/index.ts index 82d6248e..71b0dbd5 100644 --- a/src/api/index/index.ts +++ b/src/api/index/index.ts @@ -199,8 +199,12 @@ export function getPlatformOauthLink(data?: { } as any) } -/** 获取当前登录仓库下的店铺列表 */ -export function getShopList() { +/** 获取当前登录仓库下的店铺列表(可按平台编码过滤) */ +export function getShopList(data?: { + platform_code?: string + platformCode?: string + code?: string +}) { return request({ url: '/system', method: 'post', @@ -209,7 +213,7 @@ export function getShopList() { v: '1.0', timestamp: new Date().getTime() }, - data: {}, + data: data ?? {}, isSystemApi: true } as any) } diff --git a/src/api/setting.expressInterface/expressInterface.ts b/src/api/setting.expressInterface/expressInterface.ts index cbfcdd0b..d34a33f3 100644 --- a/src/api/setting.expressInterface/expressInterface.ts +++ b/src/api/setting.expressInterface/expressInterface.ts @@ -45,6 +45,7 @@ export type ExpressInterfaceCreateParams = { name: string express_code: string platform_code: string + shop_id?: number sys_express_code?: string sender_name?: string sender_tel?: string diff --git a/src/views/system/setting/expressinterface/express-interface-config.ts b/src/views/system/setting/expressinterface/express-interface-config.ts index 2161823b..333bd0d7 100644 --- a/src/views/system/setting/expressinterface/express-interface-config.ts +++ b/src/views/system/setting/expressinterface/express-interface-config.ts @@ -423,6 +423,7 @@ export function getDistrictNodes(provinceCode: string, cityCode: string): Region export const defaultExpressInterfaceForm = { id: undefined as number | undefined, warehouse_id: undefined as number | undefined, + shop_id: undefined as number | undefined, name: '', express_code: '', sys_express_code: '', @@ -488,6 +489,7 @@ export function applyExpressInterfaceRowToForm( Object.assign(form, { id: row.id, warehouse_id: toFormOptionalNumber(row.warehouse_id), + shop_id: toFormOptionalNumber(row.shop_id ?? row.shopId), name: toFormString(row.name), express_code: toFormString(row.express_code), sys_express_code: toFormString(row.sys_express_code), @@ -586,11 +588,11 @@ export function buildExpressInterfaceCreatePayload( if (v !== undefined) payload[key] = v } - const optionalNumbers = ['weight', 'weight_type', 'share_id', 'ispickup', 'can_use_count'] as const + const optionalNumbers = ['shop_id', 'weight', 'weight_type', 'share_id', 'ispickup', 'can_use_count'] as const for (const key of optionalNumbers) { const n = omitOptionalNumber(form[key]) if (n === undefined) continue - if (key === 'weight' || key === 'weight_type' || key === 'ispickup' || key === 'can_use_count') { + if (key === 'shop_id' || key === 'weight' || key === 'weight_type' || key === 'ispickup' || key === 'can_use_count') { ;(payload as Record)[key] = Math.round(n) } else { ;(payload as Record)[key] = n diff --git a/src/views/system/setting/expressinterface/index.vue b/src/views/system/setting/expressinterface/index.vue index e6a92431..43a7c541 100644 --- a/src/views/system/setting/expressinterface/index.vue +++ b/src/views/system/setting/expressinterface/index.vue @@ -127,55 +127,7 @@ @close="resetForm" > -
-
列表记录(只读)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ editExpressRelation.code || formData.express_code || '--' }} - - - {{ editExpressRelation.name || formData.express_name || '--' }} - - - {{ editExpressRelation.platform ?? '--' }} - - - - -
+
基础配置
@@ -185,25 +137,6 @@ - - - - - - -
@@ -212,6 +145,7 @@ class="platform-select" filterable placeholder="请选择平台编码" + @change="handlePlatformCodeChange" > +
+
+
+ + +
+ + + - 授权 + 新增授权店铺
+ - + +
+ + + + +
+
+
+ + - - - - - - +
发件信息
+ + + + + + + + + + - + - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -398,20 +369,18 @@
接口参数
- + - + + + + + + @@ -419,55 +388,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -538,6 +459,7 @@ type ExpressOption = { code: string; name: string; label?: string } type PlatformOption = { code: string; name: string; label?: string } type ShopOption = { value: number | string; label: string } type ServiceOption = { code: string; name: string; raw: Record } +type AddressOption = { key: string; label: string; raw: Record } type ServiceFlatField = { key: string serviceCode: string @@ -557,6 +479,12 @@ type SiteOption = { raw: Record branch_code?: string branch_name?: string + quantity?: string | number + allocated_quantity?: string | number + recycled_quantity?: string | number + cancel_quantity?: string | number + services?: ServiceOption[] + addresses?: AddressOption[] } type ExpressInterfaceRecord = Record @@ -592,6 +520,7 @@ const saving = ref(false) const authLoading = ref(false) const shopLoading = ref(false) const shopExpressLoading = ref(false) +const customExpressLoading = ref(false) const queryTime = ref(0) const tableSize = ref<'small' | 'default' | 'large'>('small') const detailVisible = ref(false) @@ -609,21 +538,27 @@ const expressOptions = ref([]) const platformOptions = ref([]) const shopOptions = ref([]) const dialogExpressOptions = ref([]) +const customExpressOptions = ref([]) const selectedShopId = ref(undefined) +const useCustomExpressCode = ref(false) const serviceValueMap = ref>({}) -const shopExpressServicesMap = ref>({}) const shopExpressSitesMap = ref>({}) const selectedSiteKey = ref('') +const selectedAddressKey = ref('') const SERVICE_EMPTY_ENUM_TOKEN = '__SERVICE_EMPTY_ENUM__' -const EXCLUDED_SERVICE_NAME_PATTERN = /保价/ +const EXCLUDED_SERVICE_PATTERN = /保价|子母单/ + +function shouldExcludeService(item: ServiceOption) { + const name = String(item?.name || item?.raw?.service_name || '').trim() + const desc = String(item?.raw?.service_desc || '').trim() + const code = String(item?.code || item?.raw?.service_code || '').trim() + return EXCLUDED_SERVICE_PATTERN.test(name) || EXCLUDED_SERVICE_PATTERN.test(desc) || EXCLUDED_SERVICE_PATTERN.test(code) +} const dialogServiceOptions = computed(() => { - const expressCode = String(formData.express_code || '').trim() - if (!expressCode) return [] - return (shopExpressServicesMap.value[expressCode] || []).filter((item) => { - const serviceName = String(item?.name || item?.raw?.service_name || '').trim() - return !EXCLUDED_SERVICE_NAME_PATTERN.test(serviceName) - }) + const site = selectedSite.value + if (!site || !Array.isArray(site.services)) return [] + return site.services.filter((item) => !shouldExcludeService(item)) }) function parseTypeDesc(raw: unknown) { @@ -720,6 +655,17 @@ const selectedSite = computed(() => { return dialogSiteOptions.value.find((item) => item.key === selectedSiteKey.value) || null }) +const dialogAddressOptions = computed(() => { + const site = selectedSite.value + if (!site || !Array.isArray(site.addresses)) return [] + return site.addresses +}) + +const selectedAddress = computed(() => { + if (!selectedAddressKey.value) return null + return dialogAddressOptions.value.find((item) => item.key === selectedAddressKey.value) || null +}) + const warehouseContextHint = computed(() => { const u = userStore.user || {} const sid = u.store_id ?? u.warehouse_id @@ -754,6 +700,48 @@ const editExtDataDisplay = computed(() => const rules = computed(() => { return { name: [{ required: true, message: '请输入配置名称', trigger: 'blur' }], + sender_name: [ + { + required: true, + validator: (_rule, value, callback) => { + if (value === null || value === undefined || String(value).trim() === '') { + callback(new Error('请输入发件人')) + return + } + callback() + }, + trigger: 'blur' + } + ], + sender_tel: [ + { + required: true, + validator: (_rule, value, callback) => { + if (value === null || value === undefined || String(value).trim() === '') { + callback(new Error('请输入发件电话')) + return + } + callback() + }, + trigger: 'blur' + } + ], + sys_express_code: [ + { + validator: (_rule, value, callback) => { + if (!useCustomExpressCode.value) { + callback() + return + } + if (value === null || value === undefined || String(value).trim() === '') { + callback(new Error('请选择自定义快递编码')) + return + } + callback() + }, + trigger: 'change' + } + ], express_code: [ { validator: (_rule, value, callback) => { @@ -789,22 +777,18 @@ const senderTelFieldKeys = [ 'sender_tel', 'sender_phone', 'sender_mobile', + 'contact_mobile', 'contact_tel', 'contact_phone', + 'phone_number', + 'mobile_phone', + 'telephone', + 'tel', 'phone', 'mobile' ] -function hasAnyKeyInSite(keyList: string[]) { - return dialogSiteOptions.value.some((item) => - keyList.some((key) => Object.prototype.hasOwnProperty.call(item.raw || {}, key)) - ) -} - -const showSenderNameField = computed(() => hasAnyKeyInSite(senderNameFieldKeys)) -const showSenderTelField = computed(() => hasAnyKeyInSite(senderTelFieldKeys)) const showRegionField = computed(() => { - if (dialogSiteOptions.value.length === 0) return true return !!selectedSite.value }) @@ -1008,11 +992,45 @@ async function loadPlatformOptions() { } } -async function loadShopOptions() { +async function loadCustomExpressOptions() { + if (customExpressLoading.value) return + customExpressLoading.value = true + try { + const res: any = await getExpressList({}) + if (!isSuccess(res)) { + customExpressOptions.value = [] + ElMessage.error(res?.message || '获取自定义快递编码列表失败') + return + } + customExpressOptions.value = (res?.data || []) + .map((item: any) => ({ + code: String(item?.express_code || item?.code || '').trim(), + name: String(item?.express_name || item?.name || '').trim(), + label: String(item?.label || item?.express_name || item?.name || '').trim() + })) + .filter((item: ExpressOption) => !!item.code) + } catch { + customExpressOptions.value = [] + ElMessage.error('获取自定义快递编码列表失败') + } finally { + customExpressLoading.value = false + } +} + +async function loadShopOptions(platformCode?: string) { + const normalizedPlatformCode = String(platformCode || '').trim() + if (!normalizedPlatformCode) { + shopOptions.value = [] + return + } if (shopLoading.value) return shopLoading.value = true try { - const res: any = await getShopList() + const res: any = await getShopList({ + platform_code: normalizedPlatformCode, + platformCode: normalizedPlatformCode, + code: normalizedPlatformCode + }) if (!isSuccess(res)) { shopOptions.value = [] ElMessage.error(res?.message || '获取店铺列表失败') @@ -1047,7 +1065,6 @@ async function loadShopExpressOptions(shopId: string | number) { return } const list = Array.isArray(res?.data?.list) ? res.data.list : [] - const serviceMap: Record = {} const siteMap: Record = {} dialogExpressOptions.value = list .map((item: any) => { @@ -1055,60 +1072,103 @@ async function loadShopExpressOptions(shopId: string | number) { const name = item?.wp_name || item?.express_name || item?.name const label = item?.label || name if (code) { - const uniq = new Map() const accounts = Array.isArray(item?.accounts) ? item.accounts : [] - const siteUniq = new Map() - for (const acc of accounts) { - const services = Array.isArray(acc?.services) ? acc.services : [] + siteMap[code] = accounts.map((acc: any, idx: number) => { const shipAddresses = Array.isArray(acc?.ship_addresses) ? acc.ship_addresses : [] - for (const service of services) { - const serviceCode = String(service?.service_code || '').trim() - if (!serviceCode) continue - if (!uniq.has(serviceCode)) { - uniq.set(serviceCode, { - code: serviceCode, - name: String(service?.service_name || serviceCode), - raw: service - }) - } - } - - shipAddresses.forEach((address: any, idx: number) => { + const addresses = (shipAddresses.length > 0 ? shipAddresses : [{}]).map((address: any, adx: number) => { const raw = { ...(address || {}), + ...(acc || {}), branch_code: acc?.branch_code, branch_name: acc?.branch_name } - const addressText = String(address?.full_address || address?.detail || '').trim() - const branchName = String(acc?.branch_name || '').trim() - const branchCode = String(acc?.branch_code || '').trim() - const key = `${branchCode || branchName || 'branch'}-${idx}` - const label = - [branchName, addressText] - .filter((s) => !!s) - .join(' / ') || `${branchCode || '站点'}-${idx + 1}` - if (!siteUniq.has(key)) { - siteUniq.set(key, { - key, - label, - raw, - branch_code: acc?.branch_code, - branch_name: acc?.branch_name - }) + const addrText = pickFirstExistingString(raw, addressFieldKeys) || `地址${adx + 1}` + return { + key: `${String(acc?.branch_code || acc?.branch_name || 'addr')}-${adx}`, + label: addrText, + raw } }) - } - serviceMap[code] = Array.from(uniq.values()) - siteMap[code] = Array.from(siteUniq.values()) + const primaryAddress = (addresses[0]?.raw || {}) as Record + + const serviceUniq = new Map() + ;(Array.isArray(acc?.services) ? acc.services : []).forEach((service: any) => { + const serviceCode = String(service?.service_code || '').trim() + if (!serviceCode || serviceUniq.has(serviceCode)) return + serviceUniq.set(serviceCode, { + code: serviceCode, + name: String(service?.service_name || serviceCode), + raw: service + }) + }) + + const fallbackSenderTel = + String( + primaryAddress?.sender_tel || + primaryAddress?.sender_phone || + primaryAddress?.sender_mobile || + primaryAddress?.contact_mobile || + primaryAddress?.contact_tel || + primaryAddress?.contact_phone || + primaryAddress?.phone_number || + primaryAddress?.mobile_phone || + primaryAddress?.telephone || + primaryAddress?.tel || + primaryAddress?.phone || + primaryAddress?.mobile || + acc?.sender_tel || + acc?.sender_phone || + acc?.sender_mobile || + acc?.contact_mobile || + acc?.contact_tel || + acc?.contact_phone || + acc?.phone_number || + acc?.mobile_phone || + acc?.telephone || + acc?.tel || + acc?.phone || + acc?.mobile || + '' + ).trim() + + const branchName = String(acc?.branch_name || '').trim() + const branchCode = String(acc?.branch_code || '').trim() + const quantity = acc?.quantity ?? '--' + const allocatedQuantity = acc?.allocated_quantity ?? '--' + const recycledQuantity = acc?.recycled_quantity ?? '--' + const cancelQuantity = acc?.cancel_quantity ?? '--' + const siteLabelParts = [branchName, branchCode ? `(${branchCode})` : ''].filter((s) => !!s) + const label = + `${siteLabelParts.join(' ')} | 数量:${quantity} 分配:${allocatedQuantity} 回收:${recycledQuantity} 取消:${cancelQuantity}`.trim() || + `网点-${idx + 1}` + + return { + key: `${branchCode || branchName || 'branch'}-${idx}`, + label, + raw: { + ...(primaryAddress || {}), + ...(acc || {}), + branch_code: acc?.branch_code, + branch_name: acc?.branch_name, + sender_tel: fallbackSenderTel + }, + branch_code: acc?.branch_code, + branch_name: acc?.branch_name, + quantity, + allocated_quantity: allocatedQuantity, + recycled_quantity: recycledQuantity, + cancel_quantity: cancelQuantity, + services: Array.from(serviceUniq.values()), + addresses + } + }) } return { code, name, label } }) .filter((item: ExpressOption) => !!item.code) - shopExpressServicesMap.value = serviceMap shopExpressSitesMap.value = siteMap } catch { dialogExpressOptions.value = [] - shopExpressServicesMap.value = {} shopExpressSitesMap.value = {} ElMessage.error('获取店铺快递列表失败') } finally { @@ -1118,28 +1178,136 @@ async function loadShopExpressOptions(shopId: string | number) { const addressFieldKeys = ['full_address', 'detail', 'address', 'send_address'] +function applyAddressRaw(raw?: Record) { + if (!raw) { + formData.province_name = '' + formData.city_name = '' + formData.district_name = '' + formData.address = '' + return + } + const mappedSenderTel = pickFirstExistingString(raw, senderTelFieldKeys) + if (mappedSenderTel) { + formData.sender_tel = mappedSenderTel + } + formData.province_name = String(raw?.province || '').trim() + formData.city_name = String(raw?.city || '').trim() + formData.district_name = String(raw?.district || '').trim() + formData.address = pickFirstExistingString(raw, addressFieldKeys) +} + function handleSiteChange(value: string) { selectedSiteKey.value = value || '' + selectedAddressKey.value = '' + serviceValueMap.value = {} + syncExtDataByServiceSelection() const site = selectedSite.value if (!site) { formData.site_code = '' - formData.address = '' + applyAddressRaw(undefined) return } formData.site_code = String(site.branch_code || '').trim() + initializeAddressSelection() +} - if (dialogMode.value === 'create' || showSenderNameField.value) { - formData.sender_name = pickFirstExistingString(site.raw, senderNameFieldKeys) - } - if (dialogMode.value === 'create' || showSenderTelField.value) { - formData.sender_tel = pickFirstExistingString(site.raw, senderTelFieldKeys) +function handleAddressChange(value: string) { + selectedAddressKey.value = value || '' + applyAddressRaw(selectedAddress.value?.raw || selectedSite.value?.raw) +} + +function initializeAddressSelection(preferredAddress?: string) { + const addresses = dialogAddressOptions.value + if (!addresses.length) { + selectedAddressKey.value = '' + applyAddressRaw(selectedSite.value?.raw) + return } - formData.province_name = String(site.raw?.province || '').trim() - formData.city_name = String(site.raw?.city || '').trim() - formData.district_name = String(site.raw?.district || '').trim() - formData.address = pickFirstExistingString(site.raw, addressFieldKeys) + const normalizedPreferredAddress = String(preferredAddress || '').trim() + const compactPreferredAddress = normalizedPreferredAddress.replace(/\s+/g, '') + const matchedAddress = normalizedPreferredAddress + ? addresses.find((item) => { + const text = pickFirstExistingString(item.raw, addressFieldKeys) + const normalizedText = String(text || '').trim() + const compactText = normalizedText.replace(/\s+/g, '') + return ( + normalizedText === normalizedPreferredAddress || + compactText === compactPreferredAddress || + compactText.includes(compactPreferredAddress) || + compactPreferredAddress.includes(compactText) + ) + }) + : null + const target = matchedAddress || addresses[0] + if (!target) return + handleAddressChange(target.key) +} + +function initializeSiteSelection( + preferredSiteCode?: string, + preferredAddress?: string, + preferredServiceCodes?: string[] +) { + const sites = dialogSiteOptions.value + if (!sites.length) { + selectedSiteKey.value = '' + selectedAddressKey.value = '' + formData.site_code = '' + applyAddressRaw(undefined) + return + } + + const normalizedPreferredCode = String(preferredSiteCode || '').trim() + const normalizedPreferredAddress = String(preferredAddress || '').trim() + const compactPreferredAddress = normalizedPreferredAddress.replace(/\s+/g, '') + const matchedByCode = normalizedPreferredCode + ? sites.find((item) => String(item.branch_code || '').trim() === normalizedPreferredCode) + : null + + const matchedByAddress = !matchedByCode && compactPreferredAddress + ? sites.find((site) => { + const addresses = Array.isArray(site.addresses) ? site.addresses : [] + return addresses.some((addr) => { + const text = pickFirstExistingString(addr.raw, addressFieldKeys) + const compactText = String(text || '').trim().replace(/\s+/g, '') + return ( + compactText === compactPreferredAddress || + compactText.includes(compactPreferredAddress) || + compactPreferredAddress.includes(compactText) + ) + }) + }) + : null + + const serviceCodes = Array.isArray(preferredServiceCodes) + ? preferredServiceCodes.map((code) => String(code || '').trim()).filter((code) => !!code) + : [] + let matchedByServices: SiteOption | null = null + if (!matchedByCode && !matchedByAddress && serviceCodes.length > 0) { + let bestScore = 0 + for (const site of sites) { + const siteServiceCodes = new Set( + (Array.isArray(site.services) ? site.services : []) + .map((svc) => String(svc?.code || '').trim()) + .filter((code) => !!code) + ) + let score = 0 + serviceCodes.forEach((code) => { + if (siteServiceCodes.has(code)) score += 1 + }) + if (score > bestScore) { + bestScore = score + matchedByServices = site + } + } + } + + const target = matchedByCode || matchedByAddress || matchedByServices || sites[0] + if (!target) return + handleSiteChange(target.key) + initializeAddressSelection(preferredAddress) } function syncExtDataByServiceSelection() { @@ -1158,32 +1326,27 @@ function syncExtDataByServiceSelection() { bucket[field.attrCode] = toServicePayloadValue(v) }) - const services = dialogServiceOptions.value.map((service) => { - const cloned = JSON.parse(JSON.stringify(service.raw || {})) - const attrs = Array.isArray(cloned.attributes) ? cloned.attributes : [] - const attrValues = valueByService[service.code] || {} - cloned.attributes = attrs.map((attr: any) => { - const code = String(attr?.attribute_code || '') - if (code && Object.prototype.hasOwnProperty.call(attrValues, code)) { - return { ...attr, value: attrValues[code] } - } - return attr - }) - return cloned + const serviceSelection: Record = {} + Object.entries(valueByService).forEach(([serviceCode, attrValues]) => { + const entries = Object.entries(attrValues || {}) + if (entries.length === 0) return + if (entries.length === 1) { + const firstEntry = entries[0] + if (!firstEntry) return + serviceSelection[serviceCode] = firstEntry[1] + return + } + serviceSelection[serviceCode] = attrValues }) - formData.ext_data = { - shop_id: selectedShopId.value, - platform_code: formData.platform_code, - express_code: expressCode, - service_values: valueByService, - services - } + formData.ext_data = Object.keys(serviceSelection).length > 0 ? serviceSelection : undefined } function handleExpressCodeChange() { selectedSiteKey.value = '' + selectedAddressKey.value = '' formData.site_code = '' + applyAddressRaw(undefined) serviceValueMap.value = {} syncExtDataByServiceSelection() } @@ -1192,19 +1355,49 @@ function handleServiceValueChange() { syncExtDataByServiceSelection() } +async function handleCustomExpressSwitchChange(value: boolean) { + useCustomExpressCode.value = value + if (!value) { + formData.sys_express_code = '' + formRef.value?.clearValidate('sys_express_code') + return + } + await loadCustomExpressOptions() +} + +async function handlePlatformCodeChange(value: string | number | undefined) { + const platformCode = String(value ?? '').trim() + formData.platform_code = platformCode + selectedShopId.value = undefined + formData.shop_id = undefined + formData.shop_name = '' + formData.express_code = '' + formData.site_code = '' + selectedSiteKey.value = '' + selectedAddressKey.value = '' + applyAddressRaw(undefined) + serviceValueMap.value = {} + formData.ext_data = undefined + dialogExpressOptions.value = [] + shopExpressSitesMap.value = {} + await loadShopOptions(platformCode) +} + async function handleShopChange(value: string | number | undefined) { const target = value ?? undefined selectedShopId.value = target + formData.shop_id = target const current = shopOptions.value.find((item) => item.value === target) formData.shop_name = current?.label || '' formData.express_code = '' serviceValueMap.value = {} formData.ext_data = undefined dialogExpressOptions.value = [] - shopExpressServicesMap.value = {} shopExpressSitesMap.value = {} selectedSiteKey.value = '' + selectedAddressKey.value = '' formData.site_code = '' + applyAddressRaw(undefined) if (target === undefined || target === null || target === '') return await loadShopExpressOptions(target) } @@ -1235,6 +1428,7 @@ function isExternalSharedInterface(row: ExpressInterfaceRecord | null | undefine function resetForm() { Object.assign(formData, { ...defaultExpressInterfaceForm }) editExpressRelation.value = null + useCustomExpressCode.value = false serviceValueMap.value = {} formRef.value?.clearValidate() } @@ -1244,11 +1438,12 @@ async function openCreate() { dialogVisible.value = true resetForm() selectedShopId.value = undefined + formData.shop_id = undefined dialogExpressOptions.value = [] - shopExpressServicesMap.value = {} shopExpressSitesMap.value = {} selectedSiteKey.value = '' - await loadShopOptions() + selectedAddressKey.value = '' + shopOptions.value = [] } async function openEdit(row: ExpressInterfaceRecord) { @@ -1259,40 +1454,65 @@ async function openEdit(row: ExpressInterfaceRecord) { dialogMode.value = 'edit' dialogVisible.value = true selectedShopId.value = undefined + formData.shop_id = undefined serviceValueMap.value = {} dialogExpressOptions.value = [] - shopExpressServicesMap.value = {} shopExpressSitesMap.value = {} selectedSiteKey.value = '' - await loadShopOptions() + selectedAddressKey.value = '' applyExpressInterfaceRowToForm(formData, row) + useCustomExpressCode.value = !!String(formData.sys_express_code || '').trim() + if (useCustomExpressCode.value) { + await loadCustomExpressOptions() + } editExpressRelation.value = row.express && typeof row.express === 'object' ? (row.express as Record) : null + const platformCode = String(formData.platform_code || '').trim() + await loadShopOptions(platformCode) const rowShopId = row.shop_id ?? row.shopId ?? (formData.ext_data as Record | undefined)?.shop_id if (rowShopId !== undefined && rowShopId !== null && rowShopId !== '') { selectedShopId.value = rowShopId + formData.shop_id = rowShopId await loadShopExpressOptions(rowShopId) const rowSiteCode = String(row.site_code || '').trim() - if (rowSiteCode) { - const matchedSite = dialogSiteOptions.value.find( - (item) => String(item.branch_code || '').trim() === rowSiteCode - ) - if (matchedSite) { - selectedSiteKey.value = matchedSite.key - } - } - const extServiceValues = (formData.ext_data as any)?.service_values + const extData = formData.ext_data as any + const extServiceValues = + extData && typeof extData === 'object' + ? extData.service_values && typeof extData.service_values === 'object' + ? extData.service_values + : extData + : null + const preferredServiceCodes = + extServiceValues && typeof extServiceValues === 'object' + ? Object.keys(extServiceValues).map((key) => String(key || '').trim()).filter((key) => !!key) + : [] + initializeSiteSelection(rowSiteCode, String(row.address || '').trim(), preferredServiceCodes) if (extServiceValues && typeof extServiceValues === 'object') { const patch: Record = {} + const serviceFieldCount: Record = {} + flatServiceFields.value.forEach((field) => { + serviceFieldCount[field.serviceCode] = (serviceFieldCount[field.serviceCode] || 0) + 1 + }) flatServiceFields.value.forEach((field) => { const svcValues = extServiceValues[field.serviceCode] - if (svcValues && Object.prototype.hasOwnProperty.call(svcValues, field.attrCode)) { - patch[field.key] = - field.renderAs === 'select' - ? toServiceOptionValue(svcValues[field.attrCode]) - : svcValues[field.attrCode] + if (svcValues === undefined || svcValues === null) return + + let resolvedValue: any + if (typeof svcValues === 'object' && !Array.isArray(svcValues)) { + if (Object.prototype.hasOwnProperty.call(svcValues, field.attrCode)) { + resolvedValue = svcValues[field.attrCode] + } else { + return + } + } else { + const onlyOneAttr = (serviceFieldCount[field.serviceCode] || 0) <= 1 + if (!onlyOneAttr && field.attrCode !== 'value') return + resolvedValue = svcValues } + + patch[field.key] = + field.renderAs === 'select' ? toServiceOptionValue(resolvedValue) : resolvedValue }) serviceValueMap.value = patch } @@ -1622,6 +1842,34 @@ onMounted(async () => { flex-shrink: 0; } +.shop-select-row { + display: flex; + align-items: center; + gap: 8px; + width: 100%; +} + +.shop-select { + flex: 1; + min-width: 0; +} + +.shop-select-row .el-button { + flex-shrink: 0; +} + +.signed-express-row { + display: flex; + align-items: center; + gap: 8px; + width: 100%; +} + +.signed-express-select { + flex: 1; + min-width: 0; +} + .action-disabled-text { color: var(--el-text-color-placeholder, #a8abb2); font-size: 12px;