From d5bad28e22b630c16020d06b956db159bca42b10 Mon Sep 17 00:00:00 2001
From: qushutong <1976590620@qq.com>
Date: Mon, 23 Sep 2019 13:52:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B8=85=E7=A9=BA=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/news/news.vue               | 16 ++++++++++
 src/views/modules/news/newsdraft.vue          | 16 +++++++++-
 src/views/modules/user/partymembers.vue       | 16 ++++++++++
 src/views/modules/user/user-add-or-update.vue |  2 ++
 src/views/modules/user/user.vue               | 31 +++++++++++++------
 5 files changed, 70 insertions(+), 11 deletions(-)

diff --git a/src/views/modules/news/news.vue b/src/views/modules/news/news.vue
index b8d9aafa..1590b3a4 100644
--- a/src/views/modules/news/news.vue
+++ b/src/views/modules/news/news.vue
@@ -9,6 +9,7 @@
                       prop="deptId">
           <el-select v-model="dataForm.streetId"
                      @change="changeStreet"
+                     clearable
                      placeholder="所属街道">
             <el-option v-for="item in streetList"
                        :key="item.id"
@@ -20,6 +21,7 @@
         <el-form-item label="所属社区">
           <el-select v-model="dataForm.communityId"
                      @change="changeCommunity"
+                     clearable
                      placeholder="所属社区">
             <el-option v-for="item in communityList"
                        :key="item.id"
@@ -31,6 +33,7 @@
         <el-form-item label="所属网格">
           <el-select v-model="dataForm.gridId"
                      @change="changeGrid"
+                     clearable
                      placeholder="所属网格">
             <el-option v-for="item in gridList"
                        :key="item.id"
@@ -51,6 +54,7 @@
         </el-date-picker> &nbsp; &nbsp;
         <el-form-item label="类别">
           <el-select v-model="dataForm.category"
+                     clearable
                      placeholder="所属类别">
             <el-option v-for="item in categorys"
                        :key="item.id"
