From bba21ea9f4b306eabb96bafa091eea27fb605c7d Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 23 Dec 2021 14:32:35 +0800
Subject: [PATCH] 25799

---
 packages/3.0.0/AppVillageActivity/AppVillageActivity.vue | 5 +++--
 packages/3.0.0/AppVillageActivity/components/Add.vue     | 8 +++++---
 packages/3.0.0/AppVillageActivity/components/List.vue    | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/3.0.0/AppVillageActivity/AppVillageActivity.vue b/packages/3.0.0/AppVillageActivity/AppVillageActivity.vue
index 7fdf5578..6739bbb2 100644
--- a/packages/3.0.0/AppVillageActivity/AppVillageActivity.vue
+++ b/packages/3.0.0/AppVillageActivity/AppVillageActivity.vue
@@ -1,7 +1,7 @@
 <template>
   <ai-list v-if="!isShowDetail">
     <template slot="title">
-      <ai-title title="居民活动" :isShowBottomBorder="false" :isShowArea="currIndex === '0'" v-model="areaId" :instance="instance" @change="onAreaChange"></ai-title>
+      <ai-title title="居民活动" :isShowBottomBorder="false" :isShowArea="currIndex === '0'" :fullName.sync="areaName" v-model="areaId" :instance="instance" @change="onAreaChange"></ai-title>
     </template>
     <template slot="tabs">
       <el-tabs v-model="currIndex">
@@ -11,7 +11,7 @@
       </el-tabs>
     </template>
   </ai-list>
-  <Add v-else-if="componentName === 'Add'" :params="params" :instance="instance" :dict="dict" :permissions="permissions" @change="onChange"></Add>
+  <Add v-else-if="componentName === 'Add'" :areaName="areaName" :areaId="areaId" :params="params" :instance="instance" :dict="dict" :permissions="permissions" @change="onChange"></Add>
   <Detail v-else-if="componentName === 'Detail'" :params="params" :instance="instance" :dict="dict" :permissions="permissions" @change="onChange"></Detail>
 </template>
 
@@ -60,6 +60,7 @@
         currIndex: '0',
         componentName: '',
         params: {},
+        areaName: '',
         areaId: '',
         isShowDetail: false
       }
diff --git a/packages/3.0.0/AppVillageActivity/components/Add.vue b/packages/3.0.0/AppVillageActivity/components/Add.vue
index ffeaa6cd..19c8da86 100644
--- a/packages/3.0.0/AppVillageActivity/components/Add.vue
+++ b/packages/3.0.0/AppVillageActivity/components/Add.vue
@@ -73,7 +73,9 @@
     props: {
       instance: Function,
       dict: Object,
-      params: Object
+      params: Object,
+      areaId: String,
+      areaName: String
     },
 
     data () {
@@ -100,8 +102,8 @@
     },
 
     created () {
-      this.form.areaId = this.user.info.areaId
-      this.form.areaName = this.user.info.areaName
+      this.form.areaId = this.areaId
+      this.form.areaName = this.areaName
       this.disabledLevel = this.user.info.areaList.length - 1
       if (this.params && this.params.id) {
         this.id = this.params.id
diff --git a/packages/3.0.0/AppVillageActivity/components/List.vue b/packages/3.0.0/AppVillageActivity/components/List.vue
index 5e674823..1a168fd3 100644
--- a/packages/3.0.0/AppVillageActivity/components/List.vue
+++ b/packages/3.0.0/AppVillageActivity/components/List.vue
@@ -38,7 +38,7 @@
           <template slot-scope="{ row }">
             <div class="table-options">
               <el-button type="text" @click="toDetail(row.id)">详情</el-button>
-              <el-button type="text" @click="toAdd(row.id)">编辑</el-button>
+              <el-button type="text" @click="toAdd(row.id)" :disabled="row.status === '1' || row.status === '2'">编辑</el-button>
               <el-button type="text" @click="remove(row.id)">删除</el-button>
             </div>
           </template>