From 79a31bfddc58512eec777cab3f7adf519df1ed5d Mon Sep 17 00:00:00 2001
From: yiwenpeng <ywp303@163.com>
Date: Sun, 28 Jul 2024 12:45:34 +0800
Subject: [PATCH] feat:权限控制
---
src/main/resources/templates/config/location/location.html | 9 ++++++---
src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html | 4 ++--
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/templates/config/location/location.html b/src/main/resources/templates/config/location/location.html
index 4e0aa59..dfa34ab 100644
--- a/src/main/resources/templates/config/location/location.html
+++ b/src/main/resources/templates/config/location/location.html
@@ -135,13 +135,16 @@
shiro:hasPermission="config:location:remove"><!--权限判断shiro是否有User用户字段remove-->
<i class="fa fa-trash-o"></i> 删除
</a>
- <a class="btn btn-outline btn-success btn-rounded" onclick="SelectFrequencyLocation()">
+ <a class="btn btn-outline btn-success btn-rounded" onclick="SelectFrequencyLocation()"
+ shiro:hasPermission="config:location:frequency">
<i class="fa fa-edit"></i> 批量设置常用库位
</a>
- <a class="btn btn-outline btn-success btn-rounded" onclick="SelectEmptyContainerLocation()">
+ <a class="btn btn-outline btn-success btn-rounded" onclick="SelectEmptyContainerLocation()"
+ shiro:hasPermission="config:location:emptyContainer">
<i class="fa fa-edit"></i> 批量设置空托盘库位
</a>
- <a class="btn btn-outline btn-success btn-rounded" onclick="SelectSelfCreatedLocation()">
+ <a class="btn btn-outline btn-success btn-rounded" onclick="SelectSelfCreatedLocation()"
+ shiro:hasPermission="config:location:selfCreated">
<i class="fa fa-edit"></i> 批量设置自建单据库位
</a>
</div>
diff --git a/src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html b/src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
index 8252f33..772cee3 100644
--- a/src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
+++ b/src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
@@ -190,11 +190,11 @@
<!-- <i class="fa fa-trash-o"></i> 删除-->
<!-- </a>-->
<a class="btn btn-outline btn-success btn-rounded" onclick="wave()"
- shiro:hasPermission="shipment:bill:wave">
+ shiro:hasPermission="shipment:bill:billMerge">
<i class="fa fa-plus"></i> 单据合并
</a>
<a class="btn btn-outline btn-success btn-rounded" onclick="autoBillMerge()"
- shiro:hasPermission="shipment:bill:wave">
+ shiro:hasPermission="shipment:bill:autoBillMerge">
<i class="fa fa-plus"></i> 自动合并单据
</a>
<a id="openAutoShipmentBtn" class="btn btn-outline btn-success btn-rounded"
--
libgit2 0.22.2