客户资料，产品导入，客户采购询价，采购模具，客户采购订单导出，客户采购变更单导出权限

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

@@ -282,6 +282,17 @@ public class BaseInfoController {
 		return modelAndView;
 	}
 
+	/**
+	 * 导出权限判断
+	 *
+	 * @param keyword
+	 * @return
+	 */
+	@RequestMapping(value = "/permission/xls", method = RequestMethod.GET)
+	public ModelMap exportPermission() {
+		return new ModelMap("success", true);
+	}
+
 	/**
 	 * 导出Excel
 	 * 

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

@@ -555,6 +555,17 @@ public class SaleInquiryController {
 		return purchaseInquiryService.findHistoryByItemId(inquiryItemId);
 	}
 
+	/**
+	 * 导出权限判断
+	 *
+	 * @return
+	 */
+	@RequestMapping(value = "/permission/xls", method = RequestMethod.GET)
+	@ResponseBody
+	public ModelMap exportPermission() {
+		return new ModelMap("success", true);
+	}
+
 	/**
 	 * 导出 - 全部
 	 *

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

@@ -458,7 +458,16 @@ public class SaleInquiryMouldController {
 		return null;
 	}
 
-
+	/**
+	 * 导出权限判断
+	 *
+	 * @return
+	 */
+	@RequestMapping(value = "/permission/xls", method = RequestMethod.GET)
+	@ResponseBody
+	public ModelMap exportPermission() {
+		return new ModelMap("success", true);
+	}
 
 	/**
 	 * 导出 - 全部

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

@@ -348,6 +348,17 @@ public class SaleOrderChangeController {
 		return new ResponseEntity<String>(HttpStatus.OK);
 	}
 
+	/**
+	 * 导出权限判断
+	 *
+	 * @return
+	 */
+	@RequestMapping(value = "/permission/xls", method = RequestMethod.GET)
+	@ResponseBody
+	public ModelMap exportPermission() {
+		return new ModelMap("success", true);
+	}
+
 	/**
 	 * 导出 - 全部
 	 * 

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

@@ -699,6 +699,17 @@ public class SaleOrderController {
 		return new ResponseEntity<String>(HttpStatus.OK);
 	}
 
+	/**
+	 * 导出权限判断
+	 *
+	 * @return
+	 */
+	@RequestMapping(value = "/permission/xls", method = RequestMethod.GET)
+	@ResponseBody
+	public ModelMap exportPermission() {
+		return new ModelMap("success", true);
+	}
+
 	/**
 	 * 导出 - 全部
 	 *

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

@@ -144,6 +144,15 @@ public class VendorController {
 		return vendorService.findById(id);
 	}
 
+	/**
+	 * 导出客户权限判断
+	 *
+	 * @return
+	 */
+	@RequestMapping(value = "/customer/permission/xls", method = RequestMethod.GET)
+	public ModelMap exportVendorsPermission() {
+		return new ModelMap("success", true);
+	}
 	/**
 	 * 导出
 	 * 

src/main/java/com/uas/platform/b2b/filter/SSOInterceptor.java

@@ -200,16 +200,16 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
 //			return;
 //		}
 		if (needPermission != null) {
-			if(needPermission.contains("导出")) {
-				String retUrl = request.getContextPath();
-				try {
-					throw new AccessDeniedException("无法访问，没有 " + needPermission + " 权限！");
-				} finally {
-					response.sendRedirect(retUrl + "/static/tpl/start/index.html");
-				}
-			} else {
+//			if(needPermission.contains("导出")) {
+//				String retUrl = request.getContextPath();
+//				try {
+//					throw new AccessDeniedException("无法访问，没有 " + needPermission + " 权限！");
+//				} finally {
+////					response.sendRedirect(retUrl + "/static/tpl/start/index.html");
+//				}
+//			} else {
 				throw new AccessDeniedException("无法访问，没有 " + needPermission + " 权限！");
-			}
+//			}
 		}
 	}
 

src/main/webapp/resources/js/common/services.js

@@ -268,7 +268,7 @@ define(['angular', 'toaster', 'big'], function(angular, big) {
             vendor: $resource('vendor/:id', {}),
             userInfo: $resource('vendor/userInfo/:uu', {}),
             user: $resource('vendor/user', {}),
-            exportXls: $resource('vendor/customer/xls', {})
+            exportXls: $resource('vendor/customer/permission/xls', {})
         };
     }]).factory('AccountUser', ['$resource', function($resource) {
         return $resource('account/user/:uu', {}, {

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

@@ -2029,8 +2029,10 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         // 导出客户资料列表
         $scope.exportXls = function () {
-            VendorService.exportXls.query({keyword: $scope.keywordXls}, {}, function () {
-                // window.location.href = window.location.origin + 'vendor/customer/xls?keyword='+$scope.keywordXls;
+            VendorService.exportXls.get({}, {}, function (data) {
+                if (data.success){
+                    window.location.href = window.location.origin + '/vendor/customer/xls?keyword='+ ($scope.keywordXls || '');
+                }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
             });
@@ -3231,6 +3233,17 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 }
             }
         };
+
+        // 导出
+        $scope.exportXls = function () {
+            PurcOrderItem.exportXls({}, {}, function (data) {
+                if (data.success){
+                    window.location.href = window.location.origin + '/sale/orders/xls?_state='+$scope.active+'&searchFilter='+angular.toJson($scope.searchFilterXls);
+                }
+            }, function (response) {
+                toaster.pop('error', '数据加载失败', response.data);
+            });
+        }
     }]);
     app.controller('SaleOrderDetailCtrl', ['$scope', '$stateParams', 'PurcOrder', 'PurcOrderItem', 'toaster', 'ReportService', 'CurrentRole', function ($scope, $stateParams, PurcOrder, PurcOrderItem, toaster, ReportService, CurrentRole) {
         // 获取当前用户是否为普通用户
@@ -3488,6 +3501,17 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             $scope.tableParams.page(1);
             $scope.tableParams.reload();
         };
+
+        // 导出
+        $scope.exportXls = function () {
+            PurcChange.exportXls({}, {}, function (data) {
+                if (data.success){
+                    window.location.href = window.location.origin + '/sale/changes/xls?_state='+$scope.active+'&searchFilter='+angular.toJson($scope.searchFilterXls);
+                }
+            }, function (response) {
+                toaster.pop('error', '数据加载失败', response.data);
+            });
+        }
     }]);
     app.controller('SaleChangeDetailCtrl', ['$scope', '$stateParams', 'PurcChange', 'toaster', 'CurrentRole', function ($scope, $stateParams, PurcChange, toaster, CurrentRole) {
         // 获取当前用户是否为普通用户
@@ -3866,13 +3890,13 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         // 导出
         $scope.exportXls = function () {
-            PurcInquiry.exportXls({_state: $scope.active, searchFilter: $scope.searchFilterXls}, {}, function () {
-                window.location.href = window.location.origin + '/sale/inquiry/xls?_state='+$scope.active+'&searchFilter='+angular.toJson($scope.searchFilterXls);
+            PurcInquiry.exportXls({}, {}, function (data) {
+                if (data.success) {
+                    window.location.href = window.location.origin + '/sale/inquiry/xls?_state='+$scope.active+'&searchFilter='+angular.toJson($scope.searchFilterXls);
+                }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
             })
-            console.log(window.location.origin);
-            console.log(window.location.pathname );
         }
     }]);
 
@@ -5650,6 +5674,16 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             return new Date();
         };
 
+        // 导出客户资料列表
+        $scope.exportXls = function () {
+            PurcInquiryMould.exportXls({}, {}, function (data) {
+                if (data.success){
+                    window.location.href = window.location.origin + '/sale/mould/xls?_state='+$scope.active+'&searchFilter='+angular.toJson($scope.searchFilterXls);
+                }
+            }, function (response) {
+                toaster.pop('error', '数据加载失败', response.data);
+            });
+        }
     }]);
 
 
@@ -12623,8 +12657,10 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         }
 
         $scope.exportXls = function () {
-            GetProductInfo.exportXls({_state: $scope.active, keyword: $scope.keywordXls},{}, function () {
-                window.location.href = window.location.origin + 'product/baseInfo/xls?_state='+$scope.active+'&keyword='+keyword;
+            GetProductInfo.exportXls({},{}, function (data) {
+                if (data.success) {
+                    window.location.href = window.location.origin + '/product/baseInfo/xls?_state='+$scope.active+'&keyword='+ (keyword || '');
+                }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);
             })

src/main/webapp/resources/js/index/services/BaseInfo.js

@@ -95,7 +95,7 @@ define(['ngResource'], function() {
 				method: 'GET'
 			},
 			exportXls: {
-				url: 'product/baseInfo/xls',
+				url: 'product/baseInfo/permission/xls',
 				method: 'GET'
 			},
 			matchbytype: {

src/main/webapp/resources/js/index/services/Purc.js

@@ -99,6 +99,10 @@ define([ 'ngResource'], function() {
 			getUnreadCount:{
 				url: 'sale/orders/unread',
 				method: 'GET'
+			},
+			exportXls: {
+				url: 'sale/orders/permission/xls',
+				method: 'GET'
 			}
 		});
 	}]).factory('PurcOrderItemInfo', ['$resource', function($resource) {
@@ -259,6 +263,10 @@ define([ 'ngResource'], function() {
 			getUnreadCount:{
 				url: 'sale/changes/unread',
 				method: 'GET'
+			},
+			exportXls: {
+				url: 'sale/changes/permission/xls',
+				method: 'GET'
 			}
 		});
 	}]).factory('PurcChanges', ['$resource', function($resource) {
@@ -359,7 +367,7 @@ define([ 'ngResource'], function() {
 				method: 'POST'
 			},
 			exportXls: {
-				url: 'sale/inquiry/xls',
+				url: 'sale/inquiry/permission/xls',
 				method: 'GET'
 			}
         });
@@ -759,6 +767,10 @@ define([ 'ngResource'], function() {
 			getUnreadCount:{
 				url: 'sale/mould/unread',
 				method: 'GET'
+			},
+			exportXls: {
+				url: 'sale/mould/permission/xls',
+				method: 'GET'
 			}
 		});
     }]).factory('PurcInquiryMouldSql', ['$resource', function($resource) {

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" disabled="!isManager"
+			<label>角色名称</label> <input type="text" name="desc" ng-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" disabled="!isManager"
+			<textarea class="form-control" name="duty" ng-model="role.duty" ng-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" disabled="!isManager"
+								ng-model="resource.$checked" ng-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" disabled="!isManager"
+							<li ng-repeat="item in resourceItems"><input type="checkbox" ng-disabled="!isManager"
 								ng-model="item.$checked" ng-change="onItemChange()" />{{::item.name}}</li>
 						</ul>
 					</div>
@@ -61,11 +61,11 @@
 		</p>
 		<!--仅优软科技有限公司可用-->
 		<button ng-if="role.enUU == 10041166" class="btn btn-primary" type="button" ng-click="updateDefault()">更新默认权限标准库</button>
-		<button class="btn btn-warning" type="button" ng-click="recover()" ng-if="role.isdefault == 1">恢复默认</button>
+		<button class="btn btn-warning" type="button" ng-click="recover()" ng-if="role.isdefault == 1" ng-disabled="!isManager">恢复默认</button>
 		<button class="btn btn-primary" type="submit"
 			ng-disabled="roleForm.$invalid || !isChanged(role)">确认</button>
 		<button class="btn btn-default" type="button"
-			ng-show="role.id && role.isdefault == 0" ng-click="del()">删除角色</button>
+			ng-show="role.id && role.isdefault == 0" ng-click="del()" ng-disabled="!isManager">删除角色</button>
 		<button class="btn btn-default" ng-click="cancel()" type="button">取消</button>
 	</div>
 	<div class="modal-footer" ng-if="role.issys == 1">

src/main/webapp/resources/tpl/index/sale/change.html

@@ -110,7 +110,7 @@
 <div class="pub-com_head">
 	<span>客户采购变更单</span>
 	<div class="p-right">
-		<a href="sale/changes/xls?_state={{active}}&searchFilter={{searchFilterXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+		<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
 	</div>
 </div>
 <div class="menu condition block">

src/main/webapp/resources/tpl/index/sale/inquiry_mould.html

@@ -187,7 +187,7 @@ tbody td div.text-mould {
 	<div class="pub-com_head">
 		<span>客户模具询价</span>
 		<div class="p-right">
-			<a href="sale/mould/xls?_state={{active}}&searchFilter={{searchFilterXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
 		</div>
 	</div>
 	<div class="menu condition block">

src/main/webapp/resources/tpl/index/sale/order.html

@@ -153,7 +153,7 @@
 	<div class="pub-com_head">
 		<span>客户采购订单</span>
 		<div class="p-right">
-			<a href="sale/orders/xls?_state={{active}}&searchFilter={{searchFilterXls}}"
+			<a href="#" ng-click="exportXls()"
 			   target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
 		</div>
 	</div>

src/main/webapp/resources/tpl/index/sale/quotation.html

@@ -122,7 +122,7 @@
 .btn-group-justified .btn{
 	border: none;
 	font-size: 14px;
-	outline：none;
+	outline: none;
 }
 .btn-group-justified .btn-info{
 	background: none;