只有管理员能修改角色权限

管理员不显示客户信息
采购订单路径修改

src/main/java/com/uas/platform/b2b/controller/SaleOrderController.java

@@ -624,7 +624,7 @@ public class SaleOrderController {
 	 *            订单明细行ID
 	 * @return
 	 */
-	@RequestMapping(value = "/items/{orderItemId}/replay/last", method = RequestMethod.GET)
+	@RequestMapping(value = "/items/{orderItemId}/reply/last", method = RequestMethod.GET)
 	@ResponseBody
 	public ModelMap getLatestReplyQty(@PathVariable("orderItemId") Long orderItemId) {
 		ModelMap map = new ModelMap();

src/main/webapp/resources/js/index/app.js

@@ -11202,8 +11202,12 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         };
     }]);
 
-    app.controller('RoleEditCtrl', ['$scope', '$modalInstance', '$timeout', 'AccountResource', 'AccountRole', 'toaster', 'role', 'ngAlert', 'BaseService', function ($scope, $modalInstance, $timeout, AccountResource, AccountRole, toaster, role, ngAlert, BaseService) {
+    app.controller('RoleEditCtrl', ['$scope', '$modalInstance', '$timeout', 'AccountResource', 'AccountRole', 'toaster', 'role', 'ngAlert', 'BaseService', 'CurrentRole', function ($scope, $modalInstance, $timeout, AccountResource, AccountRole, toaster, role, ngAlert, BaseService, CurrentRole) {
         BaseService.scrollBackToTop();
+        // 获取当前用户是否为管理员
+        CurrentRole.isManager({}, {}, function (data) {
+            $scope.isManager = data.isManager;
+        });
         $scope.role = role;
         $scope.master = angular.copy($scope.role);
         var isNew = role == null;

src/main/webapp/resources/tpl/index/approvalFlow/role_detail.html

@@ -7,7 +7,7 @@
 <form name="roleForm" novalidate ng-submit="save()">
 	<div class="modal-body">
 		<div class="form-group">
-			<label>角色名称</label> <input type="text" name="desc"
+			<label>角色名称</label> <input type="text" name="desc" disabled="!isManager"
 				ng-model="role.desc" class="form-control" placeholder="输入3-8个中文字描述"
 				required autofocus ng-readonly="role.isdefault">
 			<div class="tooltip in left control-tooltip"
@@ -18,7 +18,7 @@
 		</div>
 		<div class="form-group">
 			<label>职责范围</label>
-			<textarea class="form-control" name="duty" ng-model="role.duty"
+			<textarea class="form-control" name="duty" ng-model="role.duty" disabled="!isManager"
 				placeholder="角色的具体职责(50个中文字以内)" required
 				ng-readonly="role.isdefault"></textarea>
 			<div class="tooltip in left control-tooltip"
@@ -40,14 +40,14 @@
 							<li ng-repeat="resource in resources | orderBy:'index' track by resource.id"
 								ng-class="{active: resource.$active}"
 								ng-click="onItemClick(resource)"><input ng-if="resource.items.length > 0" id="check_{{resource.id}}" type="checkbox"
-								ng-model="resource.$checked"
+								ng-model="resource.$checked" disabled="!isManager"
 								ng-change="onResourceChange(resource)"/><a ng-if="resource.items.length > 0">{{::resource.name}}<span
 									class="caret"></span></a></li>
 						</ul>
 					</div>
 					<div class="item">
 						<ul class="list-unstyled">
-							<li ng-repeat="item in resourceItems"><input type="checkbox"
+							<li ng-repeat="item in resourceItems"><input type="checkbox" disabled="!isManager"
 								ng-model="item.$checked" ng-change="onItemChange()" />{{::item.name}}</li>
 						</ul>
 					</div>

src/main/webapp/resources/tpl/index/approvalFlow/user.html

@@ -32,10 +32,10 @@
 .row-operator2>.operator-menu2 {
 	position: absolute;
 	width: 140px;
-	height: 60;
+	height: 60px;
 	line-height: 30px;
 	padding: 0 10px;
-	top: 30;
+	top: 30px;
 	background-color: #333;
 	border-radius: 0 3px 3px 0;
 	opacity: 0;
@@ -62,10 +62,10 @@
 .row-operator2>.operator-menu3 {
 	position: absolute;
 	width: 125px;
-	height: 60;
+	height: 60px;
 	line-height: 30px;
 	padding: 0 10px;
-	top: 30;
+	top: 30px;
 	background-color: #333;
 	border-radius: 0 3px 3px 0;
 	opacity: 0;
@@ -281,14 +281,14 @@
 		margin-left: 120px;
 	}
 </style>
-<div class="pane base-info" style="border-bottom: none;">
+<div class="pane base-info" style="border-bottom: none;" ng-if="!isManager">
 	<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
 		<span class="f14">我的客户</span>
 		<div class="pull-right">
 			共&nbsp;{{distributes.length}}&nbsp;客户
 		</div>
 	</div>
-	<div class="pane-body" id="order-detail-list">
+	<div class="pane-body" id="customer-detail-list">
 		<table class="block table table-default table-striped" style="margin-bottom: 0;">
 			<tr class="header" style="height: 40px;">
 				<th width="90">UU</th>