智能研报审批流，研报审批流

src/views/report_manage/addreportNew.vue

@@ -66,7 +66,7 @@
 					>
 				</template>
 				<template v-if="isApprove">
-					<el-button type="primary" size="medium" @click="handleApprove">提交</el-button>
+					<el-button type="primary" size="medium" @click="clickreportadd('fb')">提交</el-button>
 				</template>
 			</div>
 			<div
@@ -614,7 +614,7 @@ export default {
 			if (tp == 'fb') {
 				this.isPublishloading = true;
 			}
-			const isPost = this.permissionBtn.checkPermissionBtn(this.permissionBtn.reportManageBtn.reportManage_sendMsg)
+			const isPost = this.permissionBtn.checkPermissionBtn(this.permissionBtn.reportManageBtn.reportManage_sendMsg)&&(!this.isApprove)
 			// 如果已经添加过就修改 否则新增
 			if (this.isAddEnter) {
 				let params2 = {

src/views/report_manage/editreportNew.vue

@@ -66,7 +66,7 @@
 					>
 				</template>
 				<template v-if="isApprove">
-					<el-button type="primary" size="medium" @click="handleApprove">提交</el-button>
+					<el-button type="primary" size="medium" @click="clickreportadd('fb')">提交</el-button>
 				</template>
 			</div>
 			<div
@@ -638,7 +638,7 @@ export default {
 				window.open(href, '_blank');
 				return false;
 			}
-			const isPost = this.permissionBtn.checkPermissionBtn(this.permissionBtn.reportManageBtn.reportManage_sendMsg)
+			const isPost = this.permissionBtn.checkPermissionBtn(this.permissionBtn.reportManageBtn.reportManage_sendMsg)&&(!this.isApprove)
 			if (tp == 'fb') {
 				this.isPublishloading = true;
 				// 判断是否要推送客群

src/views/report_manage/mixins/messagePush.js

@@ -30,6 +30,10 @@ export default {
             });
             window.open(href, "_blank");
           } else if (tp == "fb") {
+            if(this.isApprove){
+                await this.publishreport(res.Data.ReportId);
+                return 
+            }
             if (this.isMessagePost) {
               await this.publishreport(res.Data.ReportId);
               await reportMessageSend({
@@ -58,6 +62,10 @@ export default {
             });
             window.open(href, "_blank");
           } else if (tp == "fb") {
+            if(this.isApprove){
+                await this.publishreport(res.Data.ReportId);
+                return 
+            }
             if (this.isMessagePost) {
               await this.publishreport(res.Data.ReportId);
               await reportMessageSend({
@@ -111,14 +119,5 @@ export default {
       }
 
     },1000),
-    /* 审批流-发布确认 */
-    handleApprove(){
-        this.$confirm("是否确认提交?","提示",{
-            confirmButtonText:"确定",
-            cancelButtonText:"取消"
-        }).then(()=>{
-            //提交
-        })
-    }
   },
 };

src/views/report_manage/reportlist.vue

@@ -442,6 +442,7 @@
                     <!--未提交-->
                     <template v-if="scope.row.State===1">
                         <span v-permission="permissionBtn.reportManageBtn.reportManage_publish"
+                            @click="publishreport(scope.row)"
                             class="editsty">提交</span>
                         <span v-permission="permissionBtn.reportManageBtn.reportManage_reportEdit" class="editsty"
                             @click="editreport(scope.row, 'edit')" v-if="scope.row.CanEdit">编辑</span>
@@ -454,6 +455,7 @@
                     <template v-if="[2,4].includes(scope.row.State)">
                         <span
                             v-if="permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_cancelPublish)"
+                            @click="canclepublish(scope.row)"
                             class="editsty">撤销</span>
                         <span
                             v-if="scope.row.MsgIsSend == 0 && permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_sendMsg)"
@@ -466,6 +468,7 @@
                     <!--已驳回则只显示撤销按钮-->
                     <template v-if="scope.row.State===3">
                         <span v-permission="permissionBtn.reportManageBtn.reportManage_publish"
+                            @click="canclepublish(scope.row)"
                             class="editsty">撤销</span>
                     </template>
                     <!--音频上传/下载 按原先逻辑-->
@@ -1094,6 +1097,10 @@ export default {
         // this.handlePublic(1)
         return;
       }
+      if(this.isApprove){
+        this.handlePublic(1)
+        return
+      }
       const isPost = this.permissionBtn.checkPermissionBtn(this.permissionBtn.reportManageBtn.reportManage_sendMsg)
       if(isPost){
           this.showPublish = true;

src/views/smartReport/editReport.vue

@@ -31,7 +31,7 @@
                     </li>
                 </template>
                 <template v-if="isApprove">
-                    <li class="action-item">
+                    <li class="action-item" @click="handlePublishOpt('fb')">
                         <img src="~@/assets/img/smartReport/icon01.png" alt="">
                         <span>提交</span>
                     </li>
@@ -845,6 +845,10 @@ export default {
                 return
             }
             // 发布
+            if(this.isApprove){
+                this.reportPublish({sendMsg:false})
+                return
+            }
             if(this.reportInfo.MsgIsSend==1){//该报告已经推送过模板消息
                 this.reportPublish({sendMsg:false})
             }else{

src/views/smartReport/reportList.vue

@@ -317,7 +317,7 @@
                             <!-- 未提交 -->
                             <template v-if="scope.row.State == 1">
                                 <span v-permission="permissionBtn.smartReportManageBtn.reportManage_publish"
-                                    class="editsty"
+                                    class="editsty" @click="handlePublishReportOpt(scope.row)"
                                     v-if="scope.row.CanEdit">提交</span>
                                 <span v-permission="permissionBtn.smartReportManageBtn.reportManage_reportEdit"
                                     class="editsty" @click="editreport(scope.row, 'edit')"
@@ -333,12 +333,14 @@
                             <template v-if="[2,4].includes(scope.row.State)">
                                 <span
                                     v-if="permissionBtn.checkPermissionBtn(permissionBtn.smartReportManageBtn.reportManage_cancelPublish)"
+                                    @click="handleReportPublishCancel(scope.row)"
                                     style="color: red; cursor: pointer">撤销
                                 </span>
                             </template>
                              <!--已驳回则只显示撤销按钮-->
                             <template v-if="scope.row.State===3">
                                 <span v-permission="permissionBtn.smartReportManageBtn.reportManage_publish"
+                                @click="handleReportPublishCancel(scope.row)"
                                     class="editsty">撤销</span>
                             </template>
                             <!--音频上传/下载 按原先逻辑-->
@@ -571,6 +573,10 @@ export default {
             this.activeReportId=item.SmartReportId
             // this.isDSFB=item.PrePublishTime?true:false
             // this.showPublish=true
+            if(this.isApprove){
+                this.handleConfirmPublishReport()
+                return
+            }
             this.$confirm(
                 item.PrePublishTime?'该报告已设置定时发布，是否立即发布报告？':'是否立即发布报告？', 
                 '发布提示',