diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index 8f8c57cc6..eef2f448c 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -904,7 +904,7 @@ verifyDutyIdDisabled: false, verifyInitiatorIdDisabled: false, DeliverableTreeList: [], - userInfoQuery:{}, + userInfoQuery: {} } }, mounted() { @@ -1240,6 +1240,33 @@ formInline[res] = formInline[res].join(',') } }) + if (!formInline.verifyDutyId) { + formInline.verifyDutyId = '' + } + if (!formInline.regulationOwnerId) { + formInline.regulationOwnerId = '' + } + if (!formInline.engineeringInterfacePerson) { + formInline.engineeringInterfacePerson = '' + } + if (!formInline.homologationEngineerId) { + formInline.homologationEngineerId = '' + } + if (!formInline.designInitiatorId) { + formInline.designInitiatorId = '' + } + if (!formInline.designDutyId) { + formInline.designDutyId = '' + } + if (!formInline.prehomoInitiatorId) { + formInline.prehomoInitiatorId = '' + } + if (!formInline.prehomoDutyId) { + formInline.prehomoDutyId = '' + } + if (!formInline.verifyInitiatorId) { + formInline.verifyInitiatorId = '' + } this.confirmLoading = true putAction(this.url.editModel, formInline).then((res) => { if (res.success) { diff --git a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue index 08986ea69..a77144c4f 100644 --- a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue +++ b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue @@ -113,6 +113,17 @@ {{$t('edit')}} + + + {{$t('regulatoryEngineer')}} + + + + {{$t('engineeringInterfacePerson')}} + + + {{$t('certifiedEngineer')}} + @@ -267,20 +278,20 @@ ellipsis: true }, { - title: this.$t('regulatoryEngineer'), align: 'center', dataIndex: 'lawEngineerName', + slots:{title:'regulatoryEngineer'}, ellipsis: true }, { - title: this.$t('engineeringInterfacePerson'), align: 'center', + slots:{title:'engineeringInterfacePerson'}, dataIndex: 'engineeringInterfacePersonName', ellipsis: true }, { - title: this.$t('certifiedEngineer'), align: 'center', + slots:{title:'certifiedEngineer'}, dataIndex: 'certificationEngineerName', ellipsis: true }, @@ -293,7 +304,7 @@ { title: this.$t('operation'), align: 'center', - width: 100, + width: 110, fixed: 'right', scopedSlots: { customRender: 'operation' } } diff --git a/jero-web/src/views/system/RoleUserList.vue b/jero-web/src/views/system/RoleUserList.vue index 55b0e85ed..b86fe23e8 100644 --- a/jero-web/src/views/system/RoleUserList.vue +++ b/jero-web/src/views/system/RoleUserList.vue @@ -130,7 +130,7 @@ title: this.$t('serialNumber'), dataIndex: '', key: 'rowIndex', - width: 20, + width: 90, align: 'center', customRender: function(t, r, index) { return parseInt(index) + 1 @@ -160,7 +160,7 @@ }, { title: this.$t('operation'), - width: 100, + width: 200, dataIndex: 'action', align: 'center', scopedSlots: { customRender: 'action' }