From 47167515e148dacffe856fa2be32696bed4e96b4 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Wed, 8 Jul 2020 10:23:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E6=95=99=E8=82=B2=E2=80=94?=
 =?UTF-8?q?=E5=85=B4=E8=B6=A3=E7=88=B1=E5=A5=BD=E7=BE=A4=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BE=A4=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/activity/group-add-or-update.vue | 6 +++---
 src/views/modules/activity/group.vue               | 3 +++
 src/views/modules/police/police-add-or-update.vue  | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/activity/group-add-or-update.vue b/src/views/modules/activity/group-add-or-update.vue
index 03a4cb3..980bb37 100644
--- a/src/views/modules/activity/group-add-or-update.vue
+++ b/src/views/modules/activity/group-add-or-update.vue
@@ -38,7 +38,7 @@
                       prop="deptId">
             <el-cascader v-model="dataForm.deptId" style="width: 100%"
                          :options="options"
-                         :disabled="dataForm.id"
+                         :disabled="dataForm.id != null"
                          :props="{ checkStrictly: true }"
                          ref="grid"
                          @change="deptHandleChange"
@@ -89,7 +89,7 @@ export default {
       categoryOptions: [],
       options: [],
       loading: false,
-      disabled:false,
+      disabled: false,
       uploadUrl: ''
     }
   },
@@ -188,7 +188,7 @@ export default {
     },
     // 获取信息
     getInfo () {
-      this.$http.get(`//group/${this.dataForm.id}`).then(({ data: res }) => {
+      this.$http.get(`/property/group/${this.dataForm.id}`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         }
diff --git a/src/views/modules/activity/group.vue b/src/views/modules/activity/group.vue
index b1c7d9b..dd9d603 100644
--- a/src/views/modules/activity/group.vue
+++ b/src/views/modules/activity/group.vue
@@ -90,6 +90,9 @@
                        type="text"
                        size="small"
                        @click="handDisband(scope.row.id)">{{ $t('disband') }}</el-button>
+            <el-button v-if="$hasPermission('activity:group:update')" type="text" size="small"
+                       @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/modules/police/police-add-or-update.vue b/src/views/modules/police/police-add-or-update.vue
index e00964a..10443bc 100644
--- a/src/views/modules/police/police-add-or-update.vue
+++ b/src/views/modules/police/police-add-or-update.vue
@@ -32,7 +32,7 @@
                           prop="deptId">
                 <el-cascader v-model="dataForm.deptId" style="width: 100%"
                              :options="options"
-                             :disabled="dataForm.id"
+                             :disabled="dataForm.id != null"
                              ref="grid"
                              @change="deptHandleChange"
                              filterable