客户打样申请、客户认定单导出权限

注释报错修改

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

@@ -72,7 +72,8 @@ public class SaleSampleController {
 	/**
 	 * 作为卖家，分页获取客户的打样申请单
 	 * 
-	 * @param json
+	 * @param params
+	 * @param searchFilter
 	 * @return
 	 */
 	@RequestMapping(value = "/info/search", method = RequestMethod.GET)
@@ -105,7 +106,8 @@ public class SaleSampleController {
 	/**
 	 * 作为卖家，分页获取客户的打样申请单（待处理）
 	 * 
-	 * @param json
+	 * @param params
+	 * @param searchFilter
 	 * @return
 	 */
 	@RequestMapping(value = "/info/search", method = RequestMethod.GET, params = RequestState.TODO)
@@ -139,7 +141,8 @@ public class SaleSampleController {
 	/**
 	 * 作为卖家，分页获取客户的打样申请单（已处理）
 	 * 
-	 * @param json
+	 * @param params
+	 * @param searchFilter
 	 * @return
 	 */
 	@RequestMapping(value = "/info/search", method = RequestMethod.GET, params = RequestState.DONE)
@@ -173,7 +176,8 @@ public class SaleSampleController {
 	/**
 	 * 作为卖家，分页获取客户的打样申请单（已作废）
 	 *
-	 * @param json
+	 * @param params
+	 * @param searchFilter
 	 * @return
 	 */
 	@RequestMapping(value = "/info/search", method = RequestMethod.GET, params = RequestState.INVALID)
@@ -207,7 +211,8 @@ public class SaleSampleController {
 	/**
 	 * 作为卖家，分页获取客户的打样申请单
 	 * 
-	 * @param json
+	 * @param params
+	 * @param searchFilter
 	 * @return
 	 */
 	@RequestMapping(value = "/info/nosearch", method = RequestMethod.GET)
@@ -234,7 +239,8 @@ public class SaleSampleController {
 	/**
 	 * 作为卖家，分页获取客户的打样申请单（待处理）
 	 * 
-	 * @param json
+	 * @param params
+	 * @param searchFilter
 	 * @return
 	 */
 	@RequestMapping(value = "/info/nosearch", method = RequestMethod.GET, params = RequestState.TODO)
@@ -263,7 +269,8 @@ public class SaleSampleController {
 	/**
 	 * 作为卖家，分页获取客户的打样申请单（已处理）
 	 * 
-	 * @param json
+	 * @param params
+	 * @param searchFilter
 	 * @return
 	 */
 	@RequestMapping(value = "/info/nosearch", method = RequestMethod.GET, params = RequestState.DONE)
@@ -292,7 +299,8 @@ public class SaleSampleController {
 	/**
 	 * 作为卖家，分页获取客户的打样申请单（已作废）
 	 *
-	 * @param json
+	 * @param params
+	 * @param searchFilter
 	 * @return
 	 */
 	@RequestMapping(value = "/info/nosearch", method = RequestMethod.GET, params = RequestState.INVALID)
@@ -359,7 +367,7 @@ public class SaleSampleController {
 	/**
 	 * 作为卖家，获取送样申请明细的送样单
 	 * 
-	 * @param json
+	 * @param id
 	 * @return
 	 */
 	@RequestMapping(value = "/{id}/send", method = RequestMethod.GET)
@@ -377,7 +385,10 @@ public class SaleSampleController {
 	/**
 	 * 作为卖家，分页获取客户的打样认定单(全部)
 	 * 
-	 * @param json
+	 * @param params
+	 * @param keyword
+	 * @param fromDate
+	 * @param endDate
 	 * @return
 	 */
 	@RequestMapping(value = "/approval", method = RequestMethod.GET)
@@ -415,7 +426,10 @@ public class SaleSampleController {
 	/**
 	 * 作为卖家，分页获取客户的打样认定单(合格)
 	 *
-	 * @param json
+	 * @param params
+	 * @param keyword
+	 * @param fromDate
+	 * @param endDate
 	 * @return
 	 */
 	@RequestMapping(value = "/approval", params = RequestState.AGREED, method = RequestMethod.GET)
@@ -457,7 +471,10 @@ public class SaleSampleController {
 	/**
 	 * 作为卖家，分页获取客户的打样认定单(不合格)
 	 *
-	 * @param json
+	 * @param params
+	 * @param keyword
+	 * @param fromDate
+	 * @param endDate
 	 * @return
 	 */
 	@RequestMapping(value = "/approval", params = RequestState.REFUSED, method = RequestMethod.GET)
@@ -496,7 +513,7 @@ public class SaleSampleController {
 	/**
 	 * 作为卖家，根据ID获取客户的打样认定单详细界面
 	 * 
-	 * @param json
+	 * @param id
 	 * @return
 	 */
 	@RequestMapping(value = "/approval/{id}", method = RequestMethod.GET)
@@ -520,6 +537,17 @@ public class SaleSampleController {
 		return new ResponseEntity<String>(HttpStatus.OK);
 	}
 
+	/**
+	 * 导出权限判断
+	 *
+	 * @return
+	 */
+	@RequestMapping(value = "/xls/permission", method = RequestMethod.GET)
+	@ResponseBody
+	public ModelMap exportPermission() {
+		return new ModelMap("success", true);
+	}
+
 	/**
 	 * 导出打样申请 - 全部
 	 * 
@@ -600,10 +628,23 @@ public class SaleSampleController {
 		return modelAndView;
 	}
 
+	/**
+	 * 导出权限判断
+	 *
+	 * @return
+	 */
+	@RequestMapping(value = "/approval/xls/permission", method = RequestMethod.GET)
+	@ResponseBody
+	public ModelMap exportApprovalPermission() {
+		return new ModelMap("success", true);
+	}
+
 	/**
 	 * 导出认定单 - 全部
 	 * 
-	 * @param params
+	 * @param keyword
+	 * @param fromDate
+	 * @param endDate
 	 * @return
 	 */
 	@RequestMapping(value = "/approval/xls", method = RequestMethod.GET)

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

@@ -7709,6 +7709,17 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             $scope.tableParams.page(1);
             $scope.tableParams.reload();
         };
+
+        // 导出
+        $scope.exportXls = function () {
+            PurcSample.exportXls({}, {}, function (data) {
+                if (data.success){
+                    window.location.href = window.location.origin + '/sale/sample/xls?_state='+$scope.active+'&searchFilter='+angular.toJson($scope.searchFilterXls);
+                }
+            }, function (response) {
+                toaster.pop('error', '数据加载失败', response.data);
+            });
+        }
     }]);
 
     app.controller('SampleSendCtrl', ['$scope', '$modalInstance', 'sampleItem', 'PurcSample', '$upload', 'toaster', function ($scope, $modalInstance, sampleItem, PurcSample, $upload, toaster) {
@@ -7867,6 +7878,17 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             $scope.tableParams.page(1);
             $scope.tableParams.reload();
         };
+
+        // 导出
+        $scope.exportXls = function () {
+            PurcApproval.exportXls({}, {}, function (data) {
+                if (data.success){
+                    window.location.href = window.location.origin + '/sale/sample/approval/xls?_state='+$scope.active+'&keyword='+($scope.keywordXls || "")+'&fromDate='+$scope.fromDateXls+'&endDate='+$scope.endDateXls;
+                }
+            }, function (response) {
+                toaster.pop('error', '数据加载失败', response.data);
+            });
+        }
     }]);
 
     /**

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

@@ -998,6 +998,10 @@ define([ 'ngResource'], function() {
 			getUnreadCount:{
 				url: 'sale/sample/unread',
 				method: 'GET'
+			},
+			exportXls: {
+				url: 'sale/sample/xls/permission',
+				method: 'GET'
 			}
 		});
 	}]).factory('PurcSampleInfo', ['$resource', function($resource) {
@@ -1033,7 +1037,11 @@ define([ 'ngResource'], function() {
                 params: {
                     _state: 'refused'
                 }
-            }
+            },
+			exportXls: {
+				url: 'sale/sample/approval/xls/permission',
+				method: 'GET'
+			}
 		});
 	}]).factory('PurcOrderItemHis', ['$resource', function($resource) {
 		return $resource('sale/orders/history/items', {}, {

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

@@ -139,7 +139,7 @@
 	<div class="pub-com_head">
 		<span>客户认定单</span>
 		<div class="p-right">
-			<a href="sale/sample/approval/xls?keyword={{keywordXls}}&fromDate={{fromDateXls}}&endDate={{endDateXls}}"
+			<a href="#" ng-click="exportXls()"
 			target="_self" class="text-simple" title="导出Excel表格"><i
 				class="fa fa-file-excel-o fa-fw"></i>导出</a>
 		</div>
@@ -383,4 +383,5 @@
 				</td>
 			</tr>
 		</tbody>
-	</table>
+	</table>
+</div>

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

@@ -141,7 +141,7 @@
 <div class="pub-com_head">
 	<span>客户打样申请</span>
 	<div class="p-right">
-		<a href="sale/sample/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">