Merge branch 'master' into yantai_master

src/views/modules/base/organization/organization.vue

@@ -1106,6 +1106,7 @@ export default {
       // 当前被操作的组织的级别
       currentAgencyLevel: localStorage.getItem("level"),
       currentAreaCode: "",
+      currentAreaCodeSwitch: "",
       parentAreaCode: "",
       parentAgencyId: localStorage.getItem("agencyId"),
       parentAgencyLevel: localStorage.getItem("level"),
@@ -2239,6 +2240,7 @@ export default {
           // 社区级为最低级组织，不展示下级组织列表
           this.currentAgencyLevel = data.level;
           this.currentAreaCode = data.areaCode;
+          this.currentAreaCodeSwitch = data.areaCodeSwitch;
           if (data.parentList && data.parentList.length > 0) {
             this.parentAreaCode =
               data.parentList[data.parentList.length - 1].areaCode;
@@ -2468,7 +2470,7 @@ export default {
         parentAgencyId: this.currentAgencyId,
         agencyName: this.agencyForm.agencyName,
         level: this.agencyForm.level,
-        areaCodeSwitch: "closed",
+        areaCodeSwitch: this.currentAreaCodeSwitch,
         areaCode: this.agencyForm.areaCode,
         areaName: this.agencyForm.areaName,
         contacts: this.agencyForm.contacts,

src/views/modules/renFangTongJi/cpts/shequtongji.vue

@@ -21,8 +21,8 @@ export default {
       default: "",
     },
     orgIds: {
-      type: String,
-      default: "",
+      type: Array,
+      default: () => [],
     },
   },