Browse Source

采购询价导出权限
注释报错修改

wangmh 8 years ago
parent
commit
e755524a55

+ 21 - 8
src/main/java/com/uas/platform/b2b/controller/PurcInquiryController.java

@@ -13,10 +13,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.alibaba.fastjson.JSON;
@@ -66,7 +63,9 @@ public class PurcInquiryController {
 	/**
 	 * 保存(或修改)
 	 *
-	 * @param formStore
+	 * @param inquiry
+	 * @param contacts
+	 * @param uploadItem
 	 * @return
 	 */
 	@RequestMapping(value = "/save/withVendor", method = RequestMethod.POST)
@@ -91,7 +90,9 @@ public class PurcInquiryController {
 	/**
 	 * 保存并提交
 	 *
-	 * @param formStore
+	 * @param inquiry
+	 * @param contacts
+	 * @param uploadItem
 	 * @return
 	 */
 	@RequestMapping(value = "/submit/withVendor", method = RequestMethod.POST)
@@ -104,7 +105,8 @@ public class PurcInquiryController {
 	/**
 	 * 保存并提交(公共)
 	 *
-	 * @param formStore
+	 * @param inquiry
+	 * @param uploadItem
 	 * @return
 	 */
 	@RequestMapping(value = "/submit/withoutVendor", method = RequestMethod.POST)
@@ -384,7 +386,7 @@ public class PurcInquiryController {
 	 * 查询公共询价单
 	 *
 	 * @param params
-	 * @param keyword
+	 * @param searchFilter
 	 * @return
 	 */
 	@RequestMapping(value = "/publicInquiryItem", method = RequestMethod.GET)
@@ -480,6 +482,17 @@ public class PurcInquiryController {
 		return map;
 	}
 
+	/**
+	 * 导出权限判断
+	 *
+	 * @return
+	 */
+	@RequestMapping(value = "/xls/permission", method = RequestMethod.GET)
+	@ResponseBody
+	public ModelMap exportPermission() {
+		return new ModelMap("success", true);
+	}
+
 	/**
 	 * 导出采购询价单列表(全部)
 	 *

+ 11 - 0
src/main/webapp/resources/js/index/app.js

@@ -4859,6 +4859,17 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 toaster.pop('error', '提示', response.data);
             })
         }
+
+        // 导出
+        $scope.exportXls = function () {
+            PurchaseInquiry.exportXls({}, {}, function (data) {
+                if (data.success){
+                    window.location.href = window.location.origin + '/purc/inquiry/xls?_state='+$scope.active+'&searchFilter='+angular.toJson($scope.searchFilterXls);
+                }
+            }, function (response) {
+                toaster.pop('error', '数据加载失败', response.data);
+            });
+        }
     }]);
 
     // 平台询价单(未提交)

+ 4 - 0
src/main/webapp/resources/js/index/services/Purc.js

@@ -1637,6 +1637,10 @@ define([ 'ngResource'], function() {
 			getUnreadCount:{
 				url: 'sale/inquiry/unread/purc',
 				method: 'GET'
+			},
+			exportXls: {
+				url: 'purc/inquiry/xls/permission',
+				method: 'GET'
 			}
 		});
 	}]);

+ 1 - 1
src/main/webapp/resources/tpl/index/purc/inquiry.html

@@ -305,7 +305,7 @@ margin-left: 55px;
 		<div class="p-right">
 			<a ui-sref="purc.inquiry_unapply" title="待提交"><img src="static/img/icon/wait.png"/>待发布</a>
 			<a ui-sref="purc.inquiry_new" title="新增询价单"><img src="static/img/icon/add.png"/>新增</a>
-			<a href="purc/inquiry/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">