Merge branch 'need_pool229' into debug

src/views/report/reportDetailPdf.vue

@@ -25,7 +25,7 @@
         "
       >
         <span>{{ reportInfo.Author }}</span>
-        <span style="float: right" v-if="[2,6].includes(reportInfo.State)">{{ reportInfo.PublishTime }}</span>
+        <span style="float: right">{{ reportInfo.PublishTime||reportInfo.PrePublishTime }}</span>
       </div>
 
       <div id="playcon" v-if="reportInfo.VideoUrl">

src/views/reportEn/detailPdf.vue

@@ -25,7 +25,7 @@
         "
       >
         <span>{{ reportInfo.Author }}</span>
-        <span style="float: right" v-if="[2,6].includes(reportInfo.State)">{{ reportInfo.PublishTime }}</span>
+        <span style="float: right">{{ reportInfo.PublishTime || reportInfo.PrePublishTime }}</span>
       </div>
 
       <div id="abstract">

src/views/smartReport/detailPdf.vue

@@ -97,7 +97,7 @@ export default {
       this.layoutBaseInfo['研报标题']=this.reportInfo.Title
       this.layoutBaseInfo['研报作者']=this.reportInfo.Author
       // 已发布已通过的报告才显示发布时间
-      this.layoutBaseInfo['创建时间']=[2,6].includes(this.reportInfo.State)?this.reportInfo.PublishTime:''
+      this.layoutBaseInfo['创建时间']=(this.reportInfo.PublishTime||this.reportInfo.PrePublishTime)
       this.reportInfo.Content=this.setReportContent(this.reportInfo.Content)
       this.isshow = true;
       this.$nextTick(()=>{