From b8a7c287a0e6e060e96926a79643f348a84b914e Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Wed, 13 May 2020 15:21:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E9=A1=B9=E7=9B=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/property/propertyproject-add-or-update.vue    | 6 +++++-
 src/views/modules/property/propertyproject.vue            | 8 ++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/property/propertyproject-add-or-update.vue b/src/views/modules/property/propertyproject-add-or-update.vue
index 5d23882..d9f8b3e 100644
--- a/src/views/modules/property/propertyproject-add-or-update.vue
+++ b/src/views/modules/property/propertyproject-add-or-update.vue
@@ -10,6 +10,7 @@
                              :options="options"
                              ref="grid"
                              :props="{ checkStrictly: true }"
+                             @change="handleChange"
                              filterable
                              collapse-tags></el-cascader>
             </el-form-item>
@@ -128,6 +129,9 @@
                         this.loading = false;
                     })
             },
+            handleChange(value) {
+                this.dataForm.gridId = value.slice(-1).shift();
+            },
             // 获取信息
             getInfo() {
                 this.$http.get(`/property/propertyproject/${this.dataForm.id}`).then(({data: res}) => {
@@ -138,7 +142,7 @@
                         ...this.dataForm,
                         ...res.data
                     };
-                    this.dataForm.allDeptIds=res.data.allDeptIds.split(",");
+                    this.dataForm.allDeptIds = res.data.allDeptIds.split(",");
                     this.loading = false;
                 }).catch(() => {
                     this.loading = false;
diff --git a/src/views/modules/property/propertyproject.vue b/src/views/modules/property/propertyproject.vue
index 7ae67e2..7c58f26 100644
--- a/src/views/modules/property/propertyproject.vue
+++ b/src/views/modules/property/propertyproject.vue
@@ -17,10 +17,10 @@
                     <el-button @click="getDataList()">{{ $t('query') }}</el-button>
                 </el-form-item>
                 <el-form-item>
-                    <el-button v-if="$hasPermission(':propertyproject:add')"  type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+                    <el-button v-if="$hasPermission('propertyproject:add')"  type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</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>
@@ -41,10 +41,10 @@
                                  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(':propertyproject:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update')
+                        <el-button v-if="$hasPermission('propertyproject:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update')
                             }}
                         </el-button>
-                        <el-button v-if="$hasPermission(':propertyproject:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}
+                        <el-button v-if="$hasPermission('propertyproject:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}
                         </el-button>
                     </template>
                 </el-table-column>