Home Explore Help
Register Sign In
qxp
/
suishenbang-oneportal
Watch 2
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

一些bug修改

qxp 4 years ago
parent
09ea177e58
commit
472968c16d
5 changed files with 8 additions and 8 deletions
Unified View Show Diff Stats
  1. 1 1
      suishenbang-admin/src/main/resources/templates/system/role/role.html
  2. 2 2
      suishenbang-order/src/main/java/com/dgtly/order/controller/OrderCustomersController.java
  3. 2 2
      suishenbang-order/src/main/resources/templates/order/customers/customers.html
  4. 1 1
      suishenbang-order/src/main/resources/templates/order/orderbase/edit.html
  5. 2 2
      suishenbang-order/src/main/resources/templates/order/orderbase/orderbase.html

+ 1 - 1
suishenbang-admin/src/main/resources/templates/system/role/role.html
View File 

@@ -114,7 +114,7 @@
 
 		            formatter: function(value, row, index) {
 
 		            formatter: function(value, row, index) {
 
 		                var actions = [];
 
 		                var actions = [];
 
 		                actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.roleId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
 
 		                actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.roleId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
 
-		                actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="authDataScope(\'' + row.roleId + '\')"><i class="fa fa-check-square-o"></i>数据权限</a> ');
 
+		                // actions.push('<a class="btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="authDataScope(\'' + row.roleId + '\')"><i class="fa fa-check-square-o"></i>数据权限</a> ');
 
                         actions.push('<a class="btn btn-warning btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="wxMagnet(\'' + row.roleId + '\')"><i class="fa fa-user"></i>企业微信磁贴</a> ');
 
                         actions.push('<a class="btn btn-warning btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="wxMagnet(\'' + row.roleId + '\')"><i class="fa fa-user"></i>企业微信磁贴</a> ');
 
 		                actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="authUser(\'' + row.roleId + '\')"><i class="fa fa-user"></i>分配用户</a> ');
 
 		                actions.push('<a class="btn btn-info btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="authUser(\'' + row.roleId + '\')"><i class="fa fa-user"></i>分配用户</a> ');
 
 		                actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.roleId + '\')"><i class="fa fa-remove"></i>删除</a> ');
 
 		                actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.roleId + '\')"><i class="fa fa-remove"></i>删除</a> ');

+ 2 - 2
suishenbang-order/src/main/java/com/dgtly/order/controller/OrderCustomersController.java
View File 

@@ -43,7 +43,7 @@ public class OrderCustomersController extends BaseController
 
     @Value(value = "${ruoyi.cloudPath}")
 
     @Value(value = "${ruoyi.cloudPath}")
 
     private String cloudPath;
 
     private String cloudPath;
 
 
 
-    @RequiresPermissions("system:customers:view")
 
+    @RequiresPermissions("order:customers:view")
 
     @GetMapping()
 
     @GetMapping()
 
     public String customers()
 
     public String customers()
 
     {
 
     {
 
@@ -51,7 +51,7 @@ public class OrderCustomersController extends BaseController
 
     }
 
     }
 
 
 
 
 
-    @RequiresPermissions("system:customers:list")
 
+    @RequiresPermissions("order:customers:list")
 
     @PostMapping("/list")
 
     @PostMapping("/list")
 
     @ResponseBody
 
     @ResponseBody
 
     public Object list(HttpServletRequest request)
 
     public Object list(HttpServletRequest request)

+ 2 - 2
suishenbang-order/src/main/resources/templates/order/customers/customers.html
View File 

@@ -64,7 +64,7 @@
 
     </div>
 
     </div>
 
     <th:block th:include="include :: footer" />
 
     <th:block th:include="include :: footer" />
 
     <script th:inline="javascript">
 
     <script th:inline="javascript">
 
-        var editFlag = [[${@permission.hasPermi('order:customers:info')}]];
 
+
 
         var prefix = ctx + "order/customers";
 
         var prefix = ctx + "order/customers";
 
 
 
         $(function() {
 
         $(function() {
 
@@ -121,7 +121,7 @@
 
                     align: 'center',
 
                     align: 'center',
 
                     formatter: function(value, row, index) {
 
                     formatter: function(value, row, index) {
 
                         var actions = [];
 
                         var actions = [];
 
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>详情</a> ');
 
+                        actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>详情</a> ');
 
                         return actions.join('');
 
                         return actions.join('');
 
                     }
 
                     }
 
                 }]
 
                 }]

+ 1 - 1
suishenbang-order/src/main/resources/templates/order/orderbase/edit.html
View File 

@@ -1,7 +1,7 @@
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 
 <head>
 
 <head>
 
-    <th:block th:include="include :: header('修改订单基础 订单的基础信息')" />
 
+    <th:block th:include="include :: header('订单的基础信息')" />
 
     <th:block th:include="include :: datetimepicker-css" />
 
     <th:block th:include="include :: datetimepicker-css" />
 
 </head>
 
 </head>
 
 <body class="white-bg">
 
 <body class="white-bg">

+ 2 - 2
suishenbang-order/src/main/resources/templates/order/orderbase/orderbase.html
View File 

@@ -119,7 +119,7 @@
 
         })
 
         })
 
         //$("#date").datetimepicker("setDate", new Date() );  //设置显示默认当天的时间
 
         //$("#date").datetimepicker("setDate", new Date() );  //设置显示默认当天的时间
 
 
 
-        var editFlag = [[${@permission.hasPermi('order:orderbase:edit')}]];
 
+        //var editFlag = [[${@permission.hasPermi('order:orderbase:edit')}]];
 
         //var removeFlag = [[${@permission.hasPermi('order:orderbase:remove')}]];
 
         //var removeFlag = [[${@permission.hasPermi('order:orderbase:remove')}]];
 
         var orderStatusDatas = [[${@dict.getType('order_type')}]];
 
         var orderStatusDatas = [[${@dict.getType('order_type')}]];
 
         var prefix = ctx + "order/orderbase";
 
         var prefix = ctx + "order/orderbase";
 
@@ -175,7 +175,7 @@
 
                     align: 'center',
 
                     align: 'center',
 
                     formatter: function(value, row, index) {
 
                     formatter: function(value, row, index) {
 
                         var actions = [];
 
                         var actions = [];
 
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.docNumber + '\')"><i class="fa fa-edit"></i>详情</a> ');
 
+                        actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.operate.edit(\'' + row.docNumber + '\')"><i class="fa fa-edit"></i>详情</a> ');
 
                         return actions.join('');
 
                         return actions.join('');
 
                     }
 
                     }
 
                 }
 
                 }