From e3a1be97561c0ae3ae6402da038595688cdd63ff Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Mon, 31 Aug 2020 14:34:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/record/approval-add-or-update.vue       | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/result/record/approval-add-or-update.vue b/src/views/modules/result/record/approval-add-or-update.vue
index 31222c4..21414a2 100644
--- a/src/views/modules/result/record/approval-add-or-update.vue
+++ b/src/views/modules/result/record/approval-add-or-update.vue
@@ -3,8 +3,10 @@
     :title="'' "
     :close-on-click-modal="false"
     :visible.sync="visible">
+
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="80px">
-      <el-form-item label="驳回到" v-if="status === 5 " >
+
+   <!--   <el-form-item label="驳回到" v-if="status === 5 " >
         <el-select v-model="dataForm.rollbackFlowId" placeholder="请选择">
           <el-option
             v-for="item in rollbackData"
@@ -13,7 +15,8 @@
             :value="item.id"
           ></el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item>-->
+
       <el-form-item label="意见" prop="resultComment">
         <div id="resultCommentEditorElem" class="editor"></div>
       </el-form-item>
@@ -90,16 +93,11 @@ export default {
       })
     },
     commitRecord (status) {
-      if(status === 5 && this.dataForm.rollbackFlowId === ''){
-        this.alertInfo("请选择驳回目标")
-        return;
-      }
       commitApproval({
         'recordResultId': this.recordResultId,
         'resultComment': Base64.encode(this.resultCommentEditor.txt.html()),
         'status': status,
-        'resultCommitId': this.resultCommitId,
-        'rollbackFlowId': this.dataForm.rollbackFlowId
+        'resultCommitId': this.resultCommitId
       }).then(data => {
         if (data && data.code === 0) {
           this.$emit('refreshDataList', this.recordResultId)