fix bug

src/views/approve_manage/approveDetail.vue

@@ -58,8 +58,8 @@
 </template>
 
 <script>
-import ReportDetail from '@/views/smartReport/reportDetail.vue';
-import Reportdtl from '@/views/report_manage/reportdtl.vue'
+import ReportDetail from '@/views/report_manage/reportV2/smartReport/reportDetail.vue';
+import Reportdtl from '@/views/report_manage/reportV2/normalReport/reportdtl.vue'
 import TimeLine from './components/timeLine.vue';
 import RejectDialog from './components/rejectDialog.vue';
 import {approveInterence} from '@/api/modules/approve.js';
@@ -116,8 +116,8 @@ export default {
                     title:Report.ReportTitle||'',
                     classify:Report.ReportClassify||'',
                     approver:Approve.ApplyUserName||'',
-                    componentName:Report.ReportType===3?'ReportDetail':'Reportdtl',
-                    type:Report.ReportType
+                    componentName:Report.ReportLayout===2?'ReportDetail':'Reportdtl',
+                    type:Report.ReportLayout===2?3:Report.ReportType
                 }
                 this.formType = type||'detail'
                 this.approveInfo.state=Approve.State

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

@@ -565,6 +565,7 @@ export default {
       this.$message.success(res.Msg)
       this.isOpenChapterDia = false;
       this.getChapterList();
+      this.$emit('update',{ Title: this.chapterInfo.chapterName })
     },
 
     /* 删除章节 */

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

@@ -107,7 +107,7 @@ export default {
   },
   methods:{
     async handleUpdateTitle() {
-      await reportV2Interface.saveChapterTitle({
+      let res = await reportV2Interface.saveChapterTitle({
         ReportChapterId: this.reportInfo.ReportChapterId,
         Title: this.reportInfo.Title
       })

src/views/report_manage/reportV2/list.vue

@@ -1042,6 +1042,7 @@ export default {
         if (res.Ret === 200) {
           this.$message.success(this.$t('ReportManage.smart_msg.push_success'));
           item.MsgIsSend = 1;
+          item.MsgSendTime = res.Data.MsgSendTime;
         }
       });
     },

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

@@ -13,6 +13,7 @@
 				@openBaseInfo="showReportBaseInfo=true"
 				@handlePreviewReport="handlePreviewReport"
 				@handlePublish="handlePublishReport"
+				@update="({Title}) => { reportInfo.Title=Title }"
 			/>
 
 			<span
@@ -225,7 +226,6 @@ export default {
 		/* 获取章节报告详情 */
 		async getChapterDetail() {
 			if(!this.selectChapterId) return
-			console.log(111111,this.selectChapterId)
 
 			const res = await chapterDetail({
 				ReportChapterId: this.selectChapterId
@@ -284,12 +284,14 @@ export default {
       });
       if (res.Ret === 200) {
         this.$message.success(this.$t('MsgPrompt.publish_msg'))
+				
+				this.$refs.chapterContRef&&this.$refs.chapterContRef.getChapterList()
 
-				this.$refs.chapterContRef.handleMarkOver(this.reportInfo.ReportChapterId)
-        setTimeout(() => {
-					this.timer && clearInterval(this.timer);
-          this.$router.replace({ path: '/reportNew' });
-        }, 1000);
+				// this.$refs.chapterContRef.handleMarkOver(this.reportInfo.ReportChapterId)
+        // setTimeout(() => {
+				// 	this.timer && clearInterval(this.timer);
+        //   this.$router.replace({ path: '/reportNew' });
+        // }, 1000);
       }
 		},
 

src/views/report_manage/reportV2/normalReport/mixins/reportMixin.js

@@ -338,7 +338,7 @@ export default {
 				const t=new Date().getTime()
 				item.domId=item.UniqueCode+t //避免多次添加同一图表 id相同
 				htmlStr=htmlStr+`<p style='text-align:left; margin-top:10px;'>
-							<iframe id='${item.domId}' src='${LINK_CHART_URL}?code=${item.UniqueCode}' width='100%' height='350' style='border-width:0px; min-height:350px;'></iframe>
+							<iframe id='${item.domId}' src='${LINK_CHART_URL}?code=${item.UniqueCode}&lang=${this.currentLang}' width='100%' height='350' style='border-width:0px; min-height:350px;'></iframe>
 						</p>`
 			})
 			this.$nextTick(()=>{

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

@@ -12,6 +12,7 @@
 				@openBaseInfo="showReportBaseInfo=true"
 				@handlePreviewReport="handlePreviewReport"
                 @handlePublish="handlePublishOpt"
+                @update="({Title}) => { reportInfo.Title=Title }"
 			/>
 
 			<span
@@ -499,11 +500,13 @@ export default {
             if (res.Ret === 200) {
                 this.$message.success(this.$t('MsgPrompt.publish_msg'))
 
-                this.$refs.chapterContRef.handleMarkOver(this.reportInfo.ReportChapterId)
-                setTimeout(() => {
-                    this.timer && clearInterval(this.timer);
-                    this.$router.replace({ path: '/reportNew' });
-                }, 1000);
+                this.$refs.chapterContRef&&this.$refs.chapterContRef.getChapterList()
+
+                // this.$refs.chapterContRef.handleMarkOver(this.reportInfo.ReportChapterId)
+                // setTimeout(() => {
+                //     this.timer && clearInterval(this.timer);
+                //     this.$router.replace({ path: '/reportNew' });
+                // }, 1000);
             }
 		},
 
@@ -651,7 +654,7 @@ export default {
                     resArr={
                         compId:3,
                         compType:'chart',
-                        content:`${LINK_CHART_URL}?code=${temarr[0].UniqueCode}`,
+                        content:`${LINK_CHART_URL}?code=${temarr[0].UniqueCode}&lang=${this.currentLang}`,
                         id:this.getCompId(`chart${temarr[0].UniqueCode}_`),
                         style:'height:350px',
                         child:[]
@@ -1366,6 +1369,11 @@ export default {
                     icon:require('@/assets/img/smartReport/icon09.png')
                 }
             ]
+      },
+
+      //语言版本
+      currentLang() {
+        return this.$store.state.lang
       }
     },
     created() {