@@ -250,6 +254,13 @@ export default {
       }).catch(() => { })
     },
     changeStreet (event) {
+      if (this.dataForm.streetId === '') {
+        this.communityList = []
+        this.gridList = []
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+        return
+      }
       this.dataForm.streetId = event
       let choosenItem = this.streetList.filter(item => item.id === this.dataForm.streetId)[0]
       this.initDeptIdAndName(choosenItem)
@@ -258,6 +269,11 @@ export default {
       this.getDeptInfoList('community', event)
     },
     changeCommunity (event) {
+      if (this.dataForm.communityId === '') {
+        this.gridList = []
+        this.dataForm.gridId = ''
+        return
+      }
       this.communityId = event
       let choosenItem = this.communityList.filter(item => item.id === this.dataForm.communityId)[0]
       this.initDeptIdAndName(choosenItem)
diff --git a/src/views/modules/news/newsdraft.vue b/src/views/modules/news/newsdraft.vue
index acfb9c90..0ac86470 100644
--- a/src/views/modules/news/newsdraft.vue
+++ b/src/views/modules/news/newsdraft.vue
@@ -8,6 +8,7 @@
         <el-form-item label="所属街道"
                       prop="deptId">
           <el-select v-model="dataForm.streetId"
+                     clearable
                      @change="changeStreet"
                      placeholder="所属街道">
             <el-option v-for="item in streetList"
@@ -20,6 +21,7 @@
         <el-form-item label="所属社区">
           <el-select v-model="dataForm.communityId"
                      @change="changeCommunity"
+                     clearable
                      placeholder="所属社区">
             <el-option v-for="item in communityList"
                        :key="item.id"
@@ -31,6 +33,7 @@
         <el-form-item label="所属网格">
           <el-select v-model="dataForm.gridId"
                      @change="changeGrid"
+                     clearable
                      placeholder="所属网格">
             <el-option v-for="item in gridList"
                        :key="item.id"
@@ -221,7 +224,13 @@ export default {
       }).catch(() => { })
     },
     changeStreet (event) {
-      console.log(111111111111)
+      if (this.dataForm.streetId === '') {
+        this.communityList = []
+        this.gridList = []
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+        return
+      }
       this.dataForm.streetId = event
       let choosenItem = this.streetList.filter(item => item.id === this.dataForm.streetId)[0]
       this.initDeptIdAndName(choosenItem)
@@ -230,6 +239,11 @@ export default {
       this.getDeptInfoList('community', event)
     },
     changeCommunity (event) {
+      if (this.dataForm.communityId === '') {
+        this.gridList = []
+        this.dataForm.gridId = ''
+        return
+      }
       this.communityId = event
       let choosenItem = this.communityList.filter(item => item.id === this.dataForm.communityId)[0]
       this.initDeptIdAndName(choosenItem)
diff --git a/src/views/modules/user/partymembers.vue b/src/views/modules/user/partymembers.vue
index 44bd00d7..2642c032 100755
--- a/src/views/modules/user/partymembers.vue
+++ b/src/views/modules/user/partymembers.vue
@@ -7,6 +7,7 @@
                @keyup.enter.native="getDataList()">
         <el-form-item label="街道">
           <el-select v-model="dataForm.streetId"
+                     clearable
                      placeholder="请选择"
                      @change="getCommunityList">
             <el-option v-for="item in streetOptions"
@@ -18,6 +19,7 @@
         </el-form-item>
         <el-form-item label="社区">
           <el-select v-model="dataForm.communityId"
+                     clearable
                      placeholder="请选择"
                      @change="getGridList">
             <el-option v-for="item in communityOptions"
@@ -29,6 +31,7 @@
         </el-form-item>
         <el-form-item label="网格">
           <el-select v-model="dataForm.gridId"
+                     clearable
                      placeholder="请选择">
             <el-option v-for="item in gridOptions"
                        :key="item.id"
@@ -39,6 +42,7 @@
         </el-form-item>
         <el-form-item label="注册状态">
           <el-select v-model="dataForm.registFlag"
+                     clearable
                      placeholder="请选择">
             <el-option v-for="item in registOptions"
                        :key="item.dictValue"
@@ -248,6 +252,13 @@ export default {
       }).catch(() => { })
     },
     getCommunityList () {
+      if (this.dataForm.streetId === '') {
+        this.communityOptions = []
+        this.gridOptions = []
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+        return
+      }
       this.dataForm.communityId = ''
       this.dataForm.gridId = ''
       this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
@@ -258,6 +269,11 @@ export default {
       }).catch(() => { })
     },
     getGridList () {
+      if (this.dataForm.communityId === '') {
+        this.gridOptions = []
+        this.dataForm.gridId = ''
+        return
+      }
       this.dataForm.gridId = ''
       this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
         if (res.code !== 0) {
diff --git a/src/views/modules/user/user-add-or-update.vue b/src/views/modules/user/user-add-or-update.vue
index a4119b54..bfe96a1d 100644
--- a/src/views/modules/user/user-add-or-update.vue
+++ b/src/views/modules/user/user-add-or-update.vue
@@ -22,6 +22,7 @@
       </el-form-item>
       <el-form-item label="是否党员">
         <el-select v-model="dataForm.partyFlag"
+                   clearable
                    placeholder="请选择">
           <el-option v-for="item in partyFlagOptions"
                      :key="item.id"
@@ -32,6 +33,7 @@
       </el-form-item>
       <el-form-item label="干部下沉">
         <el-select v-model="dataForm.cadreFlag"
+                   clearable
                    placeholder="请选择">
           <el-option v-for="item in cadreOptions"
                      :key="item.cadreFlag"
diff --git a/src/views/modules/user/user.vue b/src/views/modules/user/user.vue
index cbd08a9a..197ed8ff 100644
--- a/src/views/modules/user/user.vue
+++ b/src/views/modules/user/user.vue
@@ -9,7 +9,7 @@
            <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <P></P>
         <el-form-item label="街道">
-          <el-select v-model="dataForm.streetId" placeholder="请选择" @change="getCommunityList">
+          <el-select v-model="dataForm.streetId" clearable placeholder="请选择" @change="getCommunityList">
             <el-option
               v-for="(item,index) in streetOptions"
               :key="index"
@@ -19,7 +19,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="社区">
-          <el-select v-model="dataForm.communityId" placeholder="请选择" @change="getGridList">
+          <el-select v-model="dataForm.communityId" clearable placeholder="请选择" @change="getGridList">
             <el-option
               v-for="(item,index) in communityOptions"
               :key="index"
@@ -29,7 +29,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="网格">
-          <el-select v-model="dataForm.gridId" placeholder="请选择">
+          <el-select v-model="dataForm.gridId" clearable placeholder="请选择">
             <el-option
               v-for="(item,index) in gridOptions"
               :key="index"
@@ -125,7 +125,7 @@
           <template>
            <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item label="街道">
-          <el-select v-model="dataForm.streetId" placeholder="请选择" @change="getCommunityList">
+          <el-select v-model="dataForm.streetId" clearable placeholder="请选择" @change="getCommunityList">
             <el-option
               v-for="(item, index) in streetOptions"
               :key="index"
@@ -135,7 +135,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="社区">
-          <el-select v-model="dataForm.communityId" placeholder="请选择" @change="getGridList">
+          <el-select v-model="dataForm.communityId" clearable placeholder="请选择" @change="getGridList">
             <el-option
               v-for="(item,index) in communityOptions"
               :key="index"
@@ -145,7 +145,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="网格">
-          <el-select v-model="dataForm.gridId" placeholder="请选择">
+          <el-select v-model="dataForm.gridId" clearable placeholder="请选择">
             <el-option
               v-for="(item,index) in gridOptions"
               :key="index"
@@ -171,7 +171,7 @@
         </el-form-item>
         <div class="block">
           <el-form-item label="是否是党员">
-          <el-select v-model="dataForm.isParty" placeholder="请选择" >
+          <el-select v-model="dataForm.isParty" clearable placeholder="请选择" >
             <el-option
               v-for="(item,index) in partyFlagOptions"
               :key="index"
@@ -251,7 +251,7 @@
           <template>
            <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item label="街道">
-          <el-select v-model="dataForm.streetId" placeholder="请选择" @change="getCommunityList">
+          <el-select v-model="dataForm.streetId" clearable placeholder="请选择" @change="getCommunityList">
             <el-option
               v-for="(item, index) in streetOptions"
               :key="index"
@@ -261,7 +261,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="社区">
-          <el-select v-model="dataForm.communityId" placeholder="请选择" @change="getGridList">
+          <el-select v-model="dataForm.communityId" clearable placeholder="请选择" @change="getGridList">
             <el-option
               v-for="(item,index) in communityOptions"
               :key="index"
@@ -271,7 +271,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="网格">
-          <el-select v-model="dataForm.gridId" placeholder="请选择">
+          <el-select v-model="dataForm.gridId" clearable placeholder="请选择">
             <el-option
               v-for="(item,index) in gridOptions"
               :key="index"
@@ -426,6 +426,12 @@ export default {
       }).catch(() => {})
     },
     getCommunityList () {
+      if (this.dataForm.streetId === '') {
+        this.communityOptions = []
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+        return
+      }
       this.dataForm.communityId = ''
       this.dataForm.gridId = ''
       this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
@@ -436,6 +442,11 @@ export default {
       }).catch(() => {})
     },
     getGridList () {
+      if (this.dataForm.communityId === '') {
+        this.gridOptions = []
+        this.dataForm.gridId = ''
+        return
+      }
       this.dataForm.gridId = ''
       this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
         if (res.code !== 0) {