From 1bdb8485fb87d75d0351bad342922e6eb2c5aae9 Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Mon, 1 Jun 2020 16:54:51 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90pc=E7=AB=AF=20-=20=E5=88=9D=E5=BF=83?=
 =?UTF-8?q?=E4=BA=92=E5=8A=A9=20=E3=80=91-=E3=80=90=E6=89=93=E5=8D=A1?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86-=E5=89=8D=E7=AB=AFbug=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=91-=EF=BC=88=E9=AD=8F=E5=87=AF=EF=BC=89-2020/06/01?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/heart/actuserclock-detail.vue     | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/heart/actuserclock-detail.vue b/src/views/modules/heart/actuserclock-detail.vue
index fcead7e1..284bee12 100644
--- a/src/views/modules/heart/actuserclock-detail.vue
+++ b/src/views/modules/heart/actuserclock-detail.vue
@@ -9,15 +9,16 @@
           :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 label="是否加积分 :" prop="ratiod">
+            <el-radio v-model="dataForm.ratiod" label="5">确认加积分</el-radio>
+            <el-radio v-model="dataForm.ratiod" label="6">拒绝加积分</el-radio>
           </el-form-item>
           <el-form-item label="处理意见 :" prop="failureReason">
             <el-input
               :rows="4"
               v-model="dataForm.failureReason"
               type="textarea"
+              style="width: 560px"
               placeholder="请写明理由，100字以内"
             ></el-input>
           </el-form-item>
@@ -138,13 +139,14 @@ export default {
       dataForm: {
         id: '',
         actId: '',
-        status: '',
+        ratiod: '',
         failureReason: '',
         address: '',
         latitude: '',
         longitude: '',
         radius: 200,
-        clockPic: []
+        clockPic: [],
+        status:'',
       },
       previewImgList: [],
       isAble: false
@@ -158,11 +160,11 @@ export default {
   computed: {
     dataRule () {
       return {
-        status: [
+        ratiod: [
           {
             required: true,
             message: this.$t('validate.required'),
-            trigger: 'blur'
+            trigger: 'change'
           }
         ],
         failureReason: [
@@ -279,7 +281,12 @@ export default {
           }
           this.dataForm = {
             ...this.dataForm,
-            ...res.data
+            ...res.data,
+          }
+          let a = this.dataForm.status //获取积分状态
+          let b = res.data.oldStatus  //获取积分
+          if (a =="2"&& b=="2"){
+            this.dataForm.failureReason = '';
           }
           // if (res.data.status != '5' && res.data.status != '6') {
           //   this.dataForm.status = '5';
@@ -330,6 +337,7 @@ export default {
           if (this.dataForm.failureReason.length > 100) {
             return this.$message.error('处理意见不超过100字')
           }
+          this.dataForm.status = this.dataForm.ratiod
           // this.isAble = true
           this.$http['post']('/heart/actuserclocklog/pointCheck', this.dataForm)
             .then(({ data: res }) => {