diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue index 1c889d789..896903852 100644 --- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue +++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue @@ -53,7 +53,7 @@ {{$t('edit')}} @@ -607,6 +607,7 @@ this.dataSourceTable.forEach(val => { this.distributionEngineerList.push({ name: val.userName, + id:val.id, userId: val.userId, deliveryInstructions: val.deliveryInstructions }) diff --git a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue index 8a919040e..1631f0d12 100644 --- a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue @@ -2,7 +2,8 @@
- {{$route.query.TaskKey == 'zrrclrw' ? $t('personLiableConfirm'):$t('fillInProjectDelivery')}} + {{$route.query.TaskKey == 'zrrclrw' || $route.query.TaskKey == 'fqrsh' + ? $t('personLiableConfirm'):$t('fillInProjectDelivery')}}
@@ -110,7 +111,7 @@
- 爱上克里夫就的撒开了房间圣诞快乐房价士大夫打扫房间圣诞快乐房价是罚款乱收费考虑是否就但是考虑 + {{reviewResult[formInline.reviewResult]}} @@ -170,6 +171,14 @@ data() { return { formInline: {}, + reviewResult: { + 'launch': this.$t('Launch'), + 'Compliance': this.$t('accord'), + 'Non-Compliance': this.$t('nonConformity'), + 'To be tracked': this.$t('Tracked'), + 'NA': this.$t('notInvolved'), + 'No rating': this.$t('toBeConfirmed') + }, isTrue: false, rules: { reviewResult: [ @@ -210,17 +219,22 @@ }, mounted() { this.$route.query.isDisplay = JSON.parse(this.$route.query.isDisplay) - if (this.queryBy) { + if (this.queryBy && this.$route.query.TaskKey == 'fqrsh') { this.formInline.reviewResult = this.queryBy.reviewResult || undefined - this.formInline.approvalOpinion = '' + this.formInline.approvalOpinion = this.queryBy.approvalOpinion this.formInline = { ...this.formInline } } - if (this.queryPersonInCharge) { + if (this.queryPersonInCharge && this.$route.query.TaskKey == 'dreDispose') { this.formInline.deliveryRequirements = this.queryPersonInCharge.deliveryRequirements this.formInline.engineerFeedbackContent = this.queryPersonInCharge.engineerFeedbackContent this.formInline.fileId = this.queryPersonInCharge.fileId this.formInline = { ...this.formInline } } + if (this.queryBy && this.$route.query.TaskKey == 'zrrclrw') { + this.formInline.reviewResult = this.queryBy.reviewResult || undefined + this.formInline.approvalOpinion = this.queryBy.approvalOpinion + this.formInline = { ...this.formInline } + } }, methods: { submit(callBack) { diff --git a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue index 900d7d4c6..ad4dd00b0 100644 --- a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue +++ b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue @@ -15,7 +15,7 @@ :columns="columns" > - {{reviewResult[text]}} + {{text}} diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue index 1b3629873..2bd386343 100644 --- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue @@ -20,6 +20,7 @@ />