diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 70531e8dc..322abaa9c 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -719,4 +719,5 @@ module.exports = { operationNode: 'operation node', taskDataConfirmation: 'Please select the data whose list confirmation status is accepted and task confirmation status is not initiated or rejected, and the regulatory engineer and certification engineer are not empty', selectIssuer:'Select issuer', + sendBack:'send back', } \ 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 068e8a935..4e58b9bbb 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -724,4 +724,5 @@ module.exports = { opinion:'意见', operationNode:'操作节点', selectIssuer:'选择下发人', + sendBack:'退回', } \ No newline at end of file diff --git a/jero-web/src/views/processCenter/components/headerProcess.vue b/jero-web/src/views/processCenter/components/headerProcess.vue index 0418ea7a2..cce5f446f 100644 --- a/jero-web/src/views/processCenter/components/headerProcess.vue +++ b/jero-web/src/views/processCenter/components/headerProcess.vue @@ -16,6 +16,9 @@ {{$t('issue')}} {{$t('submit')}} + + {{$t('sendBack')}} + @@ -50,7 +53,12 @@ isPreservation: { type: Boolean, default: false - } + }, + //是否显示退回按钮 + isSendBack:{ + type: Boolean, + default: false + }, }, methods: { terminationProcess() { @@ -67,6 +75,10 @@ let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') this.$emit('submit',handlingTime) }, + sendBackCkick(){ + let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') + this.$emit('sendBack',handlingTime) + }, backTo() { } diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue index 85efdc3e4..ae8923cb9 100644 --- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue @@ -4,8 +4,10 @@ :title="'工程接口人确认符合性要求'" is-termination-process is-submit + :isSendBack="isSendBack" @terminationProcess="terminationProcess" @submit="submit" + @sendBack="sendBack" />
@@ -25,7 +27,7 @@ :url="url "/> { - this.completeTask(res,handlingTime) + if (!this.isFlag) { + res.flag = 0 + } + this.completeTask(res, handlingTime) }) }, + sendBack(handlingTime) { + this.completeTask({ flag: 1 }, handlingTime) + }, queryTaskDetailByTask(callback) { this.loading = true getAction(this.url.queryTaskDetailByTaskIds, { taskIds: this.$route.query.taskIds }).then((res) => { @@ -186,13 +208,13 @@ } }) }, - completeTask(value,handlingTime) { - let json = Object.assign({handlingTime:handlingTime}, this.queryBy, value) + completeTask(value, handlingTime) { + let json = Object.assign({ handlingTime: handlingTime }, this.queryBy, value) let data = JSON.stringify(json).replace(/\"/g, '\'') let query = { userid: this.userInfo().id, taskId: this.$route.query.taskId || this.$route.query.taskIds, - json: data, + json: data } postAction('/workFlow/completeTask', query).then((res) => { if (res.success) {