diff --git a/frontend/admin-web/src/types/system-account.types.ts b/frontend/admin-web/src/types/system-account.types.ts index 38715905..005eac00 100644 --- a/frontend/admin-web/src/types/system-account.types.ts +++ b/frontend/admin-web/src/types/system-account.types.ts @@ -487,31 +487,33 @@ export function getAccountDisplayName(accountSequence: string): string { if (provinceName) { // 判断是省级还是市级 + const shortProvinceName = provinceName.replace(/省|市|自治区|特别行政区|壮族|回族|维吾尔/g, ''); if (cityPart === '00') { // 省级 - return `${provinceName} (${accountSequence})`; + return `${shortProvinceName}省 (${accountSequence})`; } else { - // 市级 - 显示省份简称 + 市级代码 - const shortProvinceName = provinceName.replace(/省|市|自治区|特别行政区|壮族|回族|维吾尔/g, ''); - return `${shortProvinceName}${cityPart}市 (${accountSequence})`; + // 市级 - 只显示省份简称 + 市级标识 + return `${shortProvinceName}市级 (${accountSequence})`; } } } - // 检查是否是7位数字的区域账户序列号 + // 检查是否是7位数字的区域账户序列号(如 8330100 或 9330000) if (/^\d{7}$/.test(accountSequence)) { - const provinceCode = accountSequence.substring(0, 2); - const cityPart = accountSequence.substring(2, 4); + // 8开头是市区域账户,9开头是省区域账户 + const prefix = accountSequence.charAt(0); + const regionCode = accountSequence.substring(1); // 后6位是区域代码 + const provinceCode = regionCode.substring(0, 2); + const cityPart = regionCode.substring(2, 4); const provinceName = PROVINCE_CODE_NAMES[provinceCode]; if (provinceName) { - // 判断是省级还是市级账户 - if (cityPart === '00') { - // 省级账户 - return `${provinceName}(省级)(${accountSequence})`; - } else { - // 市级账户 - 显示省份简称 + 市级代码 - const shortProvinceName = provinceName.replace(/省|市|自治区|特别行政区|壮族|回族|维吾尔/g, ''); - return `${shortProvinceName}${cityPart}市 (${accountSequence})`; + const shortProvinceName = provinceName.replace(/省|市|自治区|特别行政区|壮族|回族|维吾尔/g, ''); + if (prefix === '9') { + // 省区域账户 + return `${shortProvinceName}省级 (${accountSequence})`; + } else if (prefix === '8') { + // 市区域账户 + return `${shortProvinceName}市级 (${accountSequence})`; } } }