From 9ec9ed674e5bccce826a98df0e1265f9e3814363 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Fri, 22 May 2020 15:58:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=91=E8=AD=A6=E7=AE=A1=E7=90=86=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=A7=A3=E6=95=A3=E7=BE=A4=E5=8A=9F=E8=83=BD=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E4=BA=86=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/police/police.vue            | 15 ++++++++++++---
 src/views/modules/property/propertyproject.vue |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/police/police.vue b/src/views/modules/police/police.vue
index b6ffa0c..8010767 100644
--- a/src/views/modules/police/police.vue
+++ b/src/views/modules/police/police.vue
@@ -22,7 +22,7 @@
                     </el-button>
                 </el-form-item>
                 <el-form-item>
-                    <el-button v-if="$hasPermission(':police:delete')" type="danger" @click="deleteHandle()">{{
+                    <el-button v-if="$hasPermission(':police:delete:')" type="danger" @click="deleteHandle()">{{
                         $t('deleteBatch') }}
                     </el-button>
                 </el-form-item>
@@ -44,7 +44,7 @@
                                    @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}
                         </el-button>
                         <el-button v-if="$hasPermission(':police:delete')" type="text" size="small"
-                                   @click="deleteHandle(scope.row.id)">{{ $t('delete') }}
+                                   @click="beforeDeleteHandle(scope.row.id)">{{ $t('delete') }}
                         </el-button>
                     </template>
                 </el-table-column>
@@ -107,6 +107,15 @@
             handleChange(value) {
                 this.dataForm.deptId = value.slice(-1).shift()
             },
+            beforeDeleteHandle (id) {
+                this.$confirm('删除民警将会解散全部警民群，是否继续操作?', this.$t('prompt.title'), {
+                    confirmButtonText: this.$t('confirm'),
+                    cancelButtonText: this.$t('cancel'),
+                    type: 'warning'
+                }).then(() => {
+                    this.deleteHandle(id);
+                })
+            },
             supplementHandle(id) {
                 if (!id && this.dataListSelections.length <= 0) {
                     return this.$message({
@@ -120,7 +129,7 @@
                     cancelButtonText: this.$t('cancel'),
                     type: 'warning'
                 }).then(() => {
-                    this.$http.put('/property/police/supplement', id ? [id] : this.dataListSelections.map(item => item.deptId)).then(({data: res}) => {
+                    this.$http.put('/property/police/supplement', id ? [id] : this.dataListSelections.map(item => item)).then(({data: res}) => {
                         if (res.code !== 0) {
                             return this.$message.error(res.msg)
                         }
diff --git a/src/views/modules/property/propertyproject.vue b/src/views/modules/property/propertyproject.vue
index 7b85673..36f7a1e 100644
--- a/src/views/modules/property/propertyproject.vue
+++ b/src/views/modules/property/propertyproject.vue
@@ -22,7 +22,7 @@
                     </el-button>
                 </el-form-item>
                 <el-form-item>
-                    <el-button v-if="$hasPermission(':propertyproject:delete')" type="danger" @click="deleteHandle()">{{
+                    <el-button v-if="$hasPermission(':propertyproject:delete:')" type="danger" @click="deleteHandle()">{{
                         $t('deleteBatch') }}
                     </el-button>
                 </el-form-item>