From 34bc532ff1499f6a00a538b76c8d0c7b8b892fc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Thu, 14 May 2020 15:08:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/property/gridpartymembergroup.vue | 73 +++++++++++++------
 src/views/modules/property/group-approve.vue  | 63 +++++++++-------
 src/views/modules/property/group.vue          | 22 ++----
 src/views/modules/property/topic.vue          |  7 +-
 4 files changed, 95 insertions(+), 70 deletions(-)

diff --git a/src/views/modules/property/gridpartymembergroup.vue b/src/views/modules/property/gridpartymembergroup.vue
index f4c6ed9..ebe55b8 100644
--- a/src/views/modules/property/gridpartymembergroup.vue
+++ b/src/views/modules/property/gridpartymembergroup.vue
@@ -1,35 +1,64 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
+  <el-card shadow="never"
+           class="aui-card--fill">
     <div class="mod-news__group}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataList()">
         <el-form-item label="网格">
-          <el-input v-model="dataForm.grid" placeholder="请输入网格名称" clearable></el-input>
+          <el-input v-model="dataForm.grid"
+                    placeholder="请输入网格名称"
+                    clearable></el-input>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
-          <el-button @click="createPartys()" type="primary">批量生成党员群</el-button>
+          <el-button @click="createPartys()"
+                     type="primary">批量生成党员群</el-button>
         </el-form-item>
       </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="index" width="50" label="序号"></el-table-column>
-        <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 :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+      <el-table v-loading="dataListLoading"
+                :data="dataList"
+                border
+                @selection-change="dataListSelectionChangeHandle"
+                style="width: 100%;">
+        <el-table-column type="index"
+                         width="50"
+                         label="序号"></el-table-column>
+        <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 :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>
+            <el-button type="text"
+                       size="small"
+                       @click="createParty(scope.row)">生成党员群</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
+      <el-pagination :current-page="page"
+                     :page-sizes="[10, 20, 50, 100]"
+                     :page-size="limit"
+                     :total="total"
+                     layout="total, sizes, prev, pager, next, jumper"
+                     @size-change="pageSizeChangeHandle"
+                     @current-change="pageCurrentChangeHandle">
       </el-pagination>
     </div>
   </el-card>
@@ -69,7 +98,7 @@ export default {
         grid: row.grid,
         gridId: row.gridId
       }]
-      this.$http['post']('/group/epdc-app/group/createPartys', postForm).then(({ data: res }) => {
+      this.$http['post']('/property/epdc-app/group/createPartys', postForm).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -84,7 +113,7 @@ export default {
     },
     createPartys () {
       var postForm = this.dataList
-      this.$http['post']('/group/epdc-app/group/createPartys', postForm).then(({ data: res }) => {
+      this.$http['post']('/property/epdc-app/group/createPartys', postForm).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
diff --git a/src/views/modules/property/group-approve.vue b/src/views/modules/property/group-approve.vue
index b503c9c..e7749b2 100644
--- a/src/views/modules/property/group-approve.vue
+++ b/src/views/modules/property/group-approve.vue
@@ -1,5 +1,8 @@
 <template>
-  <el-dialog :visible.sync="visible" :title="$t('verify')" :close-on-click-modal="false" :close-on-press-escape="false">
+  <el-dialog :visible.sync="visible"
+             :title="$t('verify')"
+             :close-on-click-modal="false"
+             :close-on-press-escape="false">
     <el-form :label-width="$i18n.locale === 'en-US' ? '100px' : '80px'">
       <el-form-item label="群名称:">
         <div>{{dataForm.groupName}}</div>
@@ -13,23 +16,29 @@
       <el-form-item label="群介绍:">
         <div>{{dataForm.groupIntroduction}}</div>
       </el-form-item>
-      <el-form-item label="处理:" prop="state">
-        <el-select v-model="dataForm.state" placeholder="请选择">
-          <el-option
-            v-for="option in options"
-            :key="option.value"
-            :label="option.label"
-            :value="option.value">
+      <el-form-item label="处理:"
+                    prop="state">
+        <el-select v-model="dataForm.state"
+                   placeholder="请选择">
+          <el-option v-for="option in options"
+                     :key="option.value"
+                     :label="option.label"
+                     :value="option.value">
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="处理意见:" prop="processingOpinions" v-if="adviceVisible">
-          <el-input v-model="dataForm.processingOpinions" type="textarea" placeholder="不超过500字"></el-input>
+      <el-form-item label="处理意见:"
+                    prop="processingOpinions"
+                    v-if="adviceVisible">
+        <el-input v-model="dataForm.processingOpinions"
+                  type="textarea"
+                  placeholder="不超过500字"></el-input>
       </el-form-item>
     </el-form>
     <template slot="footer">
-        <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-        <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary"
+                 @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
     </template>
   </el-dialog>
 </template>
@@ -80,7 +89,7 @@ export default {
       })
     },
     getInfo () {
-      this.$http.get(`/group/group/detail/${this.dataForm.id}`).then(({ data: res }) => {
+      this.$http.get(`/property/group/detail/${this.dataForm.id}`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
@@ -88,7 +97,7 @@ export default {
           ...this.dataForm,
           ...res.data
         }
-      }).catch(() => {})
+      }).catch(() => { })
     },
     dataFormSubmitHandle: debounce(function () {
       if (this.adviceVisible) {
@@ -100,20 +109,20 @@ export default {
         }
       }
       this.$http['post'](
-        '/group/group/operate', this.dataForm).then(({ data: res }) => {
-        if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.$message({
-          message: this.$t('prompt.success'),
-          type: 'success',
-          duration: 500,
-          onClose: () => {
-            this.visible = false
-            this.$emit('refreshDataList')
+        '/property/group/operate', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
           }
-        })
-      }).catch(() => {})
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => { })
     }, 1000, { 'leading': true, 'trailing': false })
   }
 }
