diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue index f485910d0..902c8a6e5 100644 --- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue +++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue @@ -7,19 +7,19 @@
{{ $t('distributionEngineer') }}
{{ $t('reminderHandling') }}
{{ $t('addFeedback') }} @@ -448,12 +448,13 @@ } }, mounted() { + this.$route.query.isDisplay = JSON.parse(this.$route.query.isDisplay) this.getList() }, computed: { columns() { let columnResult = JSON.parse(JSON.stringify(this.columnsAll)) - if (this.$route.query.TaskKey != 'zrrclrw') { + if (this.$route.query.TaskKey != 'zrrclrw' || !this.$route.query.isDisplay) { for (var i = 0; i < columnResult.length; i++) { if (columnResult[i].title === this.$t('operation')) { columnResult.splice(i, 1) @@ -467,7 +468,7 @@ methods: { pageOnChange(page, pageSize) { this.pageNo = page - this.getList() + this.getDetails() }, handleOk() { this.$refs.ruleForm.validate(valid => { diff --git a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue index a0e46efe9..8a919040e 100644 --- a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue @@ -10,12 +10,12 @@
- * + * {{$t('reviewResults')}}
- + @@ -42,7 +42,9 @@ {{$t('feedbackMessage')}}
-
@@ -67,14 +69,14 @@
- * + * {{$t('feedbackFromTheEngineer')}}
+ :prop="!$route.query.isDisplay?'':'engineerFeedbackContent'"> @@ -85,11 +87,11 @@
- * + * {{$t('Deliverables')}}
- + {{ (formInline.fileId === 'null' || formInline.fileId === '' || @@ -140,7 +142,9 @@ {{$t('feedbackMessage')}}
-
@@ -148,7 +152,7 @@
@@ -205,6 +209,7 @@ } }, mounted() { + this.$route.query.isDisplay = JSON.parse(this.$route.query.isDisplay) if (this.queryBy) { this.formInline.reviewResult = this.queryBy.reviewResult || undefined this.formInline.approvalOpinion = '' @@ -214,7 +219,6 @@ this.formInline.deliveryRequirements = this.queryPersonInCharge.deliveryRequirements this.formInline.engineerFeedbackContent = this.queryPersonInCharge.engineerFeedbackContent this.formInline.fileId = this.queryPersonInCharge.fileId - console.log(this.formInline) this.formInline = { ...this.formInline } } }, diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue index 3465650e1..7c565020e 100644 --- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue @@ -147,19 +147,19 @@ }, computed: { isSendBack() { - if (this.$route.query.TaskKey == 'fqrsh') { + if (this.$route.query.TaskKey == 'fqrsh' && this.$route.query.isDisplay) { return true } return false }, isTerminationProcess() { - if (this.$route.query.TaskKey == 'fqrsh') { + if (this.$route.query.TaskKey == 'fqrsh' && this.$route.query.isDisplay) { return true } return false }, isAdopt() { - if (this.$route.query.TaskKey == 'fqrsh') { + if (this.$route.query.TaskKey == 'fqrsh' && this.$route.query.isDisplay) { if (this.queryBy.reviewResult == 'Compliance' || this.queryBy.reviewResult == 'NA') { return true } @@ -167,9 +167,9 @@ return false }, isSubmit() { - if (this.$route.query.TaskKey == 'zrrclrw') { + if (this.$route.query.TaskKey == 'zrrclrw' && this.$route.query.isDisplay) { return true - } else if (this.$route.query.TaskKey == 'dreDispose') { + } else if (this.$route.query.TaskKey == 'dreDispose' && this.$route.query.isDisplay) { if (!this.queryPersonInCharge.engineerFeedbackContent && this.queryPersonInCharge.status != 'haveDone') { return true } @@ -177,7 +177,7 @@ return false }, isResubmit() { - if (this.$route.query.TaskKey == 'dreDispose') { + if (this.$route.query.TaskKey == 'dreDispose' && this.$route.query.isDisplay) { if (this.queryPersonInCharge.engineerFeedbackContent && this.queryPersonInCharge.status != 'haveDone') { return true } @@ -187,6 +187,7 @@ }, mounted() { let _this = this + this.$route.query.isDisplay = JSON.parse(this.$route.query.isDisplay) let query = { actiProcInstId: this.$route.query.actiProcInstId, createBy: this.userInfo().username @@ -272,7 +273,7 @@ projectTaskInventoryId: this.$route.query.projectTaskInventoryId, deliveryRequirements: val.deliveryRequirements } - postAction(this.url.dreSubmit, query).then((res) => { + putAction(this.url.dreSubmit, query).then((res) => { }) }, diff --git a/jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue index 7d8efe6c1..dc15a49ad 100644 --- a/jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ParameterItemCollection/ProjectDetails/index.vue @@ -1,6 +1,6 @@ \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue index 7b96e95d9..e4c4eac73 100644 --- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue +++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue @@ -90,7 +90,7 @@ title: this.$t('projectDetails'), textTitle: '项目详情', url: { - logList: '', + logList: '/project/projectLawsInventoryLogEO/page', historicalVersionUrl: '' } } @@ -119,7 +119,7 @@ text[num].classList.add('Virtual-detail-left-text-color') }, UpdateLogClick() { - this.$refs.updateLogRef.getList() + this.$refs.updateLogRef.getList({projectLibraryId: this.$route.query.id}) }, historicalVersionClick() { this.$refs.historicalVersionListRef.getList() diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index 4fc3d75f9..b9d1bdc8b 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -273,6 +273,8 @@ }, verifyTaskClick(val, num, isTrue) { let query = {} + console.log(typeof isTrue) + return switch (num) { case 1: query = { @@ -284,6 +286,7 @@ studioEngineer: this.$route.query.studioEngineer, serialNumber: val.serialNumber, TaskKey: val.designTaskDefinitionKey, + isDisplay: isTrue, flowType: 2, Sponsor: 'designInitiatorName', personLiable: 'designDutyName', @@ -306,6 +309,7 @@ serialNumber: val.serialNumber, TaskKey: val.prehomoTaskDefinitionKey, flowType: 3, + isDisplay: isTrue, id: this.$route.query.id, Sponsor: 'prehomoInitiatorName', personLiable: 'prehomoDutyName', @@ -329,6 +333,7 @@ projectTaskInventoryId: val.projectLawsInventoryId, TaskKey: val.verifyTaskDefinitionKey, flowType: 4, + isDisplay: isTrue, Sponsor: 'verifyInitiatorName', personLiable: 'verifyDutyName', typeOfDeliverables: 'verifyDeliverableType_dictText',