From d13b84782bb6c0289097ca8bea8456d5dcc0353d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Thu, 28 Mar 2024 14:41:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/agency/index.vue | 70 ++++++++++++++++++++++++-------
 1 file changed, 55 insertions(+), 15 deletions(-)

diff --git a/src/views/system/agency/index.vue b/src/views/system/agency/index.vue
index fa71665..de6526c 100644
--- a/src/views/system/agency/index.vue
+++ b/src/views/system/agency/index.vue
@@ -153,7 +153,12 @@
             }}</el-descriptions-item
           >
           <el-descriptions-item label="行政区划"
-            >{{ agencyList.areaName }}
+           v-if="agencyList.provinceName" >{{ agencyList.provinceName }}-{{ agencyList.cityName }}-{{
+              agencyList.regionName
+            }}-{{ agencyList.streetName }}-{{ agencyList.communityName }}
+          </el-descriptions-item>
+          <el-descriptions-item label="行政区划"
+           v-else >
           </el-descriptions-item>
         </el-descriptions>
         <!-- <div class="information">机构信息</div>
@@ -318,7 +323,7 @@
             ></el-option>
           </el-select>
           <el-select
-            v-model="form.areaCode"
+            v-model="form.communityCode"
             clearable
             placeholder="请选择社区"
             style="width: 129px; margin-left: 10px"
@@ -829,19 +834,25 @@ export default {
 
     //点击街道
     clickstreet(item) {
+      // this.form.areaCode=item.areaCode
+      console.log(item, "jiedao");
+
       this.form.communityCode = "";
       this.form.communityName = "";
 
       getSecondaryLevelInfo(item.id).then((res) => {
-        this.streetlists = res.data;
+        if (res.data.length == 0) {
+          this.form.areaCode = item.areaCode;
+        } else {
+          this.streetlists = res.data;
+        }
       });
     },
     // 点击社区
     clickstreetlist(item) {
-      console.log(item,'555555')
+      console.log(item, "555555");
       this.form.areaCode = item.areaCode;
-      this.form.communityName = item.areaName;
-
+      // this.form.communityCode = item.areaName;
     },
     //点击区县城
     clickarea(item) {
@@ -854,7 +865,17 @@ export default {
       this.form.communityName = "";
 
       getSecondaryLevelInfo(item.id).then((res) => {
-        this.streetlist = res.data;
+        console.log(item, "qu");
+        if (res.data.length == 0) {
+          this.form.areaCode = item.areaCode;
+        } else {
+          this.streetlist = res.data;
+        }
+        // if (res.data) {
+        //   this.streetlist = res.data;
+        // } else {
+        //   this.form.areaCode = item.areaCode;
+        // }
       });
     },
     //点击市
@@ -865,9 +886,15 @@ export default {
       this.form.streetName = "";
       this.form.communityCode = "";
       this.form.communityName = "";
-
+      // console.log(this.form.cityName,'this.form.cityNames')
+      // console.log(item, "shi");
+      // this.form.areaCode=item.areaCode
       getSecondaryLevelInfo(item.id).then((res) => {
-        this.arealist = res.data;
+        if (res.data.length == 0) {
+          this.form.areaCode = item.areaCode;
+        } else {
+          this.arealist = res.data;
+        }
       });
     },
     /** 获取省列表 */
@@ -878,6 +905,10 @@ export default {
     },
     //点击省
     province(item) {
+      console.log(item, "sheng");
+
+      // this.form.areaCode=item.areaCode
+
       this.form.cityName = "";
       // this.form.streeName = "";
       // this.form.communityCode =''
@@ -888,7 +919,7 @@ export default {
       this.form.communityCode = "";
 
       this.form.regionName = "";
-      this.form.areaCode = "";
+      // this.form.areaCode = "";
       // this.form.streetCode = "";
       getSecondaryLevelInfo(item.id).then((res) => {
         this.citylist = res.data;
@@ -939,9 +970,8 @@ export default {
       }
     },
     changeagencyCategoryId(e) {
-      if(e){
+      if (e) {
         this.form.agencyCategoryId = e[e.length - 1];
-
       }
     },
     // // 节点单击事件
@@ -1008,8 +1038,13 @@ export default {
     // 表单重置
     reset() {
       this.form = {
+        cityName:null,
+        regionName:null,
+        provinceName:null,
+        streetCode:null,
         id: null,
         parentId: null,
+        communityCode: null,
         agencyCategoryId: null,
         agencyCategoryName: null,
         areaCode: null,
@@ -1067,6 +1102,7 @@ export default {
         getAgency(this.id).then((response) => {
           console.log(response.data, "response.data.parentId");
           this.form = response.data;
+          this.form.communityCode = response.data.communityName;
           this.form.parentAgencyName = response.data.parentAgencyName;
           // this.form.parentId=response.data.parentId
 
@@ -1079,9 +1115,13 @@ export default {
 
     /** 提交按钮 */
     submitForm() {
-      if (this.form.provinceCode && !this.form.communityCode) {
-        this.$message("请选择到社区");
-      }
+      // if (this.form.provinceCode && !this.form.communityCode) {
+      //   this.$message("请选择到社区");
+      // }
+      // if(this.form.cityName){
+      //   this.form.areaCode=this.form.cityName
+      // }
+      console.log(this.form);
       this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {