diff --git a/ruoyi-ui/src/views/benyi/themetermplanapproval/approval.vue b/ruoyi-ui/src/views/benyi/themetermplanapproval/approval.vue index d3cbf586a..b281e65a5 100644 --- a/ruoyi-ui/src/views/benyi/themetermplanapproval/approval.vue +++ b/ruoyi-ui/src/views/benyi/themetermplanapproval/approval.vue @@ -270,6 +270,7 @@ export default { // color: #666; // } } + @media print { .table-container { padding: 30px 0; @@ -312,9 +313,6 @@ export default { } } } - .print { - opacity: 0; - } } /*去除页眉页脚*/ @page { diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByMathTermplanController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByMathTermplanController.java index e33f9a148..bb0d19826 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByMathTermplanController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByMathTermplanController.java @@ -119,7 +119,7 @@ public class ByMathTermplanController extends BaseController { String bjtypeNew = byClassService.selectByClassById(classId).getBjtype(); if (bjtypeNew.equals("1")) { return AjaxResult.error("当前班级为托班,无法创建计划"); - }else { + } else { int iCount = schoolCommon.getDifMonth(byMathTermplan.getStartmonth(), byMathTermplan.getEndmonth()); System.out.println("月份差=" + iCount); String uuid = schoolCommon.getUuid(); @@ -171,7 +171,10 @@ public class ByMathTermplanController extends BaseController { byMathTermplanitem.setTpid(ids[i]); List<ByMathTermplanitem> list = byMathTermplanitemService.selectByMathTermplanitemList(byMathTermplanitem); if (list != null && list.size() > 0) { - return AjaxResult.error("选中的计划下存在计划明细,无法删除"); + //return AjaxResult.error("选中的计划下存在计划明细,无法删除"); + for (int j = 0; j < list.size(); j++) { + byMathTermplanitemService.deleteByMathTermplanitemById(list.get(j).getId()); + } } } return toAjax(byMathTermplanService.deleteByMathTermplanByIds(ids));