From f860a612a18e35750e15f09c353b8a825815ffa9 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Mon, 10 Apr 2023 16:02:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E5=BA=93=E3=80=81?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8F=AF=E8=A7=86=E5=8C=96=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E5=8F=AF=E8=A7=81=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PageController.java | 22 ++++++ .../templates/pages/chart/chart-in_back.html | 4 +- .../templates/pages/chart/chart-out_back.html | 4 +- target/classes/templates/index_mobile.html | 70 +------------------ 4 files changed, 28 insertions(+), 72 deletions(-) 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 e95b2504..c681f3a0 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -1044,12 +1044,23 @@ public class PageController { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/chart/chart-in_back"); + String token = request.getHeader("user-token"); if (token == null) { token = (String) request.getSession().getAttribute("userToken"); } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); + Integer isadmin = userToken.getIsadmin(); + if (isadmin == null) { + isadmin = 1; + } + if (isadmin == 4 || Integer.compare(userToken.getMaindeparment(), 361) == 0) { + mv.addObject("display", "block"); + } else { + mv.addObject("display", "none"); + } + // 获取当前用户所在部门管理的仓库 List depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userToken.getMaindeparment().toString()); @@ -1104,6 +1115,17 @@ public class PageController { } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); + + Integer isadmin = userToken.getIsadmin(); + if (isadmin == null) { + isadmin = 1; + } + if (isadmin == 4 || Integer.compare(userToken.getMaindeparment(), 361) == 0) { + mv.addObject("display", "block"); + } else { + mv.addObject("display", "none"); + } + // 获取当前用户所在部门管理的仓库 List depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userToken.getMaindeparment().toString()); diff --git a/src/main/resources/templates/pages/chart/chart-in_back.html b/src/main/resources/templates/pages/chart/chart-in_back.html index 481c43b6..71872e0d 100644 --- a/src/main/resources/templates/pages/chart/chart-in_back.html +++ b/src/main/resources/templates/pages/chart/chart-in_back.html @@ -57,7 +57,7 @@ -
+
当日入库物料金额
@@ -87,7 +87,7 @@
-
+
全部入库物料金额
diff --git a/src/main/resources/templates/pages/chart/chart-out_back.html b/src/main/resources/templates/pages/chart/chart-out_back.html index c5d86502..1b68850d 100644 --- a/src/main/resources/templates/pages/chart/chart-out_back.html +++ b/src/main/resources/templates/pages/chart/chart-out_back.html @@ -54,7 +54,7 @@
-
+
出库物料总金额
@@ -87,7 +87,7 @@
-
+
实际物料出库金额
diff --git a/target/classes/templates/index_mobile.html b/target/classes/templates/index_mobile.html index 214b4e75..7bb17ec9 100644 --- a/target/classes/templates/index_mobile.html +++ b/target/classes/templates/index_mobile.html @@ -31,81 +31,15 @@
-
- - -
- -
- - - -
    -
- - - -
-
+