diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue index 6951aef25..4ff0887ea 100644 --- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue +++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue @@ -399,7 +399,8 @@ projectTaskInventoryId: this.$route.query.projectTaskInventoryId, flowType: '2', userIds: this.formInline.userId, - taskDefinitionKey: 'dreDispose' + taskDefinitionKey: 'dreDispose', + msgType: 'designIssueDreMsg' } postAction(this.url.DetailEOAdd, query).then((res) => { if (res.success) { diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue index 53c28a1dd..440391051 100644 --- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue @@ -222,34 +222,36 @@ }, methods: { ...mapGetters(['userInfo']), - terminationProcess() { + terminationProcess(operatorTime) { this.textLoading = this.$t('terminationProcessing') this.loading = true this.queryBy.reviewResult = 'termination of task' - this.completeTask({ flag: 2 }) + this.completeTask({ flag: 2, operatorTime: operatorTime }) }, - adopt() { + adopt(operatorTime) { this.$refs.reviewedByThePersonInChargeRef.submit((res) => { this.textLoading = this.$t('Submitting') this.loading = true res.flag = 0 + res.operatorTime = operatorTime this.completeTask(res) }) }, - sendBack() { + sendBack(operatorTime) { this.textLoading = this.$t('Returning') this.loading = true - if (this.queryBy.reviewResult == 'inconformity' || this.queryBy.reviewResult == 'to track'){ + if (this.queryBy.reviewResult == 'inconformity' || this.queryBy.reviewResult == 'to track') { - }else{ + } else { this.queryBy.reviewResult = 'to be confirmed' } - this.completeTask({ flag: 1 }) + this.completeTask({ flag: 1, operatorTime: operatorTime }) }, - submit() { + submit(operatorTime) { this.$refs.reviewedByThePersonInChargeRef.submit((res) => { this.textLoading = this.$t('Submitting') this.loading = true + res.operatorTime = operatorTime this.completeTask(res) }) }, diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 9123ceaf7..d83ff6202 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1155,6 +1155,8 @@ completeTaskDesign(value, taskId) { value.reviewResult = 'launch' + let operatorTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') + value.operatorTime = operatorTime let query = { userid: this.userInfo().id, taskId: taskId,