From 859b6676aea85f36aef152ee042d20f567fe9028 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 12 May 2022 11:09:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/nonConformance.vue             | 20 +++++++++++++++++--
 .../projectNonConformance/index.vue           | 12 +++++------
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue
index 9e2435171..fb2985fb8 100644
--- a/jero-web/src/views/projectManagement/components/nonConformance.vue
+++ b/jero-web/src/views/projectManagement/components/nonConformance.vue
@@ -39,6 +39,12 @@
       </span>
       </a-row>
     </div>
+    <div class="table-operator">
+      <div @click="handleExport" class="operator-text">
+        <a-icon type="export" :rotate="-90"/>
+        {{ $t('export') }}
+      </div>
+    </div>
     <div>
       <a-table
         ref="table"
@@ -116,7 +122,8 @@
         pageSize: 10,
         pageNo: 1,
         url: {
-          page: '/project/ncrTrackController/queryPageInfo'
+          page: '/project/ncrTrackController/queryPageInfo',
+          exportData: '/project/ncrTrackController/exportData'
         }
       }
     },
@@ -142,11 +149,20 @@
         this.pageSize = pageSize
         this.getList()
       },
+      handleExport() {
+        let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+        let query = {
+          ...this.queryParam,
+          ids: selectedRowKeys.join(','),
+          projectLibraryId: this.$route.query.id
+        }
+        downloadFile(this.url.exportData, this.$t('NonConformance') + '.xls', query, this.Deselect)
+      },
       getList() {
         let query = {
           pageNo: this.pageNo,
           pageSize: this.pageSize,
-          projectLibraryId:this.$route.query.id,
+          projectLibraryId: this.$route.query.id,
           ...this.queryParam
         }
         this.loading = true
diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
index 2c6e8bce4..040d5edac 100644
--- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue
+++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
@@ -203,18 +203,18 @@
             dataIndex: 'title',
             ellipsis: true
           },
-          {
-            title: this.$t('areaOfResponsibility'),
-            align: 'center',
-            dataIndex: 'dutyTerritory_dictText',
-            ellipsis: true
-          },
           {
             title: this.$t('ProcessType'),
             align: 'center',
             dataIndex: 'flowType',
             ellipsis: true
           },
+          {
+            title: this.$t('areaOfResponsibility'),
+            align: 'center',
+            dataIndex: 'dutyTerritory_dictText',
+            ellipsis: true
+          },
           {
             title: this.$t('RelatedItems'),
             align: 'center',