diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index cc1edc48d..dea37cdb4 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -732,9 +732,16 @@ align: 'left', ellipsis: true, width: 140, - sorter: true, scopedSlots: { customRender: 'designFlowStatusName' } }, + { + title: this.$t('typeOfDeliverables'), + dataIndex: 'designDeliverableTypeName', + align: 'left', + width: 180, + sorter: true, + ellipsis: true, + }, { title: this.$t('deliverableTemplate'), dataIndex: 'designDeliverableTemplate', @@ -771,9 +778,16 @@ align: 'left', ellipsis: true, width: 180, - sorter: true, scopedSlots: { customRender: 'verifyFlowStatusName' } }, + { + title: this.$t('typeOfDeliverables'), + dataIndex: 'verifyDeliverableTypeName', + align: 'left', + width: 180, + sorter: true, + ellipsis: true, + }, { title: this.$t('deliverableTemplate'), dataIndex: 'verifyDeliverableTemplate', @@ -988,6 +1002,16 @@ key: 24, moduleFlag: '法规清单' }, + { + sort: '', + name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('typeOfDeliverables'), + headFieldCn: '交付物类型', + headFieldEn: 'Deliverable Type', + field: 'designDeliverableTypeName', + affirmFlag: '1', + key: 25, + moduleFlag: '法规清单' + }, { sort: '', name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('deliverableTemplate'), @@ -995,7 +1019,7 @@ headFieldEn: 'Deliverable Template', field: 'designDeliverableTemplate', affirmFlag: '1', - key: 25, + key: 26, moduleFlag: '法规清单' }, { @@ -1028,6 +1052,16 @@ key: 34, moduleFlag: '法规清单' }, + { + sort: '', + name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('typeOfDeliverables'), + headFieldCn: '交付物类型', + headFieldEn: 'Deliverable Type', + field: 'verifyDeliverableTypeName', + affirmFlag: '3', + key: 25, + moduleFlag: '法规清单' + }, { sort: '', name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('deliverableTemplate'), @@ -2085,6 +2119,10 @@ this.orderByField = 'attestationRank' } else if (sorter.columnKey == 'dutyTerritory_dictText') { this.orderByField = 'dutyTerritory' + } else if (sorter.columnKey == 'designDeliverableTypeName') { + this.orderByField = 'designDeliverableType' + } else if (sorter.columnKey == 'verifyDeliverableTypeName') { + this.orderByField = 'verifyDeliverableType' } else { this.orderByField = sorter.columnKey } diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue index 3d1d5d251..5a9147b4c 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/reviewedByThePersonInCharge.vue @@ -70,7 +70,9 @@ + :rows="2" + style="min-height: 68px" + />