From 05b89d70ad51a812b2a375fa52194001ba556325 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Tue, 28 Mar 2023 13:56:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B3=95=E8=A7=84=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1-=E9=AA=8C=E8=AF=81=E7=AC=A6=E5=90=88=E6=80=A7?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E7=9A=84=E6=B5=81=E7=A8=8B=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  1 +
 jero-web/src/common/lang/zh-cn.js             |  1 +
 .../components/circulationHistory.vue         | 41 ++++++++++++++++++-
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 68eb6e659..a112514e2 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -894,6 +894,7 @@ module.exports = {
   designComplianceReview: 'Design Compliance Confirmation',
   preHomeConfirmation: 'Pre-Homo Confirmation',
   verificationComplianceReview: 'Validation Compliance Confirmation',
+  verificationComplianceExamine:'Verification compliance examine',
   Deployment: 'Deploy',
   pleaseDesignConformityConfirmation: 'Please complete the data of design conformity confirmation',
   pleaseConfirmedByPrehomo: 'Please complete the data confirmed by Pre-Homo',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 80aea7039..4fde5dc19 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -910,6 +910,7 @@ module.exports = {
   designComplianceReview: '设计符合性确认',
   preHomeConfirmation: 'Pre-Homo确认',
   verificationComplianceReview: '验证符合性确认',
+  verificationComplianceExamine:'验证符合性审查',
   pleaseDesignConformityConfirmation: '请补全设计符合性确认的数据',
   pleaseConfirmedByPrehomo: '请补全 Pre-Homo确认的数据',
   pleaseConformityVerification: '请补全验证符合性确认的数据',
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
index 181c85c0a..ed8dc8238 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/circulationHistory.vue
@@ -94,7 +94,29 @@
           'To be tracked': 'trackedClass',
           'NA': 'NAClass'
         },
-        regulatoryCertificationTaskPlanList: [
+        verifyList: [
+          {
+            status: '1',
+            name: this.$t('initiatingProcess')
+          },
+          {
+            status: '1',
+            name: this.$t('Taskresponsibilityrecognition')
+          },
+          {
+            status: '1',
+            name: this.$t('verificationComplianceReview')
+          },
+          {
+            status: '2',
+            name: this.$t('verificationComplianceExamine')
+          },
+          {
+            status: '3',
+            name: this.$t('missionAccomplished')
+          }
+        ],
+        designList: [
           {
             status: '1',
             name: this.$t('initiatingProcess')
@@ -116,6 +138,7 @@
             name: this.$t('missionAccomplished')
           }
         ],
+        regulatoryCertificationTaskPlanList: [],
         columns: [
           {
             title: this.$t('Operator'),
@@ -168,6 +191,7 @@
       }
     },
     mounted() {
+      console.log(this.queryProject)
       this.getList()
     },
     methods: {
@@ -180,6 +204,11 @@
           if (res.success) {
             this.dataSource = res.result || []
             if (this.dataSource.length > 0) {
+              if (this.queryProject.flowType == 4) {
+                this.regulatoryCertificationTaskPlanList = this.verifyList
+              } else {
+                this.regulatoryCertificationTaskPlanList = this.designList
+              }
               let taskData = this.dataSource[this.dataSource.length - 1]
               if (this.queryProject.TaskKey == 'fqlc') {
                 this.regulatoryCertificationTaskPlanList.forEach(val => {
@@ -211,6 +240,8 @@
                     val.status = '1'
                   } else if (val.name == this.$t('designComplianceReview')) {
                     val.status = '2'
+                  } else if (val.name == this.$t('verificationComplianceReview')) {
+                    val.status = '2'
                   } else {
                     val.status = '3'
                   }
@@ -227,6 +258,10 @@
                       val.status = '1'
                     } else if (val.name == this.$t('designComplianceReviewAdmin')) {
                       val.status = '1'
+                    } else if (val.name == this.$t('verificationComplianceReview')) {
+                      val.status = '1'
+                    } else if (val.name == this.$t('verificationComplianceExamine')) {
+                      val.status = '1'
                     } else {
                       val.status = '1'
                     }
@@ -239,8 +274,12 @@
                       val.status = '1'
                     } else if (val.name == this.$t('designComplianceReview')) {
                       val.status = '1'
+                    } else if (val.name == this.$t('verificationComplianceReview')) {
+                      val.status = '1'
                     } else if (val.name == this.$t('designComplianceReviewAdmin')) {
                       val.status = '2'
+                    } else if (val.name == this.$t('verificationComplianceExamine')) {
+                      val.status = '2'
                     } else {
                       val.status = '3'
                     }