From 42645a5e05a44fc1f06c2ab96c05dba4e21fe853 Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Mon, 24 Aug 2020 15:03:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=A2=9E=E5=8A=A0=E5=85=AC?=
 =?UTF-8?q?=E7=9B=8A=E6=97=B6=E9=95=BF=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/heart/actinfo-add-or-update.vue     | 17 ++++++++++++++++-
 src/views/modules/heart/actinfo-detail-view.vue |  9 ++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/heart/actinfo-add-or-update.vue b/src/views/modules/heart/actinfo-add-or-update.vue
index f811527..64a5313 100644
--- a/src/views/modules/heart/actinfo-add-or-update.vue
+++ b/src/views/modules/heart/actinfo-add-or-update.vue
@@ -111,6 +111,17 @@
             </el-date-picker>
           </el-form-item>
         </el-row>
+        <el-row>
+          <el-form-item label="公益时长："
+                        prop="kindnessTime">
+            <el-input-number type="number"
+                             :min="0"
+                             v-model="dataForm.kindnessTime"
+                             clearable
+                             style="width:150px">
+            </el-input-number>&emsp;小时
+          </el-form-item>
+        </el-row>
         <el-row>
           <div>
             <el-form-item label="打卡范围时间："
@@ -313,7 +324,8 @@ export default {
         punishmentPoints: '',
         reward: '',
         actUserDefaultState: '1',
-        isConReview: false
+        isConReview: false,
+        kindnessTime: ''
       },
       isImgRequired: true,
       mapSelectVisible: false,
@@ -407,6 +419,9 @@ export default {
         signupEndTime: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
+        kindnessTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
         signinStartTime: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
diff --git a/src/views/modules/heart/actinfo-detail-view.vue b/src/views/modules/heart/actinfo-detail-view.vue
index 01f51a3..53708c9 100644
--- a/src/views/modules/heart/actinfo-detail-view.vue
+++ b/src/views/modules/heart/actinfo-detail-view.vue
@@ -65,6 +65,12 @@
             {{dataForm.actEndTime}}
           </el-form-item>
         </el-row>
+        <el-row>
+          <el-form-item label="公益时长："
+                        prop="kindnessTime">
+            {{dataForm.kindnessTime}}&emsp;小时
+          </el-form-item>
+        </el-row>
         <el-row>
 
           <div>
@@ -188,7 +194,8 @@ export default {
         deptId: '',
         punishmentPoints: '',
         actUserDefaultState: '1',
-        reward: ''
+        reward: '',
+        kindnessTime: ''
       },
       loading: false
     }