From c19e32410e17eec337384c535f98c596a5d34fc5 Mon Sep 17 00:00:00 2001
From: sunFlower <787203167@qq.com>
Date: Tue, 27 Sep 2022 16:24:32 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  1 +
 jero-web/src/common/lang/zh-cn.js             |  1 +
 .../components/examineInformation.vue         |  7 +++++
 .../processForm/handshakeProcess/index.vue    | 28 +++++++++++--------
 .../components/batchProcessing.vue            |  3 ++
 5 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 82379b72c..bd059005d 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1311,4 +1311,5 @@ module.exports = {
   hasBeenExport:'Has been export',
   firstLevelDirectory:'First level directory',
   deselectAll:'Deselect All',
+  classification:'Classification',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index cac85b273..fa7a71a7c 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1412,4 +1412,5 @@ module.exports = {
   hasBeenExport:'已导出',
   firstLevelDirectory:'一级目录',
   deselectAll:'取消全选',
+  classification:'分类',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/processCenter/components/examineInformation.vue b/jero-web/src/views/processCenter/components/examineInformation.vue
index e640eec56..385c860df 100644
--- a/jero-web/src/views/processCenter/components/examineInformation.vue
+++ b/jero-web/src/views/processCenter/components/examineInformation.vue
@@ -24,6 +24,9 @@
                 <a-radio value="3" v-if="issue">
                   {{$t('inquiry')}}
                 </a-radio>
+                <a-radio value="4" v-if="isSendBack">
+                  {{$t('sendBack')}}
+                </a-radio>
               </a-radio-group>
             </a-form-model-item>
           </div>
@@ -106,6 +109,10 @@
       title: {
         type: String,
         default: ''
+      },
+      isSendBack:{
+        type: Boolean,
+        default: false
       }
     },
     components: {
diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
index 41fa34ad3..48d22f6d0 100644
--- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
@@ -32,6 +32,7 @@
           isApprovalOpinion
           :title="titleName"
           ref="examineInformationRef"
+          :isSendBack="isSendBackOne"
           :url="url"/>
         <!--        @terminationProcess="terminationProcess"-->
         <footerProcess
@@ -145,6 +146,11 @@
           return false
         }
         return true
+      },
+      isSendBackOne() {
+        if (this.$route.query.taskDefinitionKey == 'zrrqr') {
+          return true
+        }
       }
     },
     methods: {
@@ -183,14 +189,14 @@
           }
         })
       },
-      rejectCauseAdd(rejectCause,ids) {
+      rejectCauseAdd(rejectCause, ids) {
         let rejectTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
         let query = {
-          rejectUserId:this.userInfo().id,
-          rejectTime:rejectTime,
-          rejectCause:rejectCause,
-          projectLawsInventoryId:ids,
-          rejectType:'1',
+          rejectUserId: this.userInfo().id,
+          rejectTime: rejectTime,
+          rejectCause: rejectCause,
+          projectLawsInventoryId: ids,
+          rejectType: '1'
         }
         postAction('/project/projectLawsInventoryRejectCauseEO/add', query).then((res) => {
 
@@ -198,8 +204,8 @@
       },
       completeTask(value, handlingTime) {
         let json = Object.assign(this.queryBy, { handlingTime: handlingTime }, value)
-        if (json.flag == '1'){
-          this.rejectCauseAdd(value.approvalOpinion,this.queryBy.id)
+        if (json.flag == '1') {
+          this.rejectCauseAdd(value.approvalOpinion, this.queryBy.id)
         }
         Object.keys(json).forEach(res => {
           if (json[res] && typeof json[res] == 'string') {
@@ -269,7 +275,7 @@
         }
         postAction('/workFlow/startProcess', query).then((res) => {
           if (res.success) {
-            this.completeTaskDesign(value, res.result,true)
+            this.completeTaskDesign(value, res.result, true)
           }
         })
       },
@@ -277,7 +283,7 @@
         getAction('/workFlow/deleteProcessInstanceByTaskId', { taskId: taskId }).then((res) => {
         })
       },
-      completeTaskDesign(value, taskId,isTrue) {
+      completeTaskDesign(value, taskId, isTrue) {
         value.reviewResult = 'launch'
         let operatorTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
         value.operatorTime = operatorTime
@@ -302,7 +308,7 @@
             // this.$router.push({
             //   path: '/ProcessCenter'
             // })
-          }else{
+          } else {
             if (isTrue) {
               this.deleteProcessInstanceByTask(taskId)
             }
diff --git a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/components/batchProcessing.vue b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/components/batchProcessing.vue
index 108dcf2d3..26af9622c 100644
--- a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/components/batchProcessing.vue
+++ b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/components/batchProcessing.vue
@@ -27,6 +27,9 @@
                   <a-radio value="3" v-if="taskDefinitionKey == 'zrrjsrw'">
                     {{$t('inquiry')}}
                   </a-radio>
+                  <a-radio value="4" v-if="taskDefinitionKey == 'zrrqr'">
+                    {{$t('sendBack')}}
+                  </a-radio>
                 </a-radio-group>
               </a-form-model-item>
             </div>