diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index edf0670a..e95b2504 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -1631,6 +1631,15 @@ public class PageController { recordP.setUnit(sumUnit.toString()); mv.addObject("record", recordP); mv.addObject("recordMinList", applicationOutRecordMinByParent); + Integer role = userToken.getIsadmin(); + if (role == null) { + role = 1; + } + if (Integer.compare(userToken.getMaindeparment(), 361) == 0 || Integer.compare(role, 4) == 0 ) { + mv.addObject("display", "table-row"); + } else { + mv.addObject("display", "none"); + } return mv; } @@ -1860,6 +1869,13 @@ public class PageController { mv.addObject("edisplay", "none"); } + if (Integer.compare(userToken.getMaindeparment(), 361) == 0 || Integer.compare(role, 4) == 0) { + mv.addObject("pdisplay", "table-row"); + } else { + mv.addObject("pdisplay", "none"); + + } + mv.addObject("recordMinP", recordMinP); @@ -2027,7 +2043,7 @@ public class PageController { } if (Integer.compare(userToken.getMaindeparment(), 361) == 0 || Integer.compare(role, 4) == 0) { - mv.addObject("display", "inline-block"); + mv.addObject("display", "table-row"); } else { mv.addObject("display", "none"); diff --git a/src/main/resources/templates/pages/application/application-review.html b/src/main/resources/templates/pages/application/application-review.html index 89ca83fd..67c9f845 100644 --- a/src/main/resources/templates/pages/application/application-review.html +++ b/src/main/resources/templates/pages/application/application-review.html @@ -55,7 +55,7 @@ 计量单位 单位 - + 金额 金额 diff --git a/src/main/resources/templates/pages/application/form-step-look_back.html b/src/main/resources/templates/pages/application/form-step-look_back.html index fdf89336..26063c72 100644 --- a/src/main/resources/templates/pages/application/form-step-look_back.html +++ b/src/main/resources/templates/pages/application/form-step-look_back.html @@ -67,7 +67,7 @@ 数量 409 - + 金额 2016-11-28 diff --git a/src/main/resources/templates/pages/application/form-step-look_minRecordOut.html b/src/main/resources/templates/pages/application/form-step-look_minRecordOut.html index 51d8f9c9..0f04c8b4 100644 --- a/src/main/resources/templates/pages/application/form-step-look_minRecordOut.html +++ b/src/main/resources/templates/pages/application/form-step-look_minRecordOut.html @@ -78,7 +78,7 @@ - + 金额 +
+
+

搜索

@@ -97,10 +100,11 @@ } - layui.use(['form', 'flow', 'laydate'], function () { + layui.use(['form', 'flow', 'laydate','miniAdmin'], function () { var $ = layui.jquery, form = layui.form, flow = layui.flow, + miniAdmin = layui.miniAdmin; laydate = layui.laydate; let takingPre = 0; diff --git a/src/main/resources/templates/pages/depository/table-out.html b/src/main/resources/templates/pages/depository/table-out.html index 27ec4783..52f3e7d0 100644 --- a/src/main/resources/templates/pages/depository/table-out.html +++ b/src/main/resources/templates/pages/depository/table-out.html @@ -78,7 +78,7 @@