Merge branch 'gn_fix' into debug

index.html

@@ -50,7 +50,7 @@
 	<script>
 		window.addEventListener('error',(e)=>{
 			if(e.message=="Uncaught SyntaxError: Unexpected token '<'"){
-				window.alert('系统更新中,请稍后刷新重试!')
+				window.alert('系统登录异常，请强刷后重试!')
 				setTimeout(() => {
 					window.location.reload(true)
 				}, 1000);

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

@@ -351,7 +351,12 @@ export default {
         let str = res.Data.map(_ =>_.Title).join('，')
         return this.$message.warning(this.$t('ReportManage.ReportList.chapter_nosubmit_msg',{name: str}))
       } 
-
+      
+      tp === 'submit' && await this.$confirm('是否确认提交报告进入审批流程？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
       this.$emit('handlePublish',tp)
     },
 

src/views/report_manage/reportV2/list.vue

@@ -412,52 +412,6 @@
         </div>
       </div>
     </el-dialog>
-
-
-    <!-- 批量发布弹窗 -->
-    <el-dialog
-      :title="$t('ReportManage.smart_release_prompt_btn')"
-      :visible.sync="showPublish"
-      :modal-append-to-body="false"
-      :close-on-click-modal="false"
-      :center="true"
-      v-dialogDrag
-      custom-class="dialogclass"
-      width="510px"
-      @close="handleClosePublish"
-    >
-      <div>
-        <div style="height: 100px; padding-top: 40px">
-          <i
-            class="el-icon-warning"
-            style="font-size: 24px; color: #e6a23c; vertical-align: middle"
-          ></i>
-          {{isDSFB?$t('ReportManage.smart_template_msg'):$t('ReportManage.smart_push_template_btn')}}
-        </div>
-        <div style="margin-bottom: 20px; text-align: center">
-          <el-button
-            type="primary"
-            plain
-            style="width: 100px"
-            @click="handleClosePublish"
-            >{{$t('Dialog.cancel_btn')}}</el-button
-          >
-          <el-button
-            type="primary"
-            style="width: 100px; margin: 0 20px"
-            @click="handlePublic(1)"
-            >{{$t('ReportManage.smart_btn.only_publish')}}</el-button
-          >
-          <el-button
-            type="primary"
-            style="width: 100px"
-            :disabled="!canPushMsg"
-            @click="handlePublic(2)"
-            >{{$t('ReportManage.smart_btn.publish_push')}}</el-button
-          >
-        </div>
-      </div>
-    </el-dialog>
     
   </div>
 </template>
@@ -584,8 +538,8 @@ export default {
       allButtons:[
         {label:"发布",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_publish'),States:[1],text:'ReportManage.smart_btn.publish'},
         {label:"提交",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_publish'),States:[3],text:'ReportManage.smart_btn.submission'},
-        {label:"编辑",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_reportEdit'),States:[1,3],text:'Table.edit_btn'},
-        {label:"编辑中",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_reportEdit'),States:[1,3],text:'ReportManage.smart_btn.editing',},
+        {label:"编辑",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_reportEdit'),States:[1,3,5],text:'Table.edit_btn'},
+        {label:"编辑中",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_reportEdit'),States:[1,3,5],text:'ReportManage.smart_btn.editing',},
         {label:"删除",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_reportDel'),States:[1,3],text:'Table.delete_btn'},
         {label:"取消发布",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_cancelPublish'),States:[2],text:'ReportManage.smart_btn.withdraw'},
         {label:"撤销",permission:this.permissionBtn.isShowBtn('reportManageBtn','reportManage_cancelPublish'),States:[4,5,6],text:'ReportManage.smart_btn.withdraw'},
@@ -887,7 +841,7 @@ export default {
     },
 
     //发布报告
-    async publishreport(item) {
+    async publishreport(item,type) {
       this.batches = [];
       this.batches.push(item.Id);
       this.publishReportCode = item.ReportCode
@@ -896,7 +850,11 @@ export default {
       let baseUrl= localStorage.getItem('dynamicOutLinks') ? JSON.parse(localStorage.getItem('dynamicOutLinks')).ReportViewUrl : '';
 			this.linkPdfUrl = item.ReportLayout===1 ? `${baseUrl}/reportshare_pdf` : `${baseUrl}/reportshare_smart_pdf`;
 
-      
+      type === '提交' && await this.$confirm('是否确认提交报告进入审批流程？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
       this.handlePublic(1)
       
     },
@@ -1000,7 +958,7 @@ export default {
       switch (type) {
         case '发布':
         case '提交':
-          this.publishreport(data)
+          this.publishreport(data,type)
           break;
         // case '提交':
         //   this.handleSubmitReport(data)