fix something

src/lang/modules/ReportManagement/CategoryList.js

@@ -104,8 +104,8 @@ export const CategoryListEn = {
     section_settings: "Section Settings",
     add_section: "Add Section",
     edit_section: "Edit Section",
-    section_name: "Section Name",
-    section_name_hint: "Enter Section Name",
+    section_name: "Section Type",
+    section_name_hint: "Enter Section Type",
     parent_category: "Parent Category",
     parent_none: "none",
     related_variety: "Related Variety",
@@ -225,8 +225,8 @@ export const CategoryListZh = {
     section_settings: "章节设置",
     add_section: "添加章节",
     edit_section: "编辑章节",
-    section_name: "章节名称",
-    section_name_hint: "请输入章节名称",
+    section_name: "章节类型",
+    section_name_hint: "请输入章节类型",
     parent_category: "上级分类",
     parent_none:'无',
     related_variety: "关联品种",

src/lang/modules/ReportManagement/ReportList.js

@@ -166,7 +166,9 @@ export const ReportListEn = {
   canvas_set:'Canvas Settings',
   choose_layout_img:'Select Layout',
   variety_tip:`If a section is associated with a variety, then the reading permissions for the section are controlled by the permissions of the associated variety;<br>
-  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;`
+  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',
 };
 
 /* 中文 */
@@ -333,5 +335,7 @@ export const ReportListZh = {
   canvas_set:'画布设置',
   choose_layout_img:'选择版图',
   variety_tip:`若章节关联品种，则章节阅读权限受章节关联品种的权限控制；<br>
-  若章节不关联品种，则章节阅读权限受分类关联品种的权限控制；`
+  若章节不关联品种，则章节阅读权限受分类关联品种的权限控制；`,
+  chapter_has_submit:'已提交',
+  chapter_no_submit:'未提交',
 };

src/lang/modules/systemManage/ReportApprove.js

@@ -30,7 +30,7 @@ export const ReportApproveEn = {
     approval_type03:'Or Sign (Approval or rejection by any one approver is sufficient)',
     des01:'Multiple approvers review and approve in sequence; The node passes only when all approvers agree; Approve in order of selection',
     des02:'The node passes only when all approvers agree; There is no sequence in approval.',
-    des03:'If any approver agrees, the node wil pass; There is no sequence in approval.',
+    des03:'Approval by one reviewer is sufficient.',
     warning_msg01:'Please select at least one person',
     search_btn:'Search',
     has_selected:'has been selected',
@@ -65,7 +65,7 @@ export const ReportApproveZh = {
     approval_type03:'或签（一名审批人同意或拒绝即可）',
     des01:'多个审批人依次进行审批；只有当所有审批人同意，该节点才能通过；按选择顺序审批',
     des02:'所有审批人同意，该节点才能通过；审批无先后顺序',
-    des03:'任意一名审批人同意，该节点即通过；审批无先后顺序',
+    des03:'一名审批人同意即可',
     warning_msg01:'请至少选择一人',
     search_btn:'搜索',
     has_selected:'项',

src/views/Login.vue

@@ -608,7 +608,7 @@ export default {
                 case "rai_researcher":
                 case "ficc_researcher":
                 case "researcher":
-                    path = "/reportlist";
+                    path = "/reportNew";
                     break;
                 // case "compliance": //合规
                 //     path = "/contractapprovallist";

src/views/classify_manage/classifyEnlistV2.vue

@@ -305,6 +305,7 @@ export default {
 .classify-page{
     .content-box{
         .el-tree-node__content{
+            height: fit-content;
             padding-top: 10px;
             padding-bottom: 10px;
             border-bottom: 1px solid #C8CDD9;

src/views/classify_manage/classifylistV2.vue

@@ -439,6 +439,7 @@ export default {
 .classify-page{
     .content-box{
         .el-tree-node__content{
+            height: fit-content;
             padding-top: 10px;
             padding-bottom: 10px;
             border-bottom: 1px solid #C8CDD9;

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

@@ -121,7 +121,7 @@
                 :style="{color:item.PublishState===2&&'#67C23A'}" 
                 v-if="item.CanEdit"
               >
-                {{item.PublishState===2 ? $t('ReportManage.smart_published') : $t('ReportManage.smart_unpublished') }}
+                {{item.PublishState===2 ? $t('ReportManage.ReportList.chapter_has_submit') : $t('ReportManage.ReportList.chapter_no_submit') }}
                 <el-popover
                     placement="top"
                     trigger="click"
@@ -184,7 +184,7 @@
 
     <!-- 添加章节弹窗 -->
     <m-dialog
-      title="添加章节" 
+      :title="chapterInfo.id?'编辑章节':'添加章节'" 
       :show.sync="isOpenChapterDia" 
       width="650px"
       @close="isOpenChapterDia=false"
@@ -373,6 +373,9 @@ export default {
     isCreator() {
       let roleId = Number(localStorage.getItem('AdminId'))
       return roleId === this.reportBase.AdminId;
+    },
+    RoleId() {
+      return Number(localStorage.getItem('AdminId'))
     }
   },
   data() {
@@ -422,7 +425,7 @@ export default {
     }
   },
   mounted(){
-    this.getChapterList();
+    this.getChapterList(true);
     this.getReportBaseInfo();
     this.getChapterTrendTagList()
   },
@@ -508,6 +511,7 @@ export default {
         this.selectChapterId = item.ReportChapterId;
       }else {
         this.selectChapterId = item.ReportChapterId;
+        this.editChapterId = 0;
       }
 
       this.$emit('change',{ selectChapterId: this.selectChapterId,editChapterId:this.editChapterId })
@@ -688,7 +692,7 @@ export default {
     },
 
     /* 获取章节列表 */
-    async getChapterList() {
+    async getChapterList(isInit=false) {
       if(!this.$route.query.id) return 
 
       const res = await dayWeekChapterList({
@@ -697,6 +701,16 @@ export default {
       if(res.Ret !== 200) return 
 
       this.chapterList = res.Data || []
+
+      isInit && this.selectDefaultChapter()
+    },
+
+
+    selectDefaultChapter() {
+      let firstChapter = this.chapterList.find(_ => _.CanEdit || !IsAuth)
+      if(firstChapter) {
+        this.chooseChapter(firstChapter)
+      }
     },
 
 

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

@@ -5,6 +5,7 @@
     width="650px"
     :visible.sync="isShow"
     :modal-append-to-body="false"
+    :close-on-click-modal="false"
     :append-to-body="false"
     @close="closeDia"
   >
@@ -119,13 +120,13 @@ export default {
           }
       )
       
-      // this.$nextTick(()=>{
-      //     const keys = this.users.map(i=>{
-      //         return i.NodeId
-      //     })
-      //     this.$refs["trans-tree"].setCheckedKeys(keys)
-      //     this.choosedList = _.cloneDeep(this.users)
-      // })
+      this.$nextTick(()=>{
+          const keys = this.users.map(i=>{
+              return i.NodeId
+          })
+          this.$refs["trans-tree"].setCheckedKeys(keys)
+          this.choosedList = _.cloneDeep(this.users)
+      })
     },
 
     filterNode(value,data) {

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

@@ -38,6 +38,7 @@
           <el-cascader
             ref="cascader"
             :options="classifyArr"
+            :disabled="id"
             v-model="formData.classify"
             :props="{
               value: 'Id',

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

@@ -1,6 +1,6 @@
 <template>
   <div class="top-action-wrap">
-      <div class="title">{{reportInfo&&reportInfo.Title}}</div>
+      <div class="title text_oneLine">{{reportInfo&&reportInfo.Title}}</div>
       <ul class="action-list">
           <li 
             class="action-item" 

src/views/report_manage/reportV2/list.vue

@@ -543,9 +543,9 @@ export default {
 
     reportTypes(){
       return [
-        { label: /* '公共研报' */this.$t('ReportManage.ReportList.tab_public'),key:'1' },
-        { label: /* '共享研报' */this.$t('ReportManage.ReportList.tab_share'),key:'2' },
         { label: /* '我的研报' */this.$t('ReportManage.ReportList.tab_mine'),key:'3' },
+        { label: /* '共享研报' */this.$t('ReportManage.ReportList.tab_share'),key:'2' },
+        { label: /* '公共研报' */this.$t('ReportManage.ReportList.tab_public'),key:'1' },
       ]
     }
   },
@@ -801,8 +801,8 @@ export default {
     },
 
     //唤醒上传弹窗
-    openupload(id) {
-      this.uploadForm = { id: id, formdata: null, audioname: "" };
+    openupload({Id}) {
+      this.uploadForm = { id: Id, formdata: null, audioname: "" };
       this.uploadDialog = true;
     },
     clickinput() {
@@ -1144,7 +1144,7 @@ export default {
         }else if(but.label==='音频下载'){
           return commonFilterPass &&
               [this.$t('ReportManage.smart_btn.morning_paper'), this.$t('ReportManage.smart_btn.weekly')].includes(row.ClassifyNameFirst)&&
-              row.ChapterVideoList.length > 0                    
+              row.ChapterVideoList.length > 0                 
         }else if(but.label==='下载Pdf'){
           return commonFilterPass && row.DetailPdfUrl    
         }else if(but.label==='下载长图'){

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

@@ -223,7 +223,9 @@ export default {
 
 		/* 获取章节报告详情 */
 		async getChapterDetail() {
-			
+			if(!this.selectChapterId) return
+			console.log(111111,this.selectChapterId)
+
 			const res = await chapterDetail({
 				ReportChapterId: this.selectChapterId
 			})
@@ -285,7 +287,7 @@ export default {
 				this.$refs.chapterContRef.handleMarkOver(this.reportInfo.ReportChapterId)
         setTimeout(() => {
 					this.timer && clearInterval(this.timer);
-          this.$router.go(-1);
+          this.$router.replace({ path: '/reportNew' });
         }, 1000);
       }
 		},

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

@@ -432,6 +432,8 @@ export default {
 
 		/* 获取章节报告详情 */
 		async getChapterDetail() {
+            if(!this.selectChapterId) return
+
 			const res = await chapterDetail({
 				ReportChapterId: this.selectChapterId
 			})
@@ -481,7 +483,7 @@ export default {
                 query:{
                     id:this.$route.query.id,
                     chapterId: this.reportInfo.ReportChapterId,
-                    type:'preview'
+                    type:'previewChapter'
                 }
             });
 			window.open(href, '_blank');
@@ -499,7 +501,7 @@ export default {
                 this.$refs.chapterContRef.handleMarkOver(this.reportInfo.ReportChapterId)
                 setTimeout(() => {
                     this.timer && clearInterval(this.timer);
-                    this.$router.go(-1);
+                    this.$router.replace({ path: '/reportNew' });
                 }, 1000);
             }
 		},

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

@@ -3,7 +3,7 @@
         <div class="main-box" :style="{backgroundColor:bgColor}">
 
             <!-- 版头 -->
-            <div class="html-head-img-box" v-if="reportInfo && !!reportInfo.NeedSplice && reportInfo.HeadImg">
+            <div class="html-head-img-box" v-if="reportInfo && !!reportInfo.NeedSplice && reportInfo.HeadImg&&$route.query.type!=='previewChapter'">
                 <img :src="reportInfo.HeadImg" alt="" style="display:block;width:100%">
                 <div class="head-layout-item" v-for="item in headImgStyle" :key="item.value"
                 :style="{fontFamily:item.family,fontSize:(item.size*2)+'px',fontWeight:item.weight,textAlign:item.align,color:item.color,
@@ -14,15 +14,15 @@
             </div>
 
             <!-- 无版头版尾 -->
-            <div class="no-layout-img-box" v-if="reportInfo && !!reportInfo.NeedSplice && (!reportInfo.HeadImg) && (!reportInfo.EndImg)">
+            <div class="no-layout-img-box" v-if="(reportInfo && !!reportInfo.NeedSplice && (!reportInfo.HeadImg) && (!reportInfo.EndImg))||$route.query.type==='previewChapter'">
                 <header>{{reportInfo.Title}}</header>
                 <div style=" box-sizing:border-box; color:#666; font-size:24px; overflow:hidden;">
                     <span>{{ reportInfo.Author}}</span>
-                    <span style="float:right;">{{reportInfo.CreateTime}}</span>
+                    <span style="float:right;" v-if="[2,6].includes(reportInfo.State)">{{reportInfo.PublishTime}}</span>
                 </div>
             </div>
 
-            <div class="abstract" v-if="reportInfo && !!reportInfo.NeedSplice">
+            <div class="abstract" v-if="reportInfo && !!reportInfo.NeedSplice&&reportInfo.Abstract">
                 <div>摘要： <span v-html="reportInfo.Abstract"></span></div> 
             </div>
 
@@ -45,7 +45,7 @@
             </template>
 
             <!-- 板尾 -->
-            <div class="html-end-img-box" v-if="reportInfo && !!reportInfo.NeedSplice && reportInfo.EndImg">
+            <div class="html-end-img-box" v-if="reportInfo && !!reportInfo.NeedSplice && reportInfo.EndImg&&$route.query.type!=='previewChapter'">
                 <img :src="reportInfo.EndImg" alt="" style="display:block;width:100%">
                 <div class="head-layout-item" v-for="item in endImgStyle" :key="item.value"
                 :style="{fontFamily:item.family,fontSize:(item.size*2)+'px',fontWeight:item.weight,textAlign:item.align,color:item.color,
@@ -131,7 +131,7 @@ export default {
             this.reportInfo = nval;
             this.layoutBaseInfo['研报标题']=this.reportInfo.Title
             this.layoutBaseInfo['研报作者']=this.reportInfo.Author
-            this.layoutBaseInfo['创建时间']=this.reportInfo.CreateTime
+            this.layoutBaseInfo['创建时间']=[2,6].includes(this.reportInfo.State)?this.reportInfo.PublishTime:''
             this.content=this.reportInfo.Content
         }
     },
@@ -160,7 +160,7 @@ export default {
             this.reportInfo = this.info;
             this.layoutBaseInfo['研报标题']=this.reportInfo.Title
             this.layoutBaseInfo['研报作者']=this.reportInfo.Author
-            this.layoutBaseInfo['创建时间']=this.reportInfo.CreateTime
+            this.layoutBaseInfo['创建时间']=[2,6].includes(this.reportInfo.State)?this.reportInfo.PublishTime:''
             this.content=this.reportInfo.Content
             return 
         }
@@ -188,10 +188,10 @@ export default {
                     })
                     this.layoutBaseInfo['研报标题']=this.reportInfo.Title
                     this.layoutBaseInfo['研报作者']=this.reportInfo.Author
-                    this.layoutBaseInfo['创建时间']=this.reportInfo.CreateTime
-                    if(this.$route.query.type==='preview'){
+                    this.layoutBaseInfo['创建时间']=[2,6].includes(this.reportInfo.State)?this.reportInfo.PublishTime:''
+                    if(['preview','previewChapter'].includes(this.$route.query.type)){
                        this.content=sessionStorage.getItem('smartReportContent')||res.Data.Content
-                       this.bgColor=sessionStorage.getItem('smartReportContentBg')||res.Data.CanvasColor
+                       this.bgColor=this.$route.query.type==='preview'?(sessionStorage.getItem('smartReportContentBg')||res.Data.CanvasColor):''
                     }else{
                         this.content=res.Data.Content
                         this.bgColor=res.Data.CanvasColor