增加了提交，撤回二次确认弹窗

src/views/report_manage/reportEn/reportEditor.vue

@@ -777,12 +777,18 @@ export default {
 			// }
 		},
 		submitReport(){
-			approveInterence.reportEnSubmit({
-				ReportId:Number(this.report_id)
-			}).then(res=>{
-				if(res.Ret!==200) return
-				this.$message.success("提交成功")
-				this.$router.push({ path: '/reportEnList' });
+			this.$confirm("是否确认提交该报告进入审批流程?","提示",{
+				confirmButtonText:'确定',
+				cancelButtonText:'取消',
+				type:'warning',
+			}).then(()=>{
+				approveInterence.reportEnSubmit({
+					ReportId:Number(this.report_id)
+				}).then(res=>{
+					if(res.Ret!==200) return
+					this.$message.success("提交成功")
+					this.$router.push({ path: '/reportEnList' });
+				})
 			})
 		},
 

src/views/report_manage/reportEn/reportlist.vue

@@ -677,13 +677,18 @@ export default {
     },
     /* 提交报告 */
     handleSubmitReport(row){
-        approveInterence.reportEnSubmit({
-            ReportId:Number(row.Id)
-        }).then(res=>{
-            if(res.Ret!==200) return 
-            this.$message.success("提交成功")
-            this.getTableData()
-
+        this.$confirm("是否确认提交该报告进入审批流程?","提示",{
+            confirmButtonText:'确定',
+            cancelButtonText:'取消',
+            type:'warning',
+        }).then(()=>{
+            approveInterence.reportEnSubmit({
+                ReportId:Number(row.Id)
+            }).then(res=>{
+                if(res.Ret!==200) return 
+                this.$message.success("提交成功")
+                this.getTableData()
+            })
         })
     },
     //撤销提交报告

src/views/report_manage/reportlist.vue

@@ -333,7 +333,7 @@
                 <template v-if="[2,6].includes(scope.row.State)">
                     <span v-if="scope.row.State===2&&permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_cancelPublish)"
                         @click="canclepublish(scope.row)" style="color: red; cursor: pointer">取消发布</span>
-                    <span v-if="scope.row.State===4&&permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_cancelPublish)"
+                    <span v-if="scope.row.State===6&&permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_cancelPublish)"
                         @click="cancelReport(scope.row)" style="color: red; cursor: pointer">撤销</span>
                     <span
                         v-if="scope.row.MsgIsSend == 0 && permissionBtn.checkPermissionBtn(permissionBtn.reportManageBtn.reportManage_sendMsg)"
@@ -1039,7 +1039,13 @@ export default {
                 }
             })
         }else{
-            this.submitReport("submit")
+            this.$confirm("是否确认提交该报告进入审批流程?","提示",{
+                confirmButtonText:'确定',
+                cancelButtonText:'取消',
+                type:'warning',
+            }).then(()=>{
+                this.submitReport("submit")
+            })
         }
     },
     submitReport(type){

src/views/smartReport/editReport.vue

@@ -915,12 +915,18 @@ export default {
         },
         //提交报告
         submitReport(){
-            approveInterence.reportSmartSubmit({
-                ReportId:Number(this.$route.query.id)
-            }).then(res=>{
-                if(res.Ret!==200) return 
-                this.$message.success("提交成功")
-                this.$router.replace({ path: '/smartReportList' });
+            this.$confirm("是否确认提交该报告进入审批流程?","提示",{
+                confirmButtonText:'确定',
+                cancelButtonText:'取消',
+                type:'warning',
+            }).then(()=>{
+                approveInterence.reportSmartSubmit({
+                    ReportId:Number(this.$route.query.id)
+                }).then(res=>{
+                    if(res.Ret!==200) return 
+                    this.$message.success("提交成功")
+                    this.$router.replace({ path: '/smartReportList' });
+                })
             })
         },
 

src/views/smartReport/reportList.vue

@@ -604,21 +604,33 @@ export default {
         },
         //提交报告
         handleSubmitReport(item){
-            approveInterence.reportSmartSubmit({
-                ReportId:Number(item.SmartReportId)
-            }).then(res=>{
-                if(res.Ret!==200) return 
-                this.$message.success("提交成功")
-                this.getReportList()
+            this.$confirm("是否确认提交该报告进入审批流程?","提示",{
+                confirmButtonText:'确定',
+                cancelButtonText:'取消',
+                type:'warning',
+            }).then(()=>{
+                approveInterence.reportSmartSubmit({
+                    ReportId:Number(item.SmartReportId)
+                }).then(res=>{
+                    if(res.Ret!==200) return 
+                    this.$message.success("提交成功")
+                    this.getReportList()
+                })
             })
         },
         cancelReport(item){
-            approveInterence.reportSmartCancel({
-                ReportId:Number(item.SmartReportId)
-            }).then(res=>{
-                if(res.Ret!==200) return 
-                this.$message.success("撤销成功")
-                this.getReportList()
+            this.$confirm("你确定要撤销申请吗?","提示",{
+                confirmButtonText:'确定',
+                cancelButtonText:'取消',
+                type:'warning',
+            }).then(()=>{
+                approveInterence.reportSmartCancel({
+                    ReportId:Number(item.SmartReportId)
+                }).then(res=>{
+                    if(res.Ret!==200) return 
+                    this.$message.success("撤销成功")
+                    this.getReportList()
+                })
             })
         },