From d8a9b2df484c1cc44787d8947e1c75895f3c89e9 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 23 Dec 2021 15:05:58 +0800
Subject: [PATCH] 25803

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

diff --git a/packages/3.0.0/AppVillageActivity/AppVillageActivity.vue b/packages/3.0.0/AppVillageActivity/AppVillageActivity.vue
index 6739bbb2..6ed90199 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'" :fullName.sync="areaName" 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">
diff --git a/packages/3.0.0/AppVillageAlbum/components/Add.vue b/packages/3.0.0/AppVillageAlbum/components/Add.vue
index c36651a4..7cd2af6f 100644
--- a/packages/3.0.0/AppVillageAlbum/components/Add.vue
+++ b/packages/3.0.0/AppVillageAlbum/components/Add.vue
@@ -89,6 +89,9 @@
       confirm () {
         this.$refs.form.validate((valid) => {
           if (valid) {
+            if (this.form.areaId.endsWith('000')) {
+              return this.$message.error('地区必须选择到村级')
+            }
             this.instance.post(`/app/appvillagepicturealbum/addPictures`, {
               ...this.form,
               id: this.params.id,
diff --git a/packages/3.0.0/AppVillageAlbum/components/List.vue b/packages/3.0.0/AppVillageAlbum/components/List.vue
index 3f271b12..78d4a082 100644
--- a/packages/3.0.0/AppVillageAlbum/components/List.vue
+++ b/packages/3.0.0/AppVillageAlbum/components/List.vue
@@ -1,7 +1,7 @@
 <template>
   <ai-list class="list">
     <template slot="title">
-      <ai-title title="乡村相册" isShowBottomBorder :instance="instance" isShowArea v-model="search.areaId" @change="changeArea"></ai-title>
+      <ai-title title="乡村相册" isShowBottomBorder :instance="instance" :disabledLevel="disabledLevel" isShowArea v-model="search.areaId" @change="changeArea"></ai-title>
     </template>
     <template slot="content">
       <ai-search-bar>
@@ -94,7 +94,8 @@
         list: [],
         total: 0,
         loading: false,
-        id: ''
+        id: '',
+        disabledLevel: 0
       }
     },
 
@@ -108,6 +109,7 @@
 
     created () {
       this.loading = true
+      this.disabledLevel = this.user.info.areaList.length - 1
       this.search.areaId = this.user.info.areaId
       this.dict.load(['villagePictureAlbumType']).then(() => {
         this.getList()