From 70ca617ca13af98a816bd3e571e0d973f994b3f4 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 24 May 2022 18:08:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=AF=BC=E5=87=BA=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A?=
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/listOfRegulations.vue          | 75 +++++++++++--------
 3 files changed, 47 insertions(+), 30 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index d7592614b..aed6f2ffe 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -889,4 +889,5 @@ module.exports = {
   Pending:'Pending',
   custom:'Custom',
   notSelected:'Not selected',
+  ExportReport:'Export Report',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index bdd8b7b3e..ea9be36ef 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -894,4 +894,5 @@ module.exports = {
   Pending:'待处理',
   custom:'自定义',
   notSelected:'未选择',
+  ExportReport:'导出报告',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 015f896d9..ac1624006 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -5,35 +5,35 @@
     </div>
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
-      <a-row :gutter="24">
-        <a-col :md="6" :sm="8">
-          <div class="box-title-text">
-            <div class="title-text" :title="$t('standard')">
-              <span>{{ $t('standard') }}</span>
+        <a-row :gutter="24">
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('standard')">
+                <span>{{ $t('standard') }}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+                       v-model="queryParam.serialNumber"></j-input>
             </div>
-            <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
-                     v-model="queryParam.serialNumber"></j-input>
-          </div>
-        </a-col>
-        <a-col :md="6" :sm="8">
-          <div class="box-title-text">
-            <div class="title-text" :title="$t('title')">
-              <span>{{ $t('title') }}</span>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" :title="$t('title')">
+                <span>{{ $t('title') }}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                       v-model="queryParam.title"></j-input>
             </div>
-            <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
-                     v-model="queryParam.title"></j-input>
-          </div>
-        </a-col>
-        <a-col :md="6" :sm="8">
-          <div class="box-title-text">
-            <div class="title-text" style="width: 44px" :title="$t('subtitle')">
-              <span>{{ $t('subtitle') }}</span>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <div class="box-title-text">
+              <div class="title-text" style="width: 44px" :title="$t('subtitle')">
+                <span>{{ $t('subtitle') }}</span>
+              </div>
+              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('subtitle')"
+                       v-model="queryParam.subtitle"></j-input>
             </div>
-            <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('subtitle')"
-                     v-model="queryParam.subtitle"></j-input>
-          </div>
-        </a-col>
-        <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+          </a-col>
+          <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
                    <globalAdvancedQuery ref="globalAdvancedQueryRef"
                                         @handleSuperQuery="handleSuperQuery"
@@ -43,7 +43,7 @@
                             @click="searchReset">{{ $t('reset') }}</a-button>
                </a-col>
             </span>
-      </a-row>
+        </a-row>
       </a-form>
     </div>
     <div class="table-operator" style="overflow:hidden;">
@@ -88,6 +88,10 @@
               <a-icon type="user"/>
               {{ $t('bringInRelevantPersonnel') }}
             </div>
+            <div class="operator-text-title" @click="ExportReportClick">
+              <a-icon type="user"/>
+              {{ $t('ExportReport') }}
+            </div>
           </template>
           <div class="operator-text" style="position: relative">
             <span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
@@ -653,7 +657,7 @@
         queryParam: {},
         url: {
           addModelList: '/project/projectLawsInventoryEO/queryPageDummy',
-          queryConditionInventory:'/project/projectLawsInventoryEO/queryConditionInventory',
+          queryConditionInventory: '/project/projectLawsInventoryEO/queryConditionInventory',
           list: '/project/projectLawsInventoryEO/list',
           addModel: 'project/projectLawsInventoryEO/add',
           editModel: '/project/projectLawsInventoryEO/edit',
@@ -667,7 +671,8 @@
           exportData: '/project/projectLawsInventoryEO/exportData',
           setBatch: '/project/projectLawsInventoryEO/setBatch',//批量设置
           copyUrl: '/project/projectLawsInventoryEO/copyInfoByIds',//复制
-          transferUrl: '/project/projectLawsInventoryEO/getPageInfoDummy'//调取
+          transferUrl: '/project/projectLawsInventoryEO/getPageInfoDummy',//调取
+          ExportReportUrl: '/project/projectLawsInventoryEO/downloadDocxReport'
         },
         downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
         loading: false,
@@ -735,6 +740,16 @@
       handleModule() {
         downloadFile(this.url.exportTemplate, this.$t('listOfRegulations') + this.$t('importTemplate') + '.xls', {})
       },
+      ExportReportClick() {
+        let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+        if (selectedRowKeys && selectedRowKeys.length == 0) {
+          this.$message.warning(this.$t('pleaseSelectData'))
+        } else if (selectedRowKeys.length > 1) {
+          this.$message.warning(this.$t('OnlyOneSelected'))
+        } else {
+          downloadFile(this.url.ExportReportUrl, this.$t('listOfRegulations') + this.$t('ExportReport') + '.docx', { id: selectedRowKeys.join(',') })
+        }
+      },
       handleExport() {
         let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
         let query = {
@@ -824,7 +839,7 @@
       changeInterface() {
         let _this = this
         this.$confirm({
-          width:760,
+          width: 760,
           content: _this.$t('NoteConfirmTheChange'),
           onOk() {
             let idList = JSON.parse(JSON.stringify(_this.selectedRowKeys))