From 801e6b19bbc0c3e5c0f9051789adce7035f3764d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Thu, 4 Jan 2024 09:56:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/listOfRegulations.vue            | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 6538bf28a..203a41419 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -1407,13 +1407,13 @@
           {
             type: 'deliverables',
             value: 'designDeliverableType',
-            text: this.$t('designaconformancedeliverabletype'),
+            text: this.$t('designaconformancedeliverabletype')
           },
           {
             type: 'deliverables',
             value: 'verifyDeliverableType',
-            text: this.$t('verifytheconformancedeliverabletype'),
-          },
+            text: this.$t('verifytheconformancedeliverabletype')
+          }
           // {
           //   type: 'Personnel',
           //   value: 'designDutyId',
@@ -1955,8 +1955,17 @@
       handleExport() {
         let roleCodeIndex = this.roleSwitchingCode
         let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
+        if (queryParam.dutyTerritory) {
+          queryParam.dutyTerritory = '*' + queryParam.dutyTerritory + '*'
+        }
         let query = {
-          ...this.queryParam,
+          ...queryParam,
           ids: selectedRowKeys.join(','),
           ...this.queryParamQuery,
           roleCode: roleCodeIndex,