From edd07ae7e6761bececc69f6ee00e2c55e732ecd3 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Thu, 24 Sep 2020 16:11:19 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=AE=89=E5=AE=81pc=E7=AB=AF=20group?=
 =?UTF-8?q?=20=E6=A8=A1=E5=9D=97=20=E3=80=91-=E3=80=90grid=E6=8D=A2dept?=
 =?UTF-8?q?=E3=80=91=E9=AD=8F=E5=87=AF=202020-09-24?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/group/gridpartymembergroup.vue | 14 +++++++-------
 src/views/modules/group/group.vue                |  6 +++---
 src/views/modules/group/leaderboard.vue          | 12 ++++++------
 src/views/modules/group/topic-list.vue           | 14 +++++++-------
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/views/modules/group/gridpartymembergroup.vue b/src/views/modules/group/gridpartymembergroup.vue
index 678f2f6..1bb4879 100644
--- a/src/views/modules/group/gridpartymembergroup.vue
+++ b/src/views/modules/group/gridpartymembergroup.vue
@@ -3,7 +3,7 @@
     <div class="mod-news__group}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item label="网格">
-          <el-input v-model="dataForm.grid" @keyup.native="btKeyUpGrid" placeholder="请输入网格名称" clearable></el-input>
+          <el-input v-model="dataForm.dept" @keyup.native="btKeyUpGrid" placeholder="请输入网格名称" clearable></el-input>
         </el-form-item>
         <el-form-item>
           <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
@@ -15,7 +15,7 @@
         <el-table-column prop="district" label="市区" header-align="center" align="center"></el-table-column>
         <el-table-column prop="street" label="街道" header-align="center" align="center"></el-table-column>
         <el-table-column prop="community" label="社区" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="grid" label="网格" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="dept" label="网格" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="createParty(scope.row)">生成党员群</el-button>
@@ -52,8 +52,8 @@ export default {
         streetId: '',
         community: '',
         communityId: '',
-        grid: '',
-        gridId: ''
+        dept: '',
+        deptId: ''
       }
     }
   },
@@ -66,8 +66,8 @@ export default {
         streetId: row.streetId,
         community: row.community,
         communityId: row.communityId,
-        grid: row.grid,
-        gridId: row.gridId
+        dept: row.dept,
+        deptId: row.deptId
       }]
       this.$http['post']('/group/epdc-app/group/createPartys', postForm).then(({ data: res }) => {
         if (res.code !== 0) {
@@ -84,7 +84,7 @@ export default {
     },
     btKeyUpGrid (e) {
     e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
-    this.dataForm.grid = e.target.value
+    this.dataForm.dept = e.target.value
   },
     createPartys () {
       var postForm = this.dataList
diff --git a/src/views/modules/group/group.vue b/src/views/modules/group/group.vue
index 1192b8f..06147f1 100644
--- a/src/views/modules/group/group.vue
+++ b/src/views/modules/group/group.vue
@@ -153,7 +153,7 @@ export default {
         id: '',
         streetId: '',
         communityId: '',
-        gridId: '',
+        deptId: '',
         state: '0'
       },
       postForm: {
@@ -202,7 +202,7 @@ export default {
       if (val.length === 0) {
         this.dataForm.streetId = ''
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 1) {
         this.dataForm.streetId = this.ids[0]
@@ -214,7 +214,7 @@ export default {
       if (val.length === 3) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = this.ids[2]
+        this.dataForm.deptId = this.ids[2]
       }
     }
   },
diff --git a/src/views/modules/group/leaderboard.vue b/src/views/modules/group/leaderboard.vue
index 23787d3..37093a2 100644
--- a/src/views/modules/group/leaderboard.vue
+++ b/src/views/modules/group/leaderboard.vue
@@ -17,7 +17,7 @@
           </el-select>
         </el-form-item>
         <br>
-        <el-form-item label="时间" label-width="80px" 
+        <el-form-item label="时间" label-width="80px"
                       prop="startTime">
           <el-date-picker v-model="dataForm.startTime"
                           type="date"
@@ -88,7 +88,7 @@ export default {
         id: '',
         streetId: '',
         communityId: '',
-        gridId: '',
+        deptId: '',
         startTime: '',
         endTime: ''
       },
@@ -133,22 +133,22 @@ export default {
       if (val.length === 0) {
         this.dataForm.streetId = ''
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 1) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 2) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 3) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = this.ids[2]
+        this.dataForm.deptId = this.ids[2]
       }
     }
   },
diff --git a/src/views/modules/group/topic-list.vue b/src/views/modules/group/topic-list.vue
index 7a22411..952a13f 100644
--- a/src/views/modules/group/topic-list.vue
+++ b/src/views/modules/group/topic-list.vue
@@ -21,7 +21,7 @@
         </el-form-item>
         <br>
         <el-form-item label="排序方式">
-          <el-select v-model="dataForm.orderType" clearable style="width:200px;" 
+          <el-select v-model="dataForm.orderType" clearable style="width:200px;"
                      placeholder="请选择">
             <el-option v-for="item in orderTypeOptions"
                        :key="item.id"
@@ -108,7 +108,7 @@ export default {
         id: '',
         streetId: '',
         communityId: '',
-        gridId: '',
+        deptId: '',
         startTime: '',
         endTime: '',
         groupId: '',
@@ -158,22 +158,22 @@ export default {
       if (val.length === 0) {
         this.dataForm.streetId = ''
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 1) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 2) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 3) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = this.ids[2]
+        this.dataForm.deptId = this.ids[2]
       }
     }
   },
@@ -206,7 +206,7 @@ export default {
       }).catch(() => {})
     },
       btKeyUpKeyWord(e){
-      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')  
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
       this.dataForm.keyword= e.target.value
     }
   }