Merge branch 'dev_2nd_period_test' into 'feature_dev_20221008_TODO'

# Conflicts:
#   jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java
#   jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml

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

@@ -210,6 +210,16 @@
               <a-icon type="delete"/>
               {{$t('sendBack')}}
             </div>
+            <!--      导入-->
+            <div class="operator-text" v-if='currentPersonRole == "dre"'>
+              <ImportFileOnlyList :url="url" :isTrue="false" :accept="'.zip'" :paramsManifestId='this.$route.query.id' @getList='getList'/>
+            </div>
+            <!--      填写人导出-->
+            <div @click="handleExportDre" class="operator-text"
+                 v-if='currentPersonRole == "dre"'>
+              <a-icon type="export"/>
+              {{$t('export')}}
+            </div>
             <!--      强制撤回-->
             <div @click="compulsoryWithdrawaljurisdiction" class="operator-text"
                  v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'>
@@ -443,7 +453,7 @@
 
 <script>
   import TableCollection from '@/components/tableCollection/index'
-  import { getAction, postAction } from '../../../api/manage'
+  import { getAction, postAction, downloadFile } from '../../../api/manage'
   import eventBUs from '../../../common/event'
   import ParameterLibraryAdd from '@/components/ParameterLibraryAdd/index'
   import globalAdvancedQuery from '@/components/globalAdvancedQuery/index'
@@ -453,6 +463,7 @@
   import AdjustareaSofrespon from '@/components/AdjustareaSofrespon/index'
   import ReferenceParameter from '@/components/ReferenceParameter/index'
   import AssignedBy from '@/components/AssignedBy/index'
+  import ImportFileOnlyList from '@/components/ImportFileOnlyListtag/index'
   import axios from 'axios'
   import { ACCESS_TOKEN } from '@/store/mutation-types'
   import Vue from 'vue'
@@ -465,6 +476,7 @@
       ParameterLibraryAdd,
       AssignedBy,
       AdjustareaSofrespon,
+      ImportFileOnlyList,
       TaskCutOffTime,
       ReferenceParameter,
       SynchronousSubmissionLibrary,
@@ -603,6 +615,7 @@
           getLoginUserType: 'params/collectManifest/getLoginUserType', // 获取当前登陆人
           getquerySdtList: 'params/collectManifest/querySdtList', // 获取工程接口人的列表
           updateSdt: 'params/collectManifest/updateSdt', // 提交工程接口人
+          importZipUrl: 'params/collectManifest/importDre', // 导入
           deleteBatch: 'params/collectManifest/deleteBatch'
         },
         loading: false,
@@ -619,6 +632,7 @@
         rowId: '',
         version: 0,
         confirmLoading: false,
+        importsVisible: false,
         itemId: '',
         selectedRowKeysValue: [], // table列表所选得数据
         token: Vue.ls.get(ACCESS_TOKEN),
@@ -902,6 +916,36 @@
           this.textLoading = false
         })
       },
+      //填写人导出
+      handleExportDre(){
+        let long = localStorage.getItem('language')
+        this.cut = ''
+        if (long && long === 'zh-cn') {
+          this.cut = 'cn'
+        } else if (long && long === 'en-us') {
+          this.cut = 'en'
+        }
+        console.log(this.formInline)
+        let query = {
+          paramsManifestId: this.paramsManifest.id,
+          cut: this.cut,
+          ...this.formInline,
+          ...this.queryParamQuery,
+          ids: this.selectedRowKeys.join(','),
+          exportName:this.$route.query.projectName + '(' + this.$route.query.title + ')'
+        }
+        let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip'
+        downloadFile('/params/collectManifest/exportDre', name , query , this.selectClear)
+      },
+      getList(){
+        this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
+      },
+      iVisible(val,num) {
+        this.importsVisible = val
+        if (num == 1){
+          eventBUs.$emit('searchGetData')
+        }
+      },
       // 高级搜索
       handleSuperQuery(params, matchType) {
         let sqp = {}