diff --git a/jero-web/src/views/projectManagement/components/addModelconformance.vue b/jero-web/src/views/projectManagement/components/addModelconformance.vue index 395162929..5aeaa814d 100644 --- a/jero-web/src/views/projectManagement/components/addModelconformance.vue +++ b/jero-web/src/views/projectManagement/components/addModelconformance.vue @@ -519,6 +519,15 @@ export default { if(this.formInline.problemState == null){ this.formInline.problemState = undefined } + if(this.formInline.progressTrackingList == null){ + this.formInline.progressTrackingList = [{}] + } + if(this.formInline.approvalEvidenceLinkList == null){ + this.formInline.approvalEvidenceLinkList = [{}] + } + if(this.formInline.fileLinkList == null){ + this.formInline.fileLinkList = [{}] + } if(this.formInline.projectId != null){ this.formInline.projectId = this.formInline.projectId.split(',') }else{ diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue index fc0db405a..6d27e7639 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue @@ -152,6 +152,9 @@ {{result.problemState ? result.problemState : ''}} + + {{result.flag== 'NEW'?result.problemType_dictText:result.problemType}} + @@ -249,7 +252,8 @@ dataIndex: 'problemType_dictText', width: 170, sorter:true, - ellipsis: true + ellipsis: true, + scopedSlots: { customRender: 'problemType' } }, { title: this.$t('statisticalNodes'), @@ -262,7 +266,7 @@ { title: this.$t('creator'), align: 'left', - dataIndex: 'creator', + dataIndex: 'createBy', width: 100, sorter:true, ellipsis: true diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue index 395162929..5aeaa814d 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue @@ -519,6 +519,15 @@ export default { if(this.formInline.problemState == null){ this.formInline.problemState = undefined } + if(this.formInline.progressTrackingList == null){ + this.formInline.progressTrackingList = [{}] + } + if(this.formInline.approvalEvidenceLinkList == null){ + this.formInline.approvalEvidenceLinkList = [{}] + } + if(this.formInline.fileLinkList == null){ + this.formInline.fileLinkList = [{}] + } if(this.formInline.projectId != null){ this.formInline.projectId = this.formInline.projectId.split(',') }else{