diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue index bf8f01fc2..b382da530 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue @@ -40,6 +40,14 @@ {{approvalResult[text]}} + + + + {{text}} + + {{result.operatorResultName}} @@ -159,7 +167,8 @@ dataIndex: 'approvalOpinion', align: 'left', width: 200, - ellipsis: true + ellipsis: true, + scopedSlots: { customRender: 'approvalOpinion' } }, { title: this.$t('resultofhandling'), @@ -186,7 +195,7 @@ customRender: function(t, r, index) { return moment(t).format('YYYY-MM-DD HH:mm:ss') } - }, + } ] } }, diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue index 0d7de755b..a4fcddf1f 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue @@ -139,7 +139,9 @@ return true }, isDrawerClass() { - if (this.queryData.TaskKey == 'dezrrtjjfw' || this.queryData.TaskKey == 'zrrtjjfw') { + if (this.queryData.TaskKey == 'dezrrtjjfw' || + this.queryData.TaskKey == 'zrrtjjfw' || + this.queryData.TaskKey == 'fggcssh') { return true } return false @@ -263,6 +265,7 @@ operatorType: 'taskAffirmQuery' } this.queryBy.approvalOpinion = '' + this.queryBy.approvalFile = '' getAction(this.url.queryProjectLawsInventoryInfoById, query).then((res) => { if (res.success) { this.queryProject = res.result[0] || {} diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue index 8b31bb419..3d1d5d251 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue @@ -49,6 +49,9 @@ {{$t('turnToDo')}} + + {{this.$t('PersonnelSelection')}} + {{this.formInline.dezrrSubmitUserName}} @@ -71,7 +74,8 @@ - +
@@ -111,6 +115,7 @@ data() { return { formInline: {}, + isPersonnel: false, reviewResult: { 'launch': this.$t('Launch'), 'Compliance': this.$t('accord'), @@ -171,7 +176,6 @@ if (this.queryBy.disposeResult == 'To be tracked' || this.queryBy.disposeResult == 'Non-Compliance') { this.isAdopt = true } - console.log(this.isAdopt) }, methods: { submit(callBack) { @@ -181,11 +185,16 @@ } }) }, + PersonnelSelectionClick() { + this.$refs.SelectedByRef.getPush() + }, reviewResultChange(value) { if (value.target.value == 'Transfer') { - this.$refs.SelectedByRef.getPush() + this.isPersonnel = true + // this.$refs.SelectedByRef.getPush() } else { this.$refs.SelectedByRef.visible = false + this.isPersonnel = false this.formInline.secondChargePersonUserId = '' this.formInline.dezrrSubmitUserName = '' this.formInline.dezrrSubmitUserId = ''