feat:权限控制

易文鹏
1 parent 898110c0
Showing 2 changed files with 8 additions and 5 deletions
src/main/resources/templates/config/location/location.html
src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.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>
@@ -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"