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 @@
{{$t('inquiry')}}
+
+ {{$t('sendBack')}}
+
@@ -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..c19d1eb3c 100644
--- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
@@ -31,6 +31,7 @@
v-if="isDisplay"
isApprovalOpinion
:title="titleName"
+ :isSendBack="isSendBackOne"
ref="examineInformationRef"
:url="url"/>
@@ -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 @@
{{$t('inquiry')}}
+
+ {{$t('sendBack')}}
+