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

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

@@ -113,7 +113,8 @@
         if (this.idList && this.idList.length > 0) {
           id = this.idList.join(',')
         } else {
-          id = this.$route.query.id
+          id = this.$route.query.parentId ? this.$route.query.parentId : this.$route.query.id
+          // id = this.$route.query.id
         }
         getAction('project/projectLibraryBase/getProjectDetailsStatisticsCollectManifestLabel', {id:id}).then((res) => {
           if (res.success) {

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

@@ -463,7 +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 ImportFileOnlyList from '@/components/ImportFileOnlyListtag/index'
   import axios from 'axios'
   import { ACCESS_TOKEN } from '@/store/mutation-types'
   import Vue from 'vue'
@@ -684,12 +684,11 @@
       // }
     },
     mounted() {
-      console.log(this.$route.query)
+      this.GetgetLoginUserType()
+      console.log(this.currentPersonRole)
       if(this.$route.query.type == '1'){
         this.handleOkRoleSwitching()
       }
-      this.GetgetLoginUserType()
-      console.log(this.currentPersonRole)
       setTimeout(() => {
         if (this.currentPersonRole == 'dre') {
           this.handlePreservation()
@@ -724,7 +723,7 @@
       handleOkRoleSwitching() {
         if(this.$route.query.type == '1'){
           let query = {
-            userType:this.$route.query.userType,
+            userType:this.formInlineRoleSwitching.roleSwitchingCode ? this.formInlineRoleSwitching.roleSwitchingCode : this.$route.query.userType,
             paramsManifestId: this.$route.query.id,
             projectId: this.$route.query.projectId,
             userId: this.userInfo().id
@@ -732,10 +731,10 @@
           this.confirmLoadingRoleSwitching = true
           postAction('/params/userTypeLog/edit', query).then((res) => {
             if (res.success) {
-              this.currentPersonRole = this.$route.query.userType
+              this.currentPersonRole = this.formInlineRoleSwitching.roleSwitchingCode ? this.formInlineRoleSwitching.roleSwitchingCode : this.$route.query.userType
               this.visibleRoleSwitching = false
               this.confirmLoadingRoleSwitching = false
-              localStorage.setItem('currentPersonRole', JSON.stringify(this.$route.query.userType))
+              localStorage.setItem('currentPersonRole', JSON.stringify(this.formInlineRoleSwitching.roleSwitchingCode ? this.formInlineRoleSwitching.roleSwitchingCode : this.$route.query.userType))
               this.RoleType.forEach((item,index) => {
                 if(item.value == this.currentPersonRole){
                   this.rolename = item.label
@@ -935,7 +934,7 @@
           ids: this.selectedRowKeys.join(','),
           exportName:this.$route.query.projectName + '(' + this.$route.query.title + ')'
         }
-        let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.xlsx'
+        let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip'
         downloadFile('/params/collectManifest/exportDre', name , query , this.selectClear)
       },
       getList(){

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

@@ -189,8 +189,8 @@
     <TaskListModel @TaskListModelList="TaskListModelList" ref="TaskListModelRef"/>
     <taskBatSetting @taskBatSettingForm="taskBatSettingForm" ref="taskBatSettingRef"></taskBatSetting>
     <batchChangeModel @batchChangeModel="batchChangeModel" ref="batchChangeModelRef"/>
-    <batchModel @batchModel="batchModel" ref="batchModelRef"/>
     <cuibanModel @cibanModel="cibanModel" ref="cModelRef"/>
+    <batchModel @batchModel="batchModel" ref="batchModelRef"/>
     <!--    错误数据提示-->
     <a-modal
       :title="$t('operationFailed')"
@@ -222,8 +222,8 @@
   import batchChangeModel from './batchChangeModel'
   import batchModel from './batchModel'
   import TaskListModel from './TaskListModel'
-  import taskBatSetting from './taskBatSetting'
   import cuibanModel from './cuibanModel'
+  import taskBatSetting from './taskBatSetting'
   import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
   import { mapGetters } from 'vuex'
   import store from '@/store/'
@@ -618,6 +618,17 @@
         }
 
       },
+      // 催办
+      cuibanClick(){
+        if(this.selectionRowsArray.length <1){
+          this.$message.warning(this.$t('selectLeastOne'))
+        }else{
+          this.$refs.cModelRef.getData(this.selectionRowsArray)
+        }
+      },
+      cibanModel(){
+        this.getList()
+      },
       cancleoperationFailed(){
         this.visibleoperationFailed = false
       },