diff --git a/src/views/modules/property/group.vue b/src/views/modules/property/group.vue
index 0589850..341c00a 100644
--- a/src/views/modules/property/group.vue
+++ b/src/views/modules/property/group.vue
@@ -162,7 +162,7 @@ export default {
         streetId: '',
         communityId: '',
         gridId: '',
-        state: '0'
+        state: '10'
       },
       postForm: {
         id: '',
@@ -172,12 +172,6 @@ export default {
       ids: [],
       options: [],
       stateOptions: [{
-        id: '0',
-        name: '待审核'
-      }, {
-        id: '5',
-        name: '审核不通过'
-      }, {
         id: '10',
         name: '正常'
       }, {
@@ -228,12 +222,6 @@ export default {
   },
   methods: {
     formatState: function (row, column) {
-      if (row.state === 0) {
-        return '待审核'
-      }
-      if (row.state === 5) {
-        return '审核不通过'
-      }
       if (row.state === 10) {
         return '正常'
       }
@@ -255,7 +243,7 @@ export default {
       }).then(() => {
         this.postForm.state = 15
         this.postForm.id = id
-        this.$http['post']('/group/group/operate', this.postForm).then(({ data: res }) => {
+        this.$http['post']('/property/group/operate', this.postForm).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
@@ -276,7 +264,7 @@ export default {
       }).then(() => {
         this.postForm.state = 10
         this.postForm.id = id
-        this.$http['post']('/group/group/operate', this.postForm).then(({ data: res }) => {
+        this.$http['post']('/property/group/operate', this.postForm).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
@@ -297,7 +285,7 @@ export default {
       }).then(() => {
         this.postForm.state = 20
         this.postForm.id = id
-        this.$http['post']('/group/group/operate', this.postForm).then(({ data: res }) => {
+        this.$http['post']('/property/group/operate', this.postForm).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
@@ -345,7 +333,7 @@ export default {
       if (this.postForm.processingOpinions.length > 500) {
         return this.$message.error('解散原因不能超过500字')
       }
-      this.$http['post']('/group/group/operate', this.postForm).then(({ data: res }) => {
+      this.$http['post']('/property/group/operate', this.postForm).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
diff --git a/src/views/modules/property/topic.vue b/src/views/modules/property/topic.vue
index f7ab6d1..d812f57 100644
--- a/src/views/modules/property/topic.vue
+++ b/src/views/modules/property/topic.vue
@@ -1,7 +1,7 @@
 <template>
-    <keep-alive include="TopicList">
-        <component :is="selectComponent"></component>
-    </keep-alive>
+  <keep-alive include="TopicList">
+    <component :is="selectComponent"></component>
+  </keep-alive>
 </template>
 
 <script>
@@ -26,5 +26,4 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
 </style>