zhuliu 11 months ago
parent
commit
3bb075f142

+ 5 - 1
src/views/components/import/conditionImport/search.vue

@@ -71,7 +71,7 @@ export default {
             countryList:[],
             DBType:"CN",
             selected:['US','DE','JP','GB','FR','KR','RU','CH','EP','WO'],
-            innerProjectId:this.innerProjectId1 || null,
+            innerProjectId: null,
             projectQuery:{
                 queryParams:{
                     current:1,
@@ -83,6 +83,10 @@ export default {
         }
     },
     mounted() {
+        if(this.innerProjectId1){
+            this.innerProjectId = Number(this.innerProjectId1)
+            this.DBType = 'inner'
+        }
         if(this.editData){
             if(this.editData.component){
                 this.isComponent = this.editData.component

+ 1 - 1
src/views/report/components/reportFile/reportFileTable.vue

@@ -383,7 +383,7 @@ export default {
         let router = this.$router.resolve({
           path: '/exportReport',
           query: {
-            templateId: data.templateId,
+            reportTemplateId: data.templateId,
             projectId: this.projectId,
             reportFileId:data.id,
             editModel:true