From d61e2bdd2e46d2e7076aea393229e1593de099e9 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Sun, 28 Jun 2020 16:19:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E7=82=B9=E5=8F=AF=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=BF=97=E6=84=BF=E8=80=85=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/activity/activityinfo-add.vue     |  2 +-
 .../modules/heart/actinfo-add-or-update.vue   | 21 ++++++++++++++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/activity/activityinfo-add.vue b/src/views/modules/activity/activityinfo-add.vue
index 795aa8b..21f3776 100644
--- a/src/views/modules/activity/activityinfo-add.vue
+++ b/src/views/modules/activity/activityinfo-add.vue
@@ -129,7 +129,7 @@
                     <el-form-item label="活动地点："
                                   prop="actAddress">
                         <el-input v-model="dataForm.actAddress"
-                                  :disabled="signInIsAble"
+                                  :disabled="dataForm.actAddress === ''"
                                   type="text"
                                   clearable
                                   style="width:400px">
diff --git a/src/views/modules/heart/actinfo-add-or-update.vue b/src/views/modules/heart/actinfo-add-or-update.vue
index 89ac9f2..f1789d5 100644
--- a/src/views/modules/heart/actinfo-add-or-update.vue
+++ b/src/views/modules/heart/actinfo-add-or-update.vue
@@ -64,6 +64,17 @@
             </el-date-picker>
           </el-form-item>
         </el-row>
+        <el-row>
+          <el-form-item label="是否只允许志愿者参加："
+                        prop="volunteerFlag">
+            <template>
+              <el-radio v-model="dataForm.volunteerFlag"
+                        label="1">是</el-radio>
+              <el-radio v-model="dataForm.volunteerFlag"
+                        label="0">否</el-radio>
+            </template>
+          </el-form-item>
+        </el-row>
         <el-row>
           <el-form-item label="活动名额："
                         prop="actQuota">
@@ -147,7 +158,7 @@
           <el-form-item label="活动地点："
                         prop="actAddress">
             <el-input v-model="dataForm.actAddress"
-                      :disabled="signInIsAble"
+                      :disabled="dataForm.actAddress === ''"
                       type="text"
                       clearable
                       style="width:400px">
@@ -160,7 +171,7 @@
           <el-form-item label="打卡地点："
                         prop="signinAddress">
             <el-input v-model="dataForm.signinAddress"
-                      :disabled="signInIsAble"
+                      :disabled="dataForm.signinAddress === ''"
                       type="text"
                       clearable
                       style="width:400px">
@@ -352,7 +363,8 @@ export default {
         reward: '',
         isBanner: '1',
         actUserDefaultState: '1',
-        bannerUrl: ''
+        bannerUrl: '',
+        volunteerFlag: '1'
       },
       isSignupEndTime: {
         disabledDate (time) {
@@ -539,6 +551,9 @@ export default {
         updatedTime: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
+        volunteerFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
         bannerUrl: [
           { required: this.isImgRequired, message: this.$t('validate.required'), trigger: 'blur' }
         ]