Merge branch 'need_pool237'

src/views/report_manage/reportEn/reportEditor.vue

@@ -423,7 +423,7 @@ export default {
 				classifynameArr: [],
 				title: '',
 				abstract: '',
-				author: ['Investment Research Team'],
+				author: [],
 				frequency: '日度',
 				create_time: http.dateFormatter(new Date(), false),
 				content: '',
@@ -612,18 +612,17 @@ export default {
 				return JSON.parse(i).v||0
 			})
 			this.checkClassifyNameArr(2,classify)
-			// console.log(this.aeForm.classifynameArr,'this.aeForm.classifynameArr');
+
 			if (this.aeForm.add_type == 1) {
 				if (this.aeForm.classifynameArr.length == 3) {
 					this.aeForm.title = JSON.parse(this.aeForm.classifynameArr[2]).l;
 				}else{
           this.aeForm.title = ''
         }
-				return false;
 			}
-			if (this.aeForm.classifynameArr.length == 0) {
-				return false;
-			} 
+
+			if (!this.aeForm.classifynameArr.length) return
+
 			let params = {
 				ClassifyIdFirst: JSON.parse(this.aeForm.classifynameArr[1]).v,
 			};
@@ -641,29 +640,36 @@ export default {
 						this.$message.error(this.$t('ReportManage.ReportList.no_reports_msg'));
 						return false;
 					}
-					this.aeForm = {
-						add_type: 2,
-						classify_name: 1,
-						classifynameArr:[
-							JSON.stringify({
-								l: res.Data.ClassifyNameRoot,
-								v: parseInt(res.Data.ClassifyIdRoot),
-							}),
-							JSON.stringify({
-								l: res.Data.ClassifyNameFirst,
-								v: parseInt(res.Data.ClassifyIdFirst),
-							}),
-							JSON.stringify({
-								l: res.Data.ClassifyNameSecond,
-								v: parseInt(res.Data.ClassifyIdSecond),
-						})],
-						title: res.Data.Title,
-						abstract: res.Data.Abstract,
-						author: res.Data.Author ? res.Data.Author.split(',') : '',
-						frequency: res.Data.Frequency,
-						create_time: res.Data.CreateTime,
-						content: res.Data.Content,
-            			overview:res.Data.Overview||''
+
+					if(this.aeForm.add_type == 1) {
+						this.aeForm.author = res.Data.Author ? res.Data.Author.split(',') : ['']
+					}else {
+
+						this.aeForm = {
+							add_type: 2,
+							classify_name: 1,
+							classifynameArr:[
+								JSON.stringify({
+									l: res.Data.ClassifyNameRoot,
+									v: parseInt(res.Data.ClassifyIdRoot),
+								}),
+								JSON.stringify({
+									l: res.Data.ClassifyNameFirst,
+									v: parseInt(res.Data.ClassifyIdFirst),
+								}),
+								JSON.stringify({
+									l: res.Data.ClassifyNameSecond,
+									v: parseInt(res.Data.ClassifyIdSecond),
+							})],
+							title: res.Data.Title,
+							abstract: res.Data.Abstract,
+							author: res.Data.Author ? res.Data.Author.split(',') : '',
+							frequency: res.Data.Frequency,
+							create_time: res.Data.CreateTime,
+							content: res.Data.Content,
+							overview:res.Data.Overview||''
+						}
+
 					};
 				}
 			});

src/views/report_manage/reportV2/components/reportBaseInfoDia.vue

@@ -265,7 +265,7 @@ export default {
         relationVariety: [],
         title: "",
         abstract: "",
-        author: ["投研团队"],
+        author: [],
         frequency: "日度",
         time: this.$moment().format("YYYY-MM-DD") || "",
         cooperationType: 1,//协作方式
@@ -322,7 +322,7 @@ export default {
         relationVariety: [],
         title: "",
         abstract: "",
-        author: ["投研团队"],
+        author: [],
         frequency: "日度",
         time: this.$moment().format("YYYY-MM-DD") || "",
         cooperationType: 1,//协作方式
@@ -419,9 +419,8 @@ export default {
         if (this.formData.classify.length === 2) {
           this.formData.title = this.getSelectClassifyName()[1];
         }
-        return;
       }
-      if(!this.formData.classify.length&&this.formData.type===2) return
+      if(!this.formData.classify.length) return
 
       
       //获取上次报告
@@ -442,7 +441,13 @@ export default {
             return false;
           }
 
-          this.chooseInheritReport(res.Data.List[0])
+          if(this.formData.type===1) { //默认只带出作者
+            this.formData.author = res.Data.List
+              ? res.Data.List[0].Author.split(",")
+              : [''];
+          }else {
+            this.chooseInheritReport(res.Data.List[0])
+          }
         });
     },
 

src/views/report_manage/reportdtl.vue

@@ -2,7 +2,7 @@
 	<div id="reportdtl" v-if="isshow">
 		<header>{{reportInfo.Title}}</header>
 		<div style="padding:0 35px 0; box-sizing:border-box; color:#666; font-size:24px; overflow:hidden;">
-		  <span>{{$route.query.fromPage=='strategyReport'?'Horizon Insights FICC Team':reportInfo.Author}}</span>
+		  <span>{{reportInfo.Author}}</span>
 			<!-- 已发布、已通过展示发布时间 -->
 		  <span style="float:right;" v-if="[2,6].includes(reportInfo.State)">{{reportInfo.PublishTime}}</span>
 		</div>