需求变动一些

src/lang/commonLang.js

@@ -192,6 +192,10 @@ export default {
       en: "Entry Successful",
       zh: "录入成功",
     },
+    submit_msg: {
+      en: "Submit Successful",
+      zh: "提交成功",
+    },
     delete_info_msg: {
       en: "Are you sure you want to permanently delete this file?",
       zh: "删除后不可恢复，是否确认删除？",

src/lang/modules/ReportManagement/ReportList.js

@@ -87,7 +87,7 @@ export const ReportListEn = {
   img_uplaod_title: "Image Upload",
   click_img_upload: "Click to Upload Image",
   select_img_card: "Select Image",
-  img_name_ipt: "Please input image name",
+  img_name_ipt: "Please input layout name",
   select_img_type: "Please select an image type",
   page_header_op: "Page Header",
   page_trailer_op: "Page Trailer",
@@ -169,6 +169,7 @@ export const ReportListEn = {
   If a section is not associated with any variety, then the reading permissions for the section are controlled by the permissions of the category-associated varieties;`,
   chapter_has_submit:'Submitted',
   chapter_no_submit:'Not Submitted',
+  choose_msg: 'Choose'
 };
 
 /* 中文 */
@@ -257,7 +258,7 @@ export const ReportListZh = {
   img_uplaod_title: "图片上传",
   click_img_upload: "点击上传图片",
   select_img_card: "选择图片",
-  img_name_ipt: "请输入图片名称",
+  img_name_ipt: "请输入版图名称",
   select_img_type: "请选择图片类型",
   page_header_op: "版头",
   page_trailer_op: "版尾",
@@ -328,7 +329,7 @@ export const ReportListZh = {
   report_empty_msg:'请输入报告内容',
   img_set_btn: '版图设置',
   no_chapter_msg:'暂无章节信息',
-  chapter_nosubmit_msg:'{name}章节内容未提交',
+  chapter_nosubmit_msg:'{name}内容未提交',
 
   choose_head_img:'选择版头',
   choose_end_img:'选择版尾',
@@ -338,4 +339,5 @@ export const ReportListZh = {
   若章节不关联品种，则章节阅读权限受分类关联品种的权限控制；`,
   chapter_has_submit:'已提交',
   chapter_no_submit:'未提交',
+  choose_msg: '选择'
 };

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

@@ -38,7 +38,7 @@
                 class="action-item" 
                 :class="{'disabled':puiblishLoading}"
                 @click="handlePublishReport('dsfb')"
-                v-if="permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_publish)&&isCreator"
+                v-if="permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_publish)"
                 >
                   <el-tooltip
                     effect="dark" 
@@ -52,7 +52,7 @@
                 class="action-item" 
                 :class="{'disabled':puiblishLoading}"
                 @click="handlePublishReport('fb')"
-                v-if="permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_publish)&&isCreator"
+                v-if="permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_publish)"
             >
                 <el-tooltip
                   effect="dark" 
@@ -68,7 +68,7 @@
                 class="action-item" 
                 :class="{'disabled':puiblishLoading}"
                 @click="handlePublishReport('submit')"
-                v-if="permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_publish)&&isCreator"
+                v-if="permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_publish)"
             >
               <el-tooltip
                 effect="dark" 
@@ -726,6 +726,8 @@ export default {
       if(res.Ret!==200) return
       this.reportBase = res.Data;
 
+      if(res.Data.PrePublishTime) this.$parent.taskTime = res.Data.PrePublishTime;
+
       if(type!=='notCheck') {
         let classify = [res.Data.ClassifyIdFirst,res.Data.ClassifyIdSecond,res.Data.ClassifyIdThird]
         this.$emit('checkClassifyNameArr',classify)

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

@@ -87,7 +87,8 @@ export default {
   },
   methods:{
     closeDia() {
-      this.choosedList = []
+      this.choosedList = [];
+      this.searchText = '';
       this.$emit('update:isShow',false)
     },
 

src/views/report_manage/reportV2/list.vue

@@ -61,22 +61,19 @@
                           <el-option :label="$t('ReportManage.smart_approved')" :value="6"></el-option>
                         </el-select>
                   </div>
-
-                  <div class="select-item">
-                      <el-select
-                          v-model="searchform.timeType"
-                          :placeholder="$t('ReportManage.smart_select_time_type_btn')"
-                          size="medium"
-                          style="width:100%;"
-                          @change="filterChange"
-                      >
-                          <el-option :label="$t('ReportManage.smart_publish_time')" value="publish_time"></el-option>
-                          <el-option :label="$t('ReportManage.smart_approval_time')" value="approve_time"></el-option>
-                          <el-option :label="$t('ReportManage.smart_update_time')" value="modify_time"></el-option>
-                      </el-select>
-                  </div>
                 
                   <div class="select-item">
+                    <el-select
+                        v-model="searchform.timeType"
+                        :placeholder="$t('ReportManage.smart_select_time_type_btn')"
+                        size="medium"
+                        style="width:150px;"
+                        @change="filterChange"
+                    >
+                        <el-option :label="$t('ReportManage.smart_publish_time')" value="publish_time"></el-option>
+                        <el-option :label="$t('ReportManage.smart_approval_time')" value="approve_time"></el-option>
+                        <el-option :label="$t('ReportManage.smart_update_time')" value="modify_time"></el-option>
+                    </el-select>
                     <el-date-picker
                       @change="filterChange"
                       v-model="searchform.dateValue"

src/views/report_manage/reportV2/normalReport/components/ETAChart.vue

@@ -35,6 +35,7 @@ export default {
     methods: {
         activeTypeChange(e){
             if(this.activeType===e) return
+            this.keyword = ''
             this.activeType=e
         },
 

src/views/report_manage/reportV2/normalReport/editReport.vue

@@ -283,7 +283,7 @@ export default {
         ReportChapterId: this.reportInfo.ReportChapterId
       });
       if (res.Ret === 200) {
-        this.$message.success(this.$t('MsgPrompt.publish_msg'))
+        this.$message.success(this.$t('MsgPrompt.submit_msg'))
 				
 				this.$refs.chapterContRef&&this.$refs.chapterContRef.getChapterList()
 

src/views/report_manage/reportV2/smartReport/components/ImgSource.vue

@@ -2,7 +2,10 @@
     <div class="statistic-analysis-wrap">
         <div class="top-box">
             <div class="left-card">
-                <span>{{$t('ReportManage.ReportList.select_img_card')}}</span>
+                <span v-if="defaultType">
+                    {{ defaultType===1 ? $t('ReportManage.ReportList.choose_head_img') : $t('ReportManage.ReportList.choose_end_img') }}
+                </span>
+                <span v-else>{{$t('ReportManage.ReportList.select_img_card')}}</span>
             </div>
             <div class="right">
                 <el-input
@@ -13,20 +16,13 @@
                     style="width:240px"
                     size="medium"
 				/>
-                <el-select :placeholder="$t('ReportManage.ReportList.select_img_type')" v-model="type" style="width:240px" @change="handleSearch" size="medium" :disabled="defaultType">
+                <el-select :placeholder="$t('ReportManage.ReportList.select_img_type')" v-model="type" style="width:240px" @change="handleSearch" size="medium" :disabled="defaultType" v-show="!defaultType">
                     <el-option :label="$t('ReportManage.ReportList.page_header_op')" :value="1"></el-option>
                     <el-option :label="$t('ReportManage.ReportList.page_trailer_op')" :value="2"></el-option>
                 </el-select>
             </div>
         </div>
         <div class="main-box" :style="inDialog?'height:550px;':'height: calc(100vh - 180px)'">
-            <!-- <div class="type-select-box">
-                <span style="margin-right:20px">版面设置</span>
-                <el-radio-group v-model="setType">
-                    <el-radio :label="1">版头</el-radio>
-                    <el-radio :label="2">版尾</el-radio>
-                </el-radio-group>
-            </div> -->
             <div style="flex:1;overflow-y: auto;padding:20px 0">
             <tableNoData :text="$t('Table.prompt_slogan')" size="mini" v-if="list.length===0&&finished"/>
             <div class="list-wrap" v-infinite-scroll="handleLoadMore" :infinite-scroll-immediate="false">

src/views/report_manage/reportV2/smartReport/editReport.vue

@@ -445,10 +445,6 @@ export default {
 			this.reportInfo = res.Data;
 
             this.conList=res.Data.ContentStruct?JSON.parse(res.Data.ContentStruct):[]
-
-            this.layoutBaseInfo['研报标题']=res.Data.Title
-            this.layoutBaseInfo['研报作者']=res.Data.Author
-            this.layoutBaseInfo['创建时间']=res.Data.CreateTime
 			
 			$('.edit-smart-report-page')[0].scrollTop = 0;
 			if(this.editChapterId) {
@@ -499,7 +495,7 @@ export default {
                 ReportChapterId: this.reportInfo.ReportChapterId
             });
             if (res.Ret === 200) {
-                this.$message.success(this.$t('MsgPrompt.publish_msg'))
+                this.$message.success(this.$t('MsgPrompt.submit_msg'))
 
                 this.$refs.chapterContRef&&this.$refs.chapterContRef.getChapterList()
 
@@ -772,6 +768,7 @@ export default {
                                     compType:obj.compType,
                                     id:obj.id,
                                     content:obj.content,
+                                    titleText: obj.compId===4?obj.titleText:'',
                                     style:obj.compType==='chart'?'height:350px':'',
                                     child:[]
                                 },
@@ -780,6 +777,7 @@ export default {
                                     compType:compData.compType,
                                     content:compData.content||'',
                                     id:this.getCompId(compData.compType),
+                                    titleText: compData.compId===4?compData.title:'',
                                     style:compData.compType==='chart'?'height:350px':'',
                                     child:[]
                                 }
@@ -803,6 +801,7 @@ export default {
                                         compType:obj.compType,
                                         id:obj.id,
                                         content:obj.content,
+                                        titleText: obj.compId===4?obj.titleText:'',
                                         style:obj.compType==='chart'?'height:350px':'',
                                         child:[]
                                     },
@@ -821,6 +820,7 @@ export default {
                             compType:compData.compType,
                             content:compData.content||'',
                             id:this.getCompId(compData.compType),
+                            titleText: compData.compId===4?compData.title:'',
                             style:compData.compType==='chart'?'height:350px':'',
                             child:[]
                         })
@@ -973,7 +973,7 @@ export default {
                         this.reportInfo.Title=params.Title
                         this.layoutBaseInfo['研报标题']=params.Title
                         this.layoutBaseInfo['研报作者']=params.Author
-                        this.layoutBaseInfo['创建时间']=params.CreateTime
+                        // this.layoutBaseInfo['创建时间']=params.PublishTime
                         this.reportInfo.ClassifyIdFirst=params.ClassifyIdFirst;
                         this.reportInfo.ClassifyIdSecond=params.ClassifyIdSecond;
                         this.reportInfo.ClassifyIdThird=params.ClassifyIdThird;
@@ -1011,6 +1011,10 @@ export default {
             }).then(res=>{
                 if(res.Ret===200){
                     this.reportInfo=res.Data
+
+                    if(res.Data.PrePublishTime){
+                        this.taskTime=res.Data.PrePublishTime
+                    }
                     
                     this.conList=res.Data.ContentStruct?JSON.parse(res.Data.ContentStruct):[]
                     this.headImg=res.Data.HeadImg
@@ -1029,7 +1033,7 @@ export default {
                     this.bgColor=res.Data.CanvasColor
                     this.layoutBaseInfo['研报标题']=res.Data.Title
                     this.layoutBaseInfo['研报作者']=res.Data.Author
-                    this.layoutBaseInfo['创建时间']=res.Data.CreateTime
+                    // this.layoutBaseInfo['创建时间']=res.Data.PublishTime
                     this.$nextTick(()=>{
                         this.contentChange=false
                     })
@@ -1094,7 +1098,7 @@ export default {
                 if(!res.Data.RefreshResult) return this.$message.warning(/* '表格正在刷新中，请勿重复操作' */this.$t('ReportManage.ReportList.chart_refreshed_msg'))
                 const { Ret,Msg } = await sheetInterface.refreshSheet({
                     ExcelCodes: sheet_code_arr,
-                    Source: fromPage,
+                    Source: 'report',
                     PrimaryId: Number(this.$route.query.id),
                     SubId: this.reportInfo.ReportChapterId
                 })
@@ -1302,10 +1306,11 @@ export default {
         },
         generatePdfLinks(){
             const baseUrl= localStorage.getItem('dynamicOutLinks') ? JSON.parse(localStorage.getItem('dynamicOutLinks')).ReportViewUrl : '';
+            let waterMarkStr= localStorage.getItem('waterMarkStr') || '';
 
             let code = this.reportCoopType===2?this.$refs.chapterContRef&&this.$refs.chapterContRef.reportBase.ReportCode:this.reportInfo.ReportCode
 
-            return `${baseUrl}/reportshare_smart_pdf?code=${code}`
+            return `${baseUrl}/reportshare_smart_pdf?code=${code}&flag=${waterMarkStr}`
         },
         //报告消息推送
         reportSendMsg(){

src/views/report_manage/reportV2/smartReport/reportDetail.vue

@@ -372,8 +372,7 @@ div{
     }
 
     .chapter-item{
-        margin-bottom: 20px;
-        padding-bottom: 20px;
+        padding: 20px 0;
         border-bottom: 1px dashed #ccc;
         .type{
             font-size: 15px;