From 6a205514f8e80e9663db847c4b51ad138f784519 Mon Sep 17 00:00:00 2001
From: sunFlower <787203167@qq.com>
Date: Wed, 26 Oct 2022 10:05:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/batchProcessing.vue               | 16 ++++++++++++++++
 .../views/toDoCenter/taskConfirmation/index.vue  |  3 +++
 2 files changed, 19 insertions(+)

diff --git a/jero-web/src/views/toDoCenter/taskConfirmation/components/batchProcessing.vue b/jero-web/src/views/toDoCenter/taskConfirmation/components/batchProcessing.vue
index 15f1ca777..ec5e2708f 100644
--- a/jero-web/src/views/toDoCenter/taskConfirmation/components/batchProcessing.vue
+++ b/jero-web/src/views/toDoCenter/taskConfirmation/components/batchProcessing.vue
@@ -9,6 +9,17 @@
       @ok="handleOk"
       @cancel="handleCancel"
     >
+      <template slot="footer">
+        <a-button key="back" @click="handleCancel">
+          {{$t('cancel')}}
+        </a-button>
+        <a-button type="danger" :loading="confirmLoading" v-if="taskDefinitionKey == 'dreqr'" @click="sendBackClick">
+          {{$t('sendBack')}}
+        </a-button>
+        <a-button type="primary" :loading="confirmLoading" @click="handleOk">
+          {{$t('confirm')}}
+        </a-button>
+      </template>
       <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
         <a-row :gutter="24" v-if="taskDefinitionKey != 'dreqr'">
           <a-col :span="24">
@@ -68,6 +79,7 @@
           </a-col>
         </a-row>
       </a-form-model>
+
     </a-modal>
   </div>
 </template>
@@ -138,6 +150,10 @@
           this.$refs.ruleForm.clearValidate()
         })
       },
+      sendBackClick() {
+        this.formInline.flag = '1'
+        this.handleOk()
+      },
       flagChange(event) {
         if (event.target.value == 3) {
           this.isTrue = true
diff --git a/jero-web/src/views/toDoCenter/taskConfirmation/index.vue b/jero-web/src/views/toDoCenter/taskConfirmation/index.vue
index cb80eca13..be713ee56 100644
--- a/jero-web/src/views/toDoCenter/taskConfirmation/index.vue
+++ b/jero-web/src/views/toDoCenter/taskConfirmation/index.vue
@@ -181,6 +181,7 @@
         window.open(newUrl.href, '_blank')
       },
       batchProcessingForm() {
+        this.selectedRowKeys = []
         this.getList()
       },
       batchProcessingClick() {
@@ -202,10 +203,12 @@
         }
       },
       searchQuery() {
+        this.selectedRowKeys = []
         this.pageNo = 1
         this.getList()
       },
       searchReset() {
+        this.selectedRowKeys = []
         this.pageNo = 1
         this.queryParam = {}
         this.getList()