From 97273adc202642087b3884d356f688777af83c58 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 11 May 2022 17:49:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E6=B8=85?=
 =?UTF-8?q?=E7=9A=84=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectManagement/components/TaskList.vue |  2 +-
 .../components/nonConformance.vue             |  1 +
 .../projectNonConformance/index.vue           | 32 +++++++++++--------
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue
index 1ac1af27b..5c7147f7e 100644
--- a/jero-web/src/views/projectManagement/components/TaskList.vue
+++ b/jero-web/src/views/projectManagement/components/TaskList.vue
@@ -78,7 +78,7 @@
         <div slot="PrehomoConfirmation" slot-scope="text,result" class="box-left">
           <div class="content" v-if="result.prehomoTaskStatus" @click="verifyTaskClick(result,2,false)">
             <span class="box-content">{{$t('Deadline')}}: {{result.prehomoDueDate}}</span><br/>
-            <span class="box-content">{{$t('ProcessStatus')}}: {{result.prehomoTaskStatus}}</span><br/>
+            <span class="box-content">{{$t('ProcessStatus')}}: {{result.prehomoStatus}}</span><br/>
             <span class="box-content-color" :class="color[result.prehomoFlowTaskStatus]">
               {{statusText[result.prehomoFlowTaskStatus]}}
             </span>
diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue
index 3ef48b450..0e83765f0 100644
--- a/jero-web/src/views/projectManagement/components/nonConformance.vue
+++ b/jero-web/src/views/projectManagement/components/nonConformance.vue
@@ -149,6 +149,7 @@
           projectLibraryId:this.$route.query.id,
           ...this.queryParam
         }
+        this.loading = true
         getAction(this.url.page, query).then((res) => {
           if (res.success) {
             this.dataSource = res.result.records || []
diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
index 77f3ba9f4..4923bdbdc 100644
--- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue
+++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
@@ -57,20 +57,12 @@
                         class="box-input"
                         v-model="queryParam.projectName"
                         :placeholder="$t('PleaseSelect')+$t('RelatedItems')">
-                <a-select-option :value="2">
-               <span class="itemOption">
-                     {{ $t('designComplianceReview') }}
-               </span>
-                </a-select-option>
-                <a-select-option :value="3">
-               <span class="itemOption">
-                     {{ $t('preHomeConfirmation') }}
-               </span>
-                </a-select-option>
-                <a-select-option :value="4">
-               <span class="itemOption">
-                     {{ $t('verificationComplianceReview') }}
-               </span>
+                <a-select-option v-for="(item, key) in projectNameList"
+                                 :key="key"
+                                 :value="item.id">
+                     <span style="display: inline-block;width: 100%" :title=" item.projectName ">
+                           {{ item.projectName}}
+                     </span>
                 </a-select-option>
               </a-select>
             </div>
@@ -185,6 +177,7 @@
         loading: false,
         dataSource: [],
         selectedRowKeys: [],
+        projectNameList: [],
         toggleSearchStatus: false,
         columns: [
           {
@@ -234,8 +227,18 @@
     },
     mounted() {
       this.getList()
+      this.getNameList()
     },
     methods: {
+      getNameList() {
+        getAction('project/projectNameInfoEO/list', {}).then((res) => {
+          if (res.success) {
+            this.projectNameList = res.result || []
+          } else {
+            this.projectNameList = []
+          }
+        })
+      },
       handleToggleSearch() {
         this.toggleSearchStatus = !this.toggleSearchStatus
       },
@@ -266,6 +269,7 @@
           pageSize: this.pageSize,
           ...this.queryParam
         }
+        this.loading = true
         getAction(this.url.page, query).then((res) => {
           if (res.success) {
             this.dataSource = res.result.records || []