pfz_smile
/
depositroy
2
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

修改出库、入库可视化金额可见权限

lwx_dev
erdanergou 3 years ago
parent
3ca8094c97
commit
f860a612a1
4 changed files with 28 additions and 72 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
  2. 4
      src/main/resources/templates/pages/chart/chart-in_back.html
  3. 4
      src/main/resources/templates/pages/chart/chart-out_back.html
  4. 70
      target/classes/templates/index_mobile.html

22
src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
View File

@ -1044,12 +1044,23 @@ public class PageController {
ModelAndView mv = new ModelAndView(); ModelAndView mv = new ModelAndView();
mv.setViewName("pages/chart/chart-in_back"); mv.setViewName("pages/chart/chart-in_back");
String token = request.getHeader("user-token"); String token = request.getHeader("user-token");
if (token == null) { if (token == null) {
token = (String) request.getSession().getAttribute("userToken"); token = (String) request.getSession().getAttribute("userToken");
} }
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); 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<Depository> depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userToken.getMaindeparment().toString()); List<Depository> depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userToken.getMaindeparment().toString());
@ -1104,6 +1115,17 @@ public class PageController {
} }
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); 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<Depository> depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userToken.getMaindeparment().toString()); List<Depository> depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userToken.getMaindeparment().toString());

4
src/main/resources/templates/pages/chart/chart-in_back.html
View File

@ -57,7 +57,7 @@
</div> </div>
<div class="layui-col-xs12 layui-col-md3"> <div class="layui-col-xs12 layui-col-md3" th:style="'display:'+${display}">
<div class="layui-card top-panel"> <div class="layui-card top-panel">
<div class="layui-card-header">当日入库物料金额</div> <div class="layui-card-header">当日入库物料金额</div>
<div class="layui-card-body"> <div class="layui-card-body">
@ -87,7 +87,7 @@
</div> </div>
</div> </div>
<div class="layui-col-xs12 layui-col-md3"> <div class="layui-col-xs12 layui-col-md3" th:style="'display:'+${display}">
<div class="layui-card top-panel"> <div class="layui-card top-panel">
<div class="layui-card-header">全部入库物料金额</div> <div class="layui-card-header">全部入库物料金额</div>

4
src/main/resources/templates/pages/chart/chart-out_back.html
View File

@ -54,7 +54,7 @@
</div> </div>
</div> </div>
<div class="layui-col-xs12 layui-col-md3"> <div class="layui-col-xs12 layui-col-md3" th:style="'display:'+${display}">
<div class="layui-card top-panel"> <div class="layui-card top-panel">
<div class="layui-card-header">出库物料总金额</div> <div class="layui-card-header">出库物料总金额</div>
@ -87,7 +87,7 @@
</div> </div>
</div> </div>
<div class="layui-col-xs12 layui-col-md3"> <div class="layui-col-xs12 layui-col-md3" th:style="'display:'+${display}">
<div class="layui-card top-panel"> <div class="layui-card top-panel">
<div class="layui-card-header">实际物料出库金额</div> <div class="layui-card-header">实际物料出库金额</div>

70
target/classes/templates/index_mobile.html
View File

@ -31,81 +31,15 @@
<script src="../static/js/vue/vue-router.js"></script> <script src="../static/js/vue/vue-router.js"></script>
<script src="../static/lib/http-vue-loader/src/httpVueLoader.js"></script> <script src="../static/lib/http-vue-loader/src/httpVueLoader.js"></script>
<style id="layuimini-bg-color"> <style id="layuimini-bg-color">
.layui-header {
height: 35px !important;
}
.layui-nav {
height: 35px !important;
}
.layui-nav-item {
color: #1b1d21;
line-height: 35px !important;
}
.layui-layout-admin .layui-body { .layui-layout-admin .layui-body {
top: 35px !important; top: 0 !important;
} }
</style> </style>
</head> </head>
<body class="layui-layout-body layuimini-all"> <body class="layui-layout-body layuimini-all">
<div class="layui-layout layui-layout-admin"> <div class="layui-layout layui-layout-admin">
<div class="layui-header header"> <!-- <a href="javascript:" data-refresh="刷新"><i class="fa fa-refresh"></i></a>-->
<div class="layui-logo layuimini-logo"></div>
<div class="layuimini-header-content">
<a>
<div class="layuimini-tool"><i title="展开" class="fa fa-outdent" data-side-fold="1"></i></div>
</a>
<!--电脑端头部菜单-->
<ul class="layui-nav layui-layout-left layuimini-header-menu layuimini-menu-header-pc layuimini-pc-show">
</ul>
<ul class="layui-nav layui-layout-right">
<!-- <li class="layui-nav-item" lay-unselect>-->
<!-- <a href="javascript:" id="scan"><i class="fa fa-qrcode" aria-hidden="true"></i></a>-->
<!-- </li>-->
<li class="layui-nav-item" lay-unselect>
<a href="javascript:" data-refresh="刷新"><i class="fa fa-refresh"></i></a>
</li>
<li class="layui-nav-item" lay-unselect>
<a href="javascript:" data-clear="清理" class="layuimini-clear"><i class="fa fa-trash-o"></i></a>
</li>
<li class="layui-nav-item mobile layui-hide-xs" lay-unselect>
<a href="javascript:" data-check-screen="full"><i class="fa fa-arrows-alt"></i></a>
</li>
<li class="layui-nav-item layuimini-setting">
<a href="javascript:" th:text="${user.getName()}"></a>
<div id="uid" th:text="${user.getId()}" style="display: none"></div>
<dl class="layui-nav-child">
<dd>
<a href="javascript:" layuimini-content-href="/account_look" data-title="基本资料"
data-icon="fa fa-gears">基本资料<span class="layui-badge-dot"></span></a>
</dd>
<dd style="display: none">
<a href="javascript:" layuimini-content-href="/user_password" data-title="修改密码"
data-icon="fa fa-gears">修改密码</a>
</dd>
<dd>
<hr>
</dd>
<dd>
<a href="javascript:" class="login-out">退出登录</a>
</dd>
</dl>
</li>
<li class="layui-nav-item layuimini-select-bgcolor" lay-unselect>
<a href="javascript:" data-bgcolor="配色方案"><i class="fa fa-ellipsis-v"></i></a>
</li>
</ul>
</div>
</div>
<!-- 底部导航栏--> <!-- 底部导航栏-->
<div class="layui-footer "> <div class="layui-footer ">

Write Preview
Loading…
Cancel
Save