✨ 优化主数据地图回填与表单校验间距，并修复运单导入筛选与组织树定位

Co-authored-by: Cursor <cursoragent@cursor.com>

src/views/base/airport-master.vue

@@ -144,7 +144,7 @@
 
 <script>
 import { getList, getDetail, submit, remove, changeStatus } from '@/api/base/airport-master';
-import { getLazyTree } from '@/api/base/region';
+import { getDetail as getRegionDetail, getLazyTree } from '@/api/base/region';
 import { exportBlob } from '@/api/common';
 import { mapGetters } from 'vuex';
 import { downloadXls } from '@/utils/util';
@@ -322,6 +322,20 @@ export default {
             prop: 'shortName',
             minWidth: 130,
           },
+          {
+            label: '详细地址',
+            prop: 'detailAddress',
+            formslot: true,
+            span: 24,
+            minWidth: 220,
+            overHidden: false,
+            maxlength: 255,
+            showWordLimit: true,
+            rules: [
+              { required: true, message: '请选择详细地址', trigger: 'change' },
+              { max: 255, message: '详细地址不能超过255字', trigger: 'blur' },
+            ],
+          },
           {
             label: '所属省份',
             prop: 'provinceCode',
@@ -388,20 +402,6 @@ export default {
             addDisplay: false,
             editDisplay: false,
           },
-          {
-            label: '详细地址',
-            prop: 'detailAddress',
-            formslot: true,
-            span: 24,
-            minWidth: 220,
-            overHidden: false,
-            maxlength: 255,
-            showWordLimit: true,
-            rules: [
-              { required: true, message: '请选择详细地址', trigger: 'change' },
-              { max: 255, message: '详细地址不能超过255字', trigger: 'blur' },
-            ],
-          },
           {
             label: '经度',
             prop: 'longitude',
@@ -578,33 +578,51 @@ export default {
       return targetColumns.find(item => item.prop === targetProp) || null;
     },
     loadProvinceOptions() {
-      getLazyTree(DEFAULT_COUNTRY_CODE).then(res => {
+      return getLazyTree(DEFAULT_COUNTRY_CODE).then(res => {
         this.provinceOptions = (res.data.data || []).map(this.normalizeRegionOption);
-        this.findColumn('provinceCode').dicData = this.provinceOptions;
+        const provinceColumn = this.findColumn('provinceCode');
+        if (provinceColumn) {
+          provinceColumn.dicData = this.provinceOptions;
+        }
+        return this.provinceOptions;
       });
     },
     loadCityOptions(provinceCode) {
       if (!provinceCode) {
         this.cityOptions = [];
-        this.findColumn('cityCode').dicData = [];
-        return Promise.resolve();
+        const cityColumn = this.findColumn('cityCode');
+        if (cityColumn) {
+          cityColumn.dicData = [];
+        }
+        return Promise.resolve([]);
       }
       return getLazyTree(provinceCode).then(res => {
         this.cityOptions = (res.data.data || []).map(this.normalizeRegionOption);
-        this.findColumn('cityCode').dicData = this.cityOptions;
+        const cityColumn = this.findColumn('cityCode');
+        if (cityColumn) {
+          cityColumn.dicData = this.cityOptions;
+        }
+        return this.cityOptions;
       });
     },
     loadDistrictOptions(cityCode) {
       if (!cityCode) {
         this.districtOptions = [];
-        this.findColumn('districtCode').dicData = [];
-        return Promise.resolve();
+        const districtColumn = this.findColumn('districtCode');
+        if (districtColumn) {
+          districtColumn.dicData = [];
+        }
+        return Promise.resolve([]);
       }
       this.districtLoading = true;
       return getLazyTree(cityCode)
         .then(res => {
           this.districtOptions = (res.data.data || []).map(this.normalizeRegionOption);
-          this.findColumn('districtCode').dicData = this.districtOptions;
+          const districtColumn = this.findColumn('districtCode');
+          if (districtColumn) {
+            districtColumn.dicData = this.districtOptions;
+          }
+          return this.districtOptions;
         })
         .finally(() => {
           this.districtLoading = false;
@@ -631,6 +649,22 @@ export default {
             : String(row.districtCode),
       };
     },
+    ensureCityOption(row) {
+      if (!row.cityCode || !row.cityName) return;
+      const exists = this.cityOptions.some(item => item.id === row.cityCode);
+      if (exists) return;
+      this.cityOptions = [
+        ...this.cityOptions,
+        {
+          id: row.cityCode,
+          title: row.cityName,
+        },
+      ];
+      const cityColumn = this.findColumn('cityCode');
+      if (cityColumn) {
+        cityColumn.dicData = this.cityOptions;
+      }
+    },
     ensureDistrictOption(row) {
       if (!row.districtCode || !row.districtName) return;
       const exists = this.districtOptions.some(item => item.id === row.districtCode);
@@ -642,7 +676,10 @@ export default {
           title: row.districtName,
         },
       ];
-      this.findColumn('districtCode').dicData = this.districtOptions;
+      const districtColumn = this.findColumn('districtCode');
+      if (districtColumn) {
+        districtColumn.dicData = this.districtOptions;
+      }
     },
     handleIataChange(value) {
       this.form.iataCode = String(value || '')
@@ -698,25 +735,265 @@ export default {
     openAddressMapPicker() {
       this.addressMapPickerVisible = true;
     },
+    formatMapCoordinate(value) {
+      if (value === undefined || value === null || value === '') {
+        return '';
+      }
+      const number = Number(value);
+      if (!Number.isFinite(number)) {
+        return '';
+      }
+      return normalizeCoordinateInput(number.toFixed(6));
+    },
+    patchDialogForm(patch = {}) {
+      Object.assign(this.form, patch);
+      const tableForm = this.$refs.crud?.tableForm;
+      if (tableForm && tableForm !== this.form) {
+        Object.assign(tableForm, patch);
+      }
+    },
     handleAddressMapConfirm(payload) {
       const selection = typeof payload === 'string' ? { address: payload } : payload || {};
+      const longitude = this.formatMapCoordinate(selection.longitude);
+      const latitude = this.formatMapCoordinate(selection.latitude);
+      const patch = {};
       if (selection.address) {
-        this.form.detailAddress = selection.address;
+        patch.detailAddress = selection.address;
       }
+      if (longitude !== '' && latitude !== '') {
+        patch.longitude = longitude;
+        patch.latitude = latitude;
+      }
+      if (Object.keys(patch).length) {
+        this.patchDialogForm(patch);
+      }
+      this.applyMapRegionSelection(selection);
+    },
+    normalizeAmapCityName(city, province) {
+      if (Array.isArray(city)) {
+        return String(province || '').trim();
+      }
+      const cityName = String(city || '').trim();
+      return cityName || String(province || '').trim();
+    },
+    buildRegionLookupCodes(adcode) {
+      const code = String(adcode || '').trim();
+      if (!code) {
+        return [];
+      }
+      const codes = [code];
+      if (/^\d{6}$/.test(code)) {
+        if (code.endsWith('00')) {
+          const cityCode = code.slice(0, 4);
+          if (cityCode && !codes.includes(cityCode)) {
+            codes.push(cityCode);
+          }
+        }
+        if (code.endsWith('0000')) {
+          const provinceCode = code.slice(0, 2);
+          if (provinceCode && !codes.includes(provinceCode)) {
+            codes.push(provinceCode);
+          }
+        }
+      }
+      return codes;
+    },
+    fetchRegionDetailByCodes(codes = []) {
+      const tryNext = index => {
+        if (index >= codes.length) {
+          return Promise.resolve(null);
+        }
+        return getRegionDetail(codes[index])
+          .then(res => {
+            const detail = res.data && res.data.data;
+            if (detail && detail.code) {
+              return detail;
+            }
+            return tryNext(index + 1);
+          })
+          .catch(() => tryNext(index + 1));
+      };
+      return tryNext(0);
+    },
+    resolveProvinceCode(provinceName) {
+      const name = String(provinceName || '').trim();
+      if (!name) {
+        return '';
+      }
+      const province = this.provinceOptions.find(
+        item => item.title === name || item.id === name || String(item.title).includes(name)
+      );
+      return province ? province.id : '';
+    },
+    resolveCityCode(cityName, regionCode) {
+      const name = String(cityName || '').trim();
+      const code = String(regionCode || '').trim();
+      const city = this.cityOptions.find(
+        item => item.title === name || item.id === code || item.id === name
+      );
+      return city ? city.id : '';
+    },
+    resolveDistrictCode(districtName, regionCode) {
+      const name = String(districtName || '').trim();
+      const code = String(regionCode || '').trim();
+      const district = this.districtOptions.find(
+        item => item.title === name || item.id === code || item.id === name
+      );
+      return district ? district.id : code || '';
+    },
+    applyRegionDetail(detail = {}) {
+      const provinceName = detail.provinceName || '';
+      const cityName = detail.cityName || '';
+      const districtName = detail.districtName || detail.name || '';
+      return this.loadProvinceOptions()
+        .then(() => {
+          const provinceCode =
+            String(detail.provinceCode || '').trim() || this.resolveProvinceCode(provinceName);
+          const province = this.provinceOptions.find(item => item.id === provinceCode);
+          this.patchDialogForm({
+            provinceCode: provinceCode || undefined,
+            provinceName: province ? province.title : provinceName,
+          });
+          if (!provinceCode) {
+            return null;
+          }
+          return this.loadCityOptions(provinceCode);
+        })
+        .then(cities => {
+          if (!cities) {
+            return null;
+          }
+          const cityCode =
+            String(detail.cityCode || '').trim() ||
+            this.resolveCityCode(cityName, detail.districtCode || detail.code);
+          const city = this.cityOptions.find(item => item.id === cityCode);
+          this.patchDialogForm({
+            cityCode: cityCode || undefined,
+            cityName: city ? city.title : cityName,
+          });
+          this.ensureCityOption({
+            cityCode,
+            cityName: city ? city.title : cityName,
+          });
+          if (!cityCode) {
+            return null;
+          }
+          return this.loadDistrictOptions(cityCode);
+        })
+        .then(districts => {
+          if (!districts) {
+            return;
+          }
+          const districtCode = this.resolveDistrictCode(
+            districtName,
+            detail.districtCode || detail.code
+          );
+          this.patchDialogForm({
+            districtCode: districtCode || undefined,
+          });
+          this.handleDistrictChange(districtCode);
+          this.ensureDistrictOption({
+            districtCode,
+            districtName: this.form.districtName || districtName,
+          });
+        });
+    },
+    applyMapRegionByNames(selection = {}) {
+      const provinceName = String(selection.province || selection.provinceName || '').trim();
+      const cityName = this.normalizeAmapCityName(
+        selection.city || selection.cityName,
+        provinceName
+      );
+      const districtName = String(selection.district || selection.districtName || '').trim();
+      const adcode = String(selection.adcode || selection.regionCode || '').trim();
+      // 本页无国家字段：国内 adcode 走中国省份树；无匹配则不强制回填
       if (
-        selection.longitude !== undefined &&
-        selection.longitude !== null &&
-        selection.longitude !== ''
+        !provinceName &&
+        !cityName &&
+        !districtName &&
+        !(/^\d{6}$/.test(adcode) || String(selection.country || selection.countryName || '').includes('中国'))
       ) {
-        this.form.longitude = Number(selection.longitude).toFixed(6);
+        return Promise.resolve();
       }
-      if (
-        selection.latitude !== undefined &&
-        selection.latitude !== null &&
-        selection.latitude !== ''
-      ) {
-        this.form.latitude = Number(selection.latitude).toFixed(6);
+      return this.loadProvinceOptions()
+        .then(() => {
+          const provinceCode = this.resolveProvinceCode(provinceName);
+          const province = this.provinceOptions.find(item => item.id === provinceCode);
+          this.patchDialogForm({
+            provinceCode: provinceCode || undefined,
+            provinceName: province ? province.title : provinceName,
+          });
+          if (!provinceCode) {
+            return null;
+          }
+          return this.loadCityOptions(provinceCode);
+        })
+        .then(cities => {
+          if (!cities) {
+            return null;
+          }
+          const cityCode = this.resolveCityCode(cityName, adcode);
+          const city = this.cityOptions.find(item => item.id === cityCode);
+          this.patchDialogForm({
+            cityCode: cityCode || undefined,
+            cityName: city ? city.title : cityName,
+          });
+          this.ensureCityOption({
+            cityCode,
+            cityName: city ? city.title : cityName,
+          });
+          if (!cityCode) {
+            return null;
+          }
+          return this.loadDistrictOptions(cityCode);
+        })
+        .then(districts => {
+          if (!districts) {
+            return;
+          }
+          const districtCode = this.resolveDistrictCode(districtName, adcode);
+          this.patchDialogForm({
+            districtCode: districtCode || undefined,
+          });
+          this.handleDistrictChange(districtCode);
+          this.ensureDistrictOption({
+            districtCode,
+            districtName: this.form.districtName || districtName,
+          });
+        });
+    },
+    applyMapRegionSelection(selection = {}) {
+      const adcode = String(selection.adcode || selection.regionCode || '').trim();
+      const hasNameHint = Boolean(
+        selection.country ||
+          selection.countryName ||
+          selection.province ||
+          selection.provinceName ||
+          selection.city ||
+          selection.cityName ||
+          selection.district ||
+          selection.districtName
+      );
+      if (!adcode && !hasNameHint) {
+        return Promise.resolve();
       }
+      this.regionInitializing = true;
+      const lookupCodes = this.buildRegionLookupCodes(adcode);
+      return this.fetchRegionDetailByCodes(lookupCodes)
+        .then(detail => {
+          if (detail) {
+            return this.applyRegionDetail(detail);
+          }
+          return this.applyMapRegionByNames(selection);
+        })
+        .catch(() => this.applyMapRegionByNames(selection))
+        .finally(() => {
+          this.$nextTick(() => {
+            window.setTimeout(() => {
+              this.regionInitializing = false;
+            }, 0);
+          });
+        });
     },
     normalizeRow(row) {
       row.code = row.iataCode ? `JC-${row.iataCode}` : row.code;