Merge branch 'requirement_325' into debug

src/views/report/List.vue

@@ -179,20 +179,28 @@ async function handleReportPublish(item){
 
     //如果走审批流 直接发布
     if(isApprove.value){
-        publishReportApprove()
-        showReportItemOpt.value=false
+        confirmPublish(item)
         return
     }
     // 判断是否有推送权限
     if(!checkAuthBtn(reportManageBtn.reportManage_sendMsg)){
-        publishReportApprove()
-        showReportItemOpt.value=false
+        confirmPublish(item)
         return
     }
 
     showPublishPop.value=true
     showReportItemOpt.value=false
 }
+function confirmPublish(item){
+    showDialog({
+        title: '提示',
+        message: item.PrePublishTime ? '是否立即发布定时报告？' : '是否确定立即发布报告？',
+        showCancelButton:true
+    }).then(res=>{
+        publishReportApprove()
+        showReportItemOpt.value=false
+    }).catch(err=>{})
+}
 function publishReportApprove(){
     apiReport.reportPublish({
         ReportIds:activeReportData.value.Id.toString(),