Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue

@@ -94,7 +94,8 @@
         //url传参严格按照当前命名
         url: {
           deleteBatch: '/report/lawsMonthlyReportWriteEO/deleteBatch',
-          list:'/report/lawsMonthlyReportWriteEO/page',
+          list: '/report/lawsMonthlyReportWriteEO/page',
+          exportData: '/report/lawsMonthlyReportWriteEO/exportMonthlyReport'
         },
         loading: false,
         dataSource: [],
@@ -161,7 +162,7 @@
     methods: {
       dateChange(item) {
         this.queryParam[item.db_field_name] = this.queryParam[item.db_field_name] ? moment(this.queryParam[item.db_field_name]).format('YYYY-MM') : ''
-        this.queryParam = {...this.queryParam}
+        this.queryParam = { ...this.queryParam }
       },
       searchQuery() {
         this.pageNo = 1
@@ -170,7 +171,7 @@
       searchReset() {
         this.queryParam = {}
         this.queryParam.month = moment(new Date()).format('YYYY-MM')
-        this.queryParam = {...this.queryParam}
+        this.queryParam = { ...this.queryParam }
         this.pageNo = 1
         this.getList()
       },
@@ -219,7 +220,15 @@
         this.$refs.fillTableRef.getData()
       },
       monthlyIntegrationAndExportClick() {
-
+        let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
+        let query = {
+          ids: selectedRowKeys.join(','),
+          ...this.queryParam
+        }
+        downloadFile(this.url.exportData, this.$t('monthlyReportRegulations') + '.zip', query, this.Deselect)
+      },
+      Deselect() {
+        this.selectedRowKeys = []
       },
       addContentClick() {
         this.$refs.fillAddRef.add()
@@ -323,6 +332,7 @@
     height: 38px;
     /*margin-top: 2px;*/
   }
+
   .text-operation {
     margin-right: 8px;
   }