Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov

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

@@ -463,12 +463,12 @@
 
                 <!-- 组织区划 -->
                 <el-form-item label="组织区划">
-                    <el-select v-model="zonings.areaCode" placeholder="请选择组织区划" @change="handelZoing">
+                    <el-select v-model="agencyForm.areaCode" placeholder="请选择组织区划" @change="handelZoing">
                         <el-option 
                         v-for="item in zonings"
                         :key="item.areaCode"
                         :label="item.areaName"
-                        :value="item">
+                        :value="item.areaCode">
                         </el-option>
                     </el-select>
                 </el-form-item>
@@ -537,12 +537,12 @@
 
                  <!-- 组织区划 -->
                 <el-form-item label="组织区划">
-                    <el-select v-model="OrgDetailsForm.areaName" placeholder="请选择组织区划" @change="handelStreeOrCommunityZoing">
+                    <el-select v-model="OrgDetailsForm.areaCode" placeholder="请选择组织区划" @change="handelStreeOrCommunityZoing">
                         <el-option 
                         v-for="item in zonings"
                         :key="item.areaCode"
                         :label="item.areaName"
-                        :value="item">
+                        :value="item.areaCode">
                         </el-option>
                     </el-select>
                 </el-form-item>
@@ -1932,19 +1932,27 @@ export default {
         },
 
         handelZoing(val){
-            this.agencyForm.level = val.level
+            this.zonings.forEach(item => {
-            this.agencyForm.areaName = val.areaName
+                if (item.areaCode == val) {
-            this.agencyForm.areaCode = val.areaCode
+                    this.agencyForm.level = item.level
-            
+                    this.agencyForm.areaName = item.areaName
+                    this.agencyForm.areaCode = item.areaCode
+                }
+            })
         },
         handelStreeOrCommunityZoing(val){
-            this.OrgDetailsForm.level = val.level
+            this.zonings.forEach(item => {
-            this.OrgDetailsForm.areaName = val.areaName
+                if (item.areaCode == val) {
-            this.OrgDetailsForm.areaCode = val.areaCode
+                    this.OrgDetailsForm.level = item.level
+                    this.OrgDetailsForm.areaName = item.areaName
+                    this.OrgDetailsForm.areaCode = item.areaCode
+                }
+            })
         },
 
         addAgency(row){
             this.createAgencyDialogFlag = true
+            this.addNewAgencyRest()
             this.getUser()
         },
         // 新增组织确定按钮