From 4fff783b78018ff7e7f46ead7a4b61045cceb4e3 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Fri, 3 Jul 2020 14:57:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=91=E8=AD=A6=E7=BE=A4=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E8=A1=A5=E5=BB=BA=EF=BC=8C=E6=94=B9=E4=B8=BA=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?=E7=A4=BE=E5=8C=BAID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/police/police-add-or-update.vue   |  6 +--
 src/views/modules/police/police.vue           | 43 +------------------
 2 files changed, 4 insertions(+), 45 deletions(-)

diff --git a/src/views/modules/police/police-add-or-update.vue b/src/views/modules/police/police-add-or-update.vue
index 2b65a9f..8e99a33 100644
--- a/src/views/modules/police/police-add-or-update.vue
+++ b/src/views/modules/police/police-add-or-update.vue
@@ -25,10 +25,10 @@
                     </div>
                 </el-upload>
             </el-form-item>
-            <el-form-item label="民警联系方式" prop="policeTel">
-                <el-input v-model="dataForm.policeTel" placeholder="民警联系方式"></el-input>
+            <el-form-item label="联系方式" prop="policeTel">
+                <el-input v-model="dataForm.policeTel" placeholder="联系方式"></el-input>
             </el-form-item>
-            <el-form-item label="民警所在机构名称"
+            <el-form-item label="所属机构"
                           prop="deptId">
                 <el-cascader v-model="dataForm.deptId" style="width: 100%"
                              :options="options"
diff --git a/src/views/modules/police/police.vue b/src/views/modules/police/police.vue
index a678f68..a776b0c 100644
--- a/src/views/modules/police/police.vue
+++ b/src/views/modules/police/police.vue
@@ -26,10 +26,6 @@
                         $t('deleteBatch') }}
                     </el-button>
                 </el-form-item>
-                <el-form-item>
-                    <el-button v-if="$hasPermission('police:police:supplement')" type="primary" @click="supplementHandle()">警民群补建
-                    </el-button>
-                </el-form-item>
             </el-form>
             <el-table v-loading="dataListLoading" :data="dataList" border
                       @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
@@ -57,7 +53,7 @@
                     </template>
                 </el-table-column>
                 <el-table-column prop="policeTel" label="联系方式" header-align="center" align="center"></el-table-column>
-                <el-table-column prop="deptName" label="所属社区" header-align="center" align="center"></el-table-column>
+                <el-table-column prop="allDeptNames" 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 v-if="$hasPermission('police:police:update')" type="text" size="small"
@@ -139,43 +135,6 @@ export default {
       this.deleteHandle(id)
       // })
     },
-    supplementHandle (data) {
-      if (!data && this.dataListSelections.length <= 0) {
-        return this.$message({
-          message: '请选择需要补建的社区',
-          type: 'warning',
-          duration: 500
-        })
-      }
-      if (!data && this.dataListSelections.length > 1) {
-        return this.$message({
-          message: '只能选择一条数据',
-          type: 'warning',
-          duration: 500
-        })
-      }
-      this.$confirm(this.$t('prompt.info', { 'handle': '补建群' }), this.$t('prompt.title'), {
-        confirmButtonText: this.$t('confirm'),
-        cancelButtonText: this.$t('cancel'),
-        type: 'warning'
-      }).then(() => {
-        this.$http.put('/property/police/supplement', data || this.dataListSelections[0]).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.getDataList()
-            }
-          })
-        }).catch(() => {
-        })
-      }).catch(() => {
-      })
-    }
   }
 }
 </script>