Merge remote-tracking branch 'origin/feature_dev_20221010_extend' into dev_2nd_period_test

jero-web/src/components/ImportFileOnlyList/index.vue

@@ -54,6 +54,10 @@ export default {
       type: String,
       default: ''
     },
+    paramsManifestId: {
+      type: String,
+      default: ''
+    },
     projectLibraryId: {
       type: String,
       default: ''
@@ -76,6 +80,8 @@ export default {
         return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&paramsTemplateId=' + this.paramsTemplateId
       } else if (this.projectLibraryId) {
         return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&projectLibraryId=' + this.projectLibraryId
+      } else if (this.paramsManifestId) {
+        return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&paramsManifestId=' + this.paramsManifestId
       }
       return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut
     }

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

@@ -5,8 +5,12 @@
         <a-row :gutter="24">
           <a-col :md="6" :sm="10">
             <a-form-item :label="$t('Collectlist')">
-              <a-select  v-model="queryParam.ctype" @change="getonChange" :getPopupContainer="triggerNode => triggerNode.parentNode" :popper-append-to-body="false">
+              <a-select  v-model="queryParam.ctype"  @change="getonChange" style='width: 183px' :getPopupContainer="triggerNode => triggerNode.parentNode" :popper-append-to-body="false">
-                <a-select-option v-for="d in options" :key="d.value" :value="d.value" >{{ d.label }}</a-select-option>
+                <a-select-option v-for="d in options" :key="d.value" :value="d.value" >
+                  <span style="display: inline-block;width: 80%" :title=" d.label">
+                           {{ d.label }}
+                     </span>
+                </a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
@@ -366,6 +370,12 @@
         box-sizing: border-box;
       }
     }
+    .box-input {
+      display: inline-block;
+      width: calc(70% - 100px);
+      height: 38px;
+      margin-top: 2px;
+    }
 
     .box-content-right {
       width: calc(50% - 12px);

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"'>
@@ -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/ImportFileOnlyList/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),
@@ -903,6 +917,39 @@
           this.textLoading = false
         })
       },
+      //填写人导出
+      handleExportDre(){
+        console.log(this.selectedRowKeys)
+        this.$message.success(this.$t('Intheexport'))
+        let long = localStorage.getItem('language')
+        this.cut = ''
+        if (long && long === 'zh-cn') {
+          this.cut = 'cn'
+        } else if (long && long === 'en-us') {
+          this.cut = 'en'
+        }
+        let query = {
+          paramsManifestId: this.paramsManifest.id,
+          cut: this.cut,
+          ids: this.selectedRowKeys.join(','),
+          exportName:this.$route.query.projectName + '(' + this.$route.query.title + ')'
+        }
+        getAction('/params/collectManifest/exportDre', query).then((res) => {
+          if (res && !res.success) {
+            this.$message.error(res.message)
+          }
+          this.textLoading = false
+        })
+      },
+      getList(){
+        this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
+      },
+      iVisible(val,num) {
+        this.importsVisible = val
+        if (num == 1){
+          eventBUs.$emit('searchGetData')
+        }
+      },
       // 高级搜索
       handleSuperQuery(params, matchType) {
         let sqp = {}