From 0f0e089123be0a2546aa32e993550f899d8158f6 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Fri, 8 Sep 2023 17:30:03 +0800
Subject: [PATCH] =?UTF-8?q?=20=E6=9C=AA=E7=AC=A6=E5=90=88=20=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/nonConformance.vue             | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue
index fb0e264f4..70b02c278 100644
--- a/jero-web/src/views/projectManagement/components/nonConformance.vue
+++ b/jero-web/src/views/projectManagement/components/nonConformance.vue
@@ -508,11 +508,10 @@ export default {
     designFlowStatusClick(row, name) {
       let query = {}
       let TaskKey = ''
-      let flowTypeName = ''
-      if (row.prcType == '2') {
+      if (row.flowType == '2') {
         if (row.flowStatus == 'Task to be confirmed' || row.flowStatus == 'Duty Person Rejected') {
           TaskKey = 'zrrqr'
-        } else if (row.flowStatus == 'Results to be submitted' || row.flowStatus == 'Non-Compliance' || row.flowStatus == 'To be tracked') {
+        } else if (row.flowStatus == 'Results to be submitted' || row.flowStatus == 'Non-Compliance' ||row.flowStatus == 'To be tracked') {
           TaskKey = 'zrrtjjfw'
         } else if (row.flowStatus == 'Results to be reviewed' ||
           row.flowStatus == 'Compliance' ||
@@ -520,12 +519,12 @@ export default {
           TaskKey = 'fggcssh'
         }
         query = {
-          actiProcInstId: row.prcId,
-          projectTaskInventoryId: row.projectLawsInventoryId,
-          projectLibraryId:row.projectLibraryId,
+          actiProcInstId: row.actiProcInstId,
+          projectTaskInventoryId: row.id,
+          projectLibraryId: this.$route.query.id,
           TaskKey: TaskKey,
           isDisplay: false,
-          flowType: row.prcType,
+          flowType: row.flowType,
           Sponsor: 'regulationOwnerName',
           personLiable: 'designDutyIdName',
           typeOfDeliverables: 'designDeliverableTypeName',
@@ -533,11 +532,10 @@ export default {
           DueDate: 'designDueDate',
           remarks: 'designRemark',
         }
-        flowTypeName = this.$t('designComplianceProcess')
-      } else if(row.prcType == '4'){
+      } else if(row.flowType == '4'){
         if (row.flowStatus == 'Task to be confirmed' || row.flowStatus == 'Duty Person Rejected') {
           TaskKey = 'zrrqr'
-        } else if (row.flowStatus == 'Results to be submitted' || row.flowStatus == 'Non-Compliance' || row.flowStatus == 'To be tracked') {
+        } else if (row.flowStatus == 'Results to be submitted' || row.flowStatus == 'Non-Compliance' ||row.flowStatus == 'To be tracked') {
           TaskKey = 'zrrtjjfw'
         } else if (row.flowStatus == 'Results to be reviewed' ||
           row.flowStatus == 'Compliance' ||
@@ -545,11 +543,11 @@ export default {
           TaskKey = 'fggcssh'
         }
         query = {
-          actiProcInstId: row.prcId,
-          projectTaskInventoryId: row.projectLawsInventoryId,
-          projectLibraryId: row.projectLibraryId,
+          actiProcInstId: row.actiProcInstId,
+          projectTaskInventoryId: row.id,
+          projectLibraryId: this.$route.query.id,
           TaskKey: TaskKey,
-          flowType: row.prcType,
+          flowType: row.flowType,
           isDisplay: false,
           Sponsor: 'regulationOwnerName',
           personLiable: 'verifyDutyIdName',
@@ -558,9 +556,8 @@ export default {
           DueDate: 'verifyDueDate',
           remarks: 'verifyRemark',
         }
-        flowTypeName = this.$t('validationComplianceProcess')
       }
-      this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), flowTypeName)
+      this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), row.flowTypeName)
     },
     standardClick(val) {
       let num = val.prcType