Selaa lähdekoodia

校区创建去掉区域一级

zhanghe 7 vuotta sitten
vanhempi
commit
b583c2a35e
2 muutettua tiedostoa jossa 7 lisäystä ja 4 poistoa
  1. 2 2
      src/routes/Campus/modal.js
  2. 5 2
      src/utils/city.js

+ 2 - 2
src/routes/Campus/modal.js

@@ -12,7 +12,7 @@ export default class CampusModalForm extends Component {
       const data = { ...getFieldsValue() };
 
       data.provinceCode = city.provNameToCode(data.cascader[0]);
-      data.cityName = data.cascader.slice(1, 3).join(' ');
+      data.cityName = data.cascader[1];
       delete data.cascader;
       item.id ? data.id = item.id : null;
 
@@ -58,7 +58,7 @@ export default class CampusModalForm extends Component {
                   message: '校区地址为必选项!',
                 },
               ],
-              initialValue: item.provinceCode && [city.provCodeToName(item.provinceCode), ...(item.cityName || '').split(' ')],
+              initialValue: item.provinceCode && [city.provCodeToName(item.provinceCode), item.cityName],
             })(<Cascader
               style={{ width: '100%' }}
               options={city.DICT_FIXED}

+ 5 - 2
src/utils/city.js

@@ -4054,8 +4054,11 @@ let DICT_FIXED = (function () {
     if ({}.hasOwnProperty.call(DICT, id)) {
       let pid
       if (id.slice(2, 6) !== '0000') {
-        pid = id.slice(4, 6) === '00' ? (`${id.slice(0, 2)}0000`) :
-          `${id.slice(0, 4)}00`
+        if (id.slice(4,6) === '00') {
+          pid = `${id.slice(0, 2)}0000`;
+        } else {
+          continue; //去掉三级市区
+        }
       }
       fixed.push({
         id,