Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

packages/3.0.0/AppVillageAlbum/components/Add.vue

@@ -8,15 +8,18 @@
       <ai-card title="基本信息">
         <template #content>
           <el-form class="ai-form" :model="form" label-width="120px" ref="form">
-            <el-form-item label="相册主题" style="width: 100%;" prop="type" :rules="[{required: true, message: '请选择相册主题', trigger: 'blur'}]">
+            <el-form-item label="相册主题" style="width: 100%;" prop="type"
+                          :rules="[{required: true, message: '请选择相册主题', trigger: 'blur'}]">
               <ai-select
                   v-model="form.type"
                   placeholder="请选择相册主题"
                   :selectList="dict.getDict('villagePictureAlbumType')">
               </ai-select>
             </el-form-item>
-            <el-form-item prop="areaId" style="width: 100%;" label="发布地区" :rules="[{required: true, pattern: /[^000]$/, message: '请选择到村', trigger: 'change'}]">
+            <el-form-item prop="areaId" style="width: 100%;" label="发布地区"
-              <ai-area-select @fullname="v => form.areaName = v" clearable always-show :instance="instance" v-model="form.areaId" :disabled-level="disabledLevel"></ai-area-select>
+                          :rules="[{required: true, pattern: /([^0]\d{2}|0[^0]\d|0\d[^0])$/, message: '请选择到村', trigger: 'change'}]">
+              <ai-area-select @fullname="v => form.areaName = v" clearable always-show :instance="instance"
+                              v-model="form.areaId" :disabled-level="disabledLevel"></ai-area-select>
             </el-form-item>
             <el-form-item label="图片" style="width: 100%;" prop="urlList" :rules="[{required: true,  message: '请上传图片'}]">
               <ai-uploader
@@ -37,8 +40,9 @@
 </template>
 
 <script>
-  import { mapState } from 'vuex'
+import {mapState} from 'vuex'
-  export default {
+
+export default {
   name: 'Add',
 
   props: {
@@ -47,7 +51,7 @@
     params: Object
   },
 
-    data () {
+  data() {
     return {
       info: {},
       form: {
@@ -67,7 +71,7 @@
     ...mapState(['user'])
   },
 
-    created () {
+  created() {
     this.form.areaId = this.user.info.areaId
     this.disabledLevel = this.user.info.areaList.length
     this.dict.load(['villagePictureAlbumType'])
@@ -78,7 +82,7 @@
   },
 
   methods: {
-      getInfo (id) {
+    getInfo(id) {
       this.instance.post(`/app/appcountrysidetourism/queryDetailById?id=${id}`).then(res => {
         if (res.code === 0) {
           this.form = res.data
@@ -86,7 +90,7 @@
       })
     },
 
-      confirm () {
+    confirm() {
       this.$refs.form.validate((valid) => {
         if (valid) {
           this.instance.post(`/app/appvillagepicturealbum/addPictures`, {
@@ -105,14 +109,14 @@
       })
     },
 
-      cancel (isRefresh) {
+    cancel(isRefresh) {
       this.$emit('change', {
         type: 'list',
         isRefresh: !!isRefresh
       })
     }
   }
-  }
+}
 </script>
 
 <style scoped lang="scss">