From 9d93a6e83d9a5e69b773e80d8746d9f41b88c115 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Fri, 13 May 2022 16:20:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E5=8F=91=E5=B7=A5?=
 =?UTF-8?q?=E7=A8=8B=E5=B8=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processForm/taskListProcess/index.vue     |  2 +-
 .../components/nonConformance.vue             | 53 +++++++++++++++++--
 .../projectNonConformance/index.vue           | 51 +++++++++++++++++-
 3 files changed, 100 insertions(+), 6 deletions(-)

diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
index 6508b8c0f..5deabac2a 100644
--- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue
@@ -270,7 +270,7 @@
             this.edit()
             this.$router.push({
               path: '/ProjectDetails',
-              query: this.$route.query.primaryKeyId
+              query: this.$route.query
             })
           } else {
             this.loading = false
diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue
index 540f23467..d049141bb 100644
--- a/jero-web/src/views/projectManagement/components/nonConformance.vue
+++ b/jero-web/src/views/projectManagement/components/nonConformance.vue
@@ -57,6 +57,9 @@
         :data-source="dataSource"
         :columns="columns"
       >
+           <span slot="standard" slot-scope="text,result">
+              <a @click="standardClick(result)">{{text}}</a>
+        </span>
       </a-table>
     </div>
     <div class="page" v-if="dataSource.length > 0">
@@ -83,17 +86,19 @@
         queryParam: {},
         loading: false,
         dataSource: [],
-        selectedRowKeys:[],
+        selectedRowKeys: [],
         columns: [
           {
             title: this.$t('standard'),
             align: 'center',
-            dataIndex: 'serialNumber'
+            dataIndex: 'serialNumber',
+            scopedSlots: { customRender: 'standard' }
           },
           {
             title: this.$t('title'),
             align: 'center',
-            dataIndex: 'title'
+            dataIndex: 'title',
+            scopedSlots: { customRender: 'standard' }
           },
           {
             title: this.$t('ProcessType'),
@@ -194,6 +199,48 @@
             this.loading = false
           }
         })
+      },
+      standardClick(val) {
+        let num = val.prcType
+        let query = {
+          taskIds: val.taskId,
+          projectTaskInventoryId: val.projectLawsInventoryId,
+          projectLibraryId: val.projectLibraryId,
+          projectName: val.projectName,
+          id: val.projectLibraryId,
+          serialNumber: val.serialNumber,
+          actiProcInstId: val.prcId,
+          primaryKeyId: val.projectTaskInventoryDetailId,
+          TaskKey: val.status == 'NotDone' ? val.taskDefinitionKey : 'hhhhh'
+        }
+        switch (num) {
+          case '2':
+            query.flowType = 2
+            query.Sponsor = 'designInitiatorName'
+            query.personLiable = 'designDutyName'
+            query.typeOfDeliverables = 'designDeliverableType_dictText'
+            query.deliverableTemplate = 'designDeliverableTemplate'
+            break
+          case '3':
+            query.flowType = 3
+            query.Sponsor = 'prehomoInitiatorName'
+            query.personLiable = 'prehomoDutyName'
+            query.typeOfDeliverables = 'prehomoDeliverableType_dictText'
+            query.deliverableTemplate = 'prehomoDeliverableTemplate'
+            break
+          case '4':
+            query.flowType = 4
+            query.Sponsor = 'verifyInitiatorName'
+            query.personLiable = 'verifyDutyName'
+            query.typeOfDeliverables = 'verifyDeliverableType_dictText'
+            query.deliverableTemplate = 'verifyDeliverableTemplate'
+            break
+        }
+        let newUrl = this.$router.resolve({
+          path: '/taskListProcess',
+          query: query
+        })
+        window.open(newUrl.href, '_blank')
       }
     }
   }
diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
index a98310442..fb2302804 100644
--- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue
+++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
@@ -157,6 +157,9 @@
         :data-source="dataSource"
         :columns="columns"
       >
+        <span slot="standard" slot-scope="text,result">
+              <a @click="standardClick(result)">{{text}}</a>
+        </span>
       </a-table>
     </div>
     <div class="page" v-if="dataSource.length > 0">
@@ -195,13 +198,15 @@
             title: this.$t('standard'),
             align: 'center',
             dataIndex: 'serialNumber',
-            ellipsis: true
+            ellipsis: true,
+            scopedSlots: { customRender: 'standard' }
           },
           {
             title: this.$t('title'),
             align: 'center',
             dataIndex: 'title',
-            ellipsis: true
+            ellipsis: true,
+            scopedSlots: { customRender: 'standard' }
           },
           {
             title: this.$t('ProcessType'),
@@ -330,6 +335,48 @@
       PersonnelSelectionChange(value, id) {
         this.queryParam[value] = id
         this.queryParam = { ...this.queryParam }
+      },
+      standardClick(val) {
+        let num = val.prcType
+        let query = {
+          taskIds: val.taskId,
+          projectTaskInventoryId: val.projectLawsInventoryId,
+          projectLibraryId: val.projectLibraryId,
+          projectName: val.projectName,
+          id: val.projectLibraryId,
+          serialNumber: val.serialNumber,
+          actiProcInstId: val.prcId,
+          primaryKeyId: val.projectTaskInventoryDetailId,
+          TaskKey: val.status == 'NotDone' ? val.taskDefinitionKey : 'hhhhh'
+        }
+        switch (num) {
+          case '2':
+            query.flowType = 2
+            query.Sponsor = 'designInitiatorName'
+            query.personLiable = 'designDutyName'
+            query.typeOfDeliverables = 'designDeliverableType_dictText'
+            query.deliverableTemplate = 'designDeliverableTemplate'
+            break
+          case '3':
+            query.flowType = 3
+            query.Sponsor = 'prehomoInitiatorName'
+            query.personLiable = 'prehomoDutyName'
+            query.typeOfDeliverables = 'prehomoDeliverableType_dictText'
+            query.deliverableTemplate = 'prehomoDeliverableTemplate'
+            break
+          case '4':
+            query.flowType = 4
+            query.Sponsor = 'verifyInitiatorName'
+            query.personLiable = 'verifyDutyName'
+            query.typeOfDeliverables = 'verifyDeliverableType_dictText'
+            query.deliverableTemplate = 'verifyDeliverableTemplate'
+            break
+        }
+        let newUrl = this.$router.resolve({
+          path: '/taskListProcess',
+          query: query
+        })
+        window.open(newUrl.href, '_blank')
       }
     }
   }