From bfaa8387cd45621202b80ebab17b79651805f33f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 6 Sep 2023 11:28:46 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=AE=A1=E7=90=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectManagement/components/addModelconformance.vue | 9 +++++++++
 .../projectManagement/projectNonConformance/index.vue    | 8 ++++++--
 .../projectNonConformance/moudles/addModel.vue           | 9 +++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)

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 : ''}}
              </span>
         </div>
+                <span slot="problemType" slot-scope="text,result">
+                   <span>{{result.flag== 'NEW'?result.problemType_dictText:result.problemType}}</span>
+                </span>
         <span slot="operation" slot-scope="text,record">
           <a class="text-operation"
              @click="detil(record)">
@@ -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{