From bf460ad63d349e720b45b9243883ae99a9558bf2 Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Wed, 3 Jan 2024 14:13:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=AE=A1=E7=90=86-=E7=9C=81?=
 =?UTF-8?q?=E5=B8=82=E5=8C=BA=E8=81=94=E5=8A=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flossom-ui/src/views/system/member/index.vue | 73 +++++++++++++++++---
 1 file changed, 65 insertions(+), 8 deletions(-)

diff --git a/flossom-ui/src/views/system/member/index.vue b/flossom-ui/src/views/system/member/index.vue
index 974282b..33a61e7 100644
--- a/flossom-ui/src/views/system/member/index.vue
+++ b/flossom-ui/src/views/system/member/index.vue
@@ -62,7 +62,7 @@
       </el-form-item>
       <el-form-item label="省" prop="provinceId">
         <el-select v-model="queryParams.provinceId" @change="getCityList(queryParams.provinceId)"
-                   @keyup.enter.native="handleQuery" filterable clearable>
+                   @keyup.enter.native="handleQuery" filterable clearable @clear="clearOption(1)">
           <el-option
             v-for="item in provinceList"
             :key="item.id"
@@ -72,7 +72,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="市" prop="cityId">
-        <el-select v-model="queryParams.cityId" @change="getAreaByPid(queryParams.cityId)"
+        <el-select v-model="queryParams.cityId" @change="getAreaByPid(queryParams.cityId)" @clear="clearOption(2)"
                    @keyup.enter.native="handleQuery" filterable clearable placeholder="请选择省">
           <el-option
             v-for="item in cityList"
@@ -344,8 +344,8 @@
           </template>
         </el-form-item>
         <el-form-item label="省" prop="provinceId" style="width: 40%">
-          <el-select v-model="form.provinceId" @change="getCityList(form.provinceId,true)" filterable clearable
-                     placeholder="请选择省">
+          <el-select v-model="form.provinceId" @change="getSaveCityList(form.provinceId)" @clear="clearSaveOption(1)"
+                     filterable clearable placeholder="请选择省">
             <el-option
               v-for="item in provinceList"
               :key="item.id"
@@ -355,8 +355,8 @@
           </el-select>
         </el-form-item>
         <el-form-item label="市" prop="cityId" style="width: 40%">
-          <el-select v-model="form.cityId" @change="getAreaByPid(form.cityId, true)" filterable clearable
-                     placeholder="请选择省">
+          <el-select v-model="form.cityId" @change="getSaveAreaByPid(form.cityId)" @clear="clearSaveOption(2)"
+                     filterable clearable placeholder="请选择省">
             <el-option
               v-for="item in saveCityList"
               :key="item.id"
@@ -800,7 +800,6 @@ export default {
       chatTagOptions: [],
       scriptOptions: [],
       tagIdArray: [],
-
       // 批量操作类型-下拉项选择
       batchOperateValue: null,
       // 批量操作：小程序标签
@@ -1049,13 +1048,18 @@ export default {
         this.wecomTagTree = response.data;
       });
     },
-    // 获取省市区
+    // 查询条件-获取省市区
     getProvinceList() {
       getRegionByPid(0).then(Response => {
         this.provinceList = Response.data
       })
     },
     getCityList(pid, isSave) {
+      if (pid == '') {
+        return;
+      }
+      this.queryParams.cityId = null;
+      this.queryParams.areaId = null;
       getRegionByPid(pid).then(Response => {
         if (isSave) {
           this.saveCityList = Response.data;
@@ -1065,6 +1069,10 @@ export default {
       })
     },
     getAreaByPid(pid, isSave) {
+      if (pid == '') {
+        return;
+      }
+      this.queryParams.areaId = null;
       getRegionByPid(pid).then(Response => {
         if (isSave) {
           this.saveAreaList = Response.data;
@@ -1073,6 +1081,55 @@ export default {
         }
       })
     },
+    // 查询条件-省市区清空
+    clearOption(option) {
+      // 省级清空
+      if (option == 1) {
+        this.queryParams.cityId = null;
+        this.queryParams.areaId = null;
+        this.cityList = null;
+        this.areaList = null;
+      }
+      // 市级清空
+      if (option == 2) {
+        this.queryParams.areaId = null;
+        this.areaList = null;
+      }
+    },
+    // 修改-获取省市区
+    getSaveCityList(pid) {
+      if (pid == '') {
+        return;
+      }
+      this.form.cityId = null;
+      this.form.areaId = null;
+      getRegionByPid(pid).then(Response => {
+          this.saveCityList = Response.data;
+      })
+    },
+    getSaveAreaByPid(pid) {
+      if (pid == '') {
+        return;
+      }
+      this.form.areaId = null;
+      getRegionByPid(pid).then(Response => {
+          this.saveAreaList = Response.data;
+      })
+    },
+    clearSaveOption(option) {
+      // 省级清空
+      if (option == 1) {
+        this.form.cityId = null;
+        this.form.areaId = null;
+        this.saveCityList = null;
+        this.saveAreaList = null;
+      }
+      // 市级清空
+      if (option == 2) {
+        this.form.areaId = null;
+        this.saveAreaList = null;
+      }
+    },
     // 取消按钮
     cancel() {
       this.open = false;