From 6fd8304c96984589d1e39a60666768c4d009bfae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Wed, 8 Apr 2020 15:16:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=9C=AA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/heart/actuserclock-detail.vue     | 105 +++++++++++-------
 src/views/modules/heart/actuserrelation.vue   |   1 +
 2 files changed, 65 insertions(+), 41 deletions(-)

diff --git a/src/views/modules/heart/actuserclock-detail.vue b/src/views/modules/heart/actuserclock-detail.vue
index 6291e097..f1d3dba2 100644
--- a/src/views/modules/heart/actuserclock-detail.vue
+++ b/src/views/modules/heart/actuserclock-detail.vue
@@ -2,39 +2,56 @@
   <div class="project-handle"
        style="background: #ffffff;">
     <div class="project-detail">
-      <div class="project-detail-tip">处理操作 :</div>
-      <el-form ref="dataForm"
-               :model="dataForm"
-               :rules="dataRule"
-               @keyup.enter.native="dataFormSubmitHandle()">
-        <el-form-item label="是否加积分 :"
-                      prop="status">
-          <el-radio v-model="dataForm.status"
-                    :disabled="isAble"
-                    label="5">确认加积分</el-radio>
-          <el-radio v-model="dataForm.status"
-                    :disabled="isAble"
-                    label="6">拒绝加积分</el-radio>
-        </el-form-item>
-        <el-form-item label="处理意见 :"
-                      prop="failureReason">
-          <el-input :rows="4"
-                    v-model="dataForm.failureReason"
-                    :disabled="isAble"
-                    type="textarea"
-                    placeholder="请写明理由，100字以内"></el-input>
-        </el-form-item>
-        <el-form-item style="float: right;">
-          <el-button size="small"
-                     style="width: 95px"
-                     type="primary"
-                     :disabled="isAble"
-                     @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
-          <el-button size="small"
-                     style="width: 95px"
-                     @click="backToActClockList">{{ '返回' }}</el-button>
-        </el-form-item>
-      </el-form>
+      <div v-if="dataForm.status=='2'">
+        <div class="project-detail-tip">处理操作 :</div>
+        <el-form ref="dataForm"
+                 :model="dataForm"
+                 :rules="dataRule"
+                 @keyup.enter.native="dataFormSubmitHandle()">
+          <el-form-item label="是否加积分 :"
+                        prop="status">
+            <el-radio v-model="dataForm.status"
+                      label="5">确认加积分</el-radio>
+            <el-radio v-model="dataForm.status"
+                      label="6">拒绝加积分</el-radio>
+          </el-form-item>
+          <el-form-item label="处理意见 :"
+                        prop="failureReason">
+            <el-input :rows="4"
+                      v-model="dataForm.failureReason"
+                      type="textarea"
+                      placeholder="请写明理由，100字以内"></el-input>
+          </el-form-item>
+          <el-form-item style="float: right;">
+            <el-button size="small"
+                       style="width: 95px"
+                       type="primary"
+                       @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+            <el-button size="small"
+                       style="width: 95px"
+                       @click="backToActClockList">{{ '返回' }}</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="info"
+           v-if="dataForm.status=='5'">
+        {{dataForm.status}}
+        <div>本次活动已确认加积分</div>
+        <div>如有积分调整，请在“志愿者管理-积分调整”里对该用户进行增或减积分操作</div>
+        <el-button size="small"
+                   style="width: 95px"
+                   @click="backToActClockList">{{ '返回' }}</el-button>
+      </div>
+      <div class="info"
+           v-if="dataForm.status=='6'">
+        {{dataForm.status}}
+        <div>本次活动已拒绝加积分</div>
+        <div>如有积分调整，请在“志愿者管理-积分调整”里对该用户进行增或减积分操作</div>
+        <el-button size="small"
+                   style="width: 95px"
+                   @click="backToActClockList">{{ '返回' }}</el-button>
+      </div>
+
     </div>
     <div class="container">
       <div class="location"><span style="font-weight: bold;color: #606266">打卡位置 :</span> {{dataForm.address}}</div>
@@ -259,12 +276,13 @@ export default {
           ...this.dataForm,
           ...res.data
         }
-        if (res.data.status !== '5' && res.data.status !== '6') {
-          this.dataForm.status = '5'
-          this.dataForm.failureReason = ''
-        } else {
-          this.isAble = true
-        }
+        this.dataForm.status = '5';
+        // if (res.data.status != '5' && res.data.status != '6') {
+        //   this.dataForm.status = '5';
+        //   this.dataForm.failureReason = '';
+        // } else {
+        //   this.isAble = true;
+        // }
         this.setMap(res.data)
 
         this.getDataList()
@@ -306,9 +324,9 @@ export default {
         if (this.dataForm.failureReason.length > 100) {
           return this.$message.error('处理意见不超过100字')
         }
-        this.isAble = true
+        // this.isAble = true
         this.$http['post']('/heart/actuserclocklog/pointCheck', this.dataForm).then(({ data: res }) => {
-          this.isAble = false
+          // this.isAble = false
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
@@ -458,5 +476,10 @@ export default {
       text-align: center;
     }
   }
+  .info {
+    height: 100%;
+    background: #fff;
+    margin-bottom: 0px;
+  }
 }
 </style>
diff --git a/src/views/modules/heart/actuserrelation.vue b/src/views/modules/heart/actuserrelation.vue
index 2ecc7e42..6683267c 100644
--- a/src/views/modules/heart/actuserrelation.vue
+++ b/src/views/modules/heart/actuserrelation.vue
@@ -170,6 +170,7 @@ export default {
   mounted () {
     this.dataForm.actId = this.$route.query.id
     this.getDataList()
+    this.dataListLoading = false
   },
   methods: {
     backToActList () {