|
@@ -144,7 +144,7 @@ import { message, type FormInstance } from 'ant-design-vue'
|
|
import * as tenantApi from '@/api/tenant'
|
|
import * as tenantApi from '@/api/tenant'
|
|
import pcdCascader from '../pcdCascader/index.vue'
|
|
import pcdCascader from '../pcdCascader/index.vue'
|
|
import { InfoCircleOutlined } from '@ant-design/icons-vue'
|
|
import { InfoCircleOutlined } from '@ant-design/icons-vue'
|
|
-import { pinyin } from 'pinyin-pro'
|
|
|
|
|
|
+import TinyPinyin from 'tiny-pinyin'
|
|
import * as systemApi from '@/api/system'
|
|
import * as systemApi from '@/api/system'
|
|
import { useDict } from '@/hooks/useDict'
|
|
import { useDict } from '@/hooks/useDict'
|
|
|
|
|
|
@@ -320,14 +320,23 @@ const cancel = () => {
|
|
// 添加小区
|
|
// 添加小区
|
|
const addCommunity = async () => {
|
|
const addCommunity = async () => {
|
|
try {
|
|
try {
|
|
- const tenantCodes = pinyin(formState.tenantName, { toneType: 'none', type: 'array' })
|
|
|
|
- .map((word) => word.charAt(0))
|
|
|
|
- .join('')
|
|
|
|
|
|
+ const getTenantCode = (name: string): string => {
|
|
|
|
+ if (!TinyPinyin.isSupported()) return ''
|
|
|
|
+ return name
|
|
|
|
+ .split('')
|
|
|
|
+ .map((char) => {
|
|
|
|
+ const py = TinyPinyin.convertToPinyin(char)
|
|
|
|
+ return py.charAt(0)
|
|
|
|
+ })
|
|
|
|
+ .join('')
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ const tenantCodes = getTenantCode(formState.tenantName)
|
|
const res = await tenantApi.queryTenantAdd({
|
|
const res = await tenantApi.queryTenantAdd({
|
|
tenantId: formState.tenantId || '',
|
|
tenantId: formState.tenantId || '',
|
|
tenantCode: tenantCodes,
|
|
tenantCode: tenantCodes,
|
|
tenantName: formState.tenantName,
|
|
tenantName: formState.tenantName,
|
|
- tenantType: formState.tenantType! || '', // 'residential_property'
|
|
|
|
|
|
+ tenantType: formState.tenantType! || '',
|
|
province: formState.pcdStrs[0] || '',
|
|
province: formState.pcdStrs[0] || '',
|
|
city: formState.pcdStrs[1] || '',
|
|
city: formState.pcdStrs[1] || '',
|
|
district: formState.pcdStrs[2] || '',
|
|
district: formState.pcdStrs[2] || '',
|