shanbinzhang 4 months ago
parent
commit
c632b58ef2

+ 1 - 1
src/views/ppt_manage/newVersion/pptCatalog.vue

@@ -390,7 +390,7 @@ export default {
           'present':checkPermissionBtn(pptPermission.ppt_show),
           'download':checkPermissionBtn(pptPermission.ppt_download)&&((item.State===6&&item.ReportSource===2) || item.ReportSource===1),
           'edit':checkPermissionBtn(pptPermission.ppt_save)&&item.HasAuth&&(([3,5].includes(item.State)&&item.ReportSource===2) || item.ReportSource===1),
-          'delete':checkPermissionBtn(pptPermission.ppt_del)&&item.HasAuth&&item.ReportSource===1,
+          'delete':checkPermissionBtn(pptPermission.ppt_del)&&item.ReportSource===1&&item.AdminId===this.RoleId,
       }
 
       return toolList.filter((i)=>btnAuthMap[i.key]) 

+ 4 - 2
src/views/report_manage/reportV2/list.vue

@@ -1016,10 +1016,12 @@ export default {
     },
 
     downloadPdfImg(row,type){
+      let name = `${row.Title}${this.$moment().format('YYYYMMDD')}`
       if(type == 1){
-          window.open(row.DetailPdfUrl,"_blank")
+          // window.open(row.DetailPdfUrl,"_blank")
+          this.handleDownloadResource(row.DetailPdfUrl,`${name}`)
       }else{
-          this.handleDownloadResource(row.DetailImgUrl,`${row.Title}`)
+          this.handleDownloadResource(row.DetailImgUrl,`${name}`)
       }
     },