参数导出模板添加适用地区;法规清单导出 名称修改

jero-web/src/views/parameter/parameterexport/components/addModel.vue

@@ -81,6 +81,20 @@
                   </a-form-model-item>
                 </div>
               </a-col>
+              <a-col :span="12">
+                <div class="box-title-text">
+                  <div class="title-text">
+                    <span class="title-text-text"
+                          :title="$t('zoneOfApplication')">{{$t('zoneOfApplication')}}</span>
+                  </div>
+                  <a-form-model-item class="itemModel">
+                    <j-dict-select-tag class="box-input" v-model="formInline.region"
+                                       :placeholder="$t('PleaseSelect')+$t('zoneOfApplication')"
+                                       :type="'select'"
+                                       :triggerChange="false" :dictCode="'region'"/>
+                  </a-form-model-item>
+                </div>
+              </a-col>
             </a-row>
           </a-form-model>
         </a-form>

jero-web/src/views/parameter/parameterexport/index.vue

@@ -12,6 +12,17 @@
                      v-model="queryParam.templateName"></a-input>
           </div>
         </a-col>
+        <a-col :md="6" :sm="8">
+          <div class="box-title-text">
+            <div class="title-text" :title="$t('zoneOfApplication')">
+              <span>{{$t('zoneOfApplication')}}</span>
+            </div>
+            <j-dict-select-tag class="box-input" v-model="queryParam.region"
+                               :placeholder="$t('PleaseSelect')+$t('zoneOfApplication')"
+                               :type="'select'"
+                               :triggerChange="false" :dictCode="'region'"/>
+          </div>
+        </a-col>
         <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
                   <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
@@ -162,6 +173,13 @@ export default {
           width: 300,
           scopedSlots: { customRender: 'projectName' }
         },
+        {
+          title: this.$t('zoneOfApplication'),
+          align: 'center',
+          dataIndex: 'region_dictText',
+          ellipsis: true,
+          width: 200
+        },
         {
           title: this.$t('status'),
           align: 'center',

jero-web/src/views/projectManagement/components/listOfRegulations.vue

@@ -989,6 +989,7 @@
         detailedSuccessList: [],
         detailedWarningList: [],
         rowKeysSuccessList: [],
+        selectedRowKeysList: [],
         rowKeysWarningList: []
       }
     },
@@ -1121,7 +1122,8 @@
         } 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(',') })
+          let serialNumber = this.selectedRowKeysList[0].serialNumber
+          downloadFile(this.url.ExportReportUrl, this.$t('listOfRegulations') + this.$t('ExportReport') + '-' + serialNumber + '.docx', { id: selectedRowKeys.join(',') })
         }
       },
       handleExport() {
@@ -1140,9 +1142,10 @@
           ids: selectedRowKeys.join(','),
           ...this.queryParamQuery,
           roleCode: roleCodeIndex,
+          excelName:this.$route.query.projectName,
           projectLibraryId: this.$route.query.id
         }
-        downloadFile(this.url.exportData, this.$route.query.projectName + this.$t('listOfRegulations') + '.zip', query, this.Deselect)
+        downloadFile(this.url.exportData, this.$route.query.projectName + '.zip', query, this.Deselect)
       },
       //复制
       copyClick() {
@@ -1454,8 +1457,9 @@
           }
         })
       },
-      onSelectChange(value) {
+      onSelectChange(value,rows) {
         this.selectedRowKeys = value
+        this.selectedRowKeysList = rows
       },
       searchQuery() {
         this.selectedRowKeys = []