主动报价获取数据方式进行更新

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@9775 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

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

@@ -212,16 +212,16 @@ public class SaleQuotationController {
 		SearchFilter filters = JSONObject.parseObject(searchFilter, SearchFilter.class);
 		filter.setEndDate(filters.getEndDate());
 		filter.setFromDate(filters.getFromDate());
-		SearchFilter disfilter = userService.distribute();
-		if (filter != null && filter.getDistribute() == null) {
-			return null;
-		} else {
-			filter.setDistribute(disfilter.getDistribute());
-		}
+		// SearchFilter disfilter = userService.distribute();
+		// if (filter != null && filter.getDistribute() == null) {
+		// return null;
+		// } else {
+		// filter.setDistribute(disfilter.getDistribute());
+		// }
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 		pageInfo.filter("status", Status.INPUTTING.value());
-		return saleQuotationService.findAllDetailByPageInfo(pageInfo, null, filters);
+		return saleQuotationService.findAllDetailByPageInfo(pageInfo, filters.getKeyword(), filter);
 	}
 
 	/**
@@ -240,11 +240,11 @@ public class SaleQuotationController {
 		filter.setEndDate(filters.getEndDate());
 		filter.setFromDate(filters.getFromDate());
 		SearchFilter disfilter = userService.distribute();
-		if (filter != null && filter.getDistribute() == null) {
-			return null;
-		} else {
-			filter.setDistribute(disfilter.getDistribute());
-		}
+		// if (filter != null && filter.getDistribute() == null) {
+		// return null;
+		// } else {
+		// filter.setDistribute(disfilter.getDistribute());
+		// }
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 		pageInfo.filter("status", Status.SUBMITTED.value());
@@ -267,11 +267,11 @@ public class SaleQuotationController {
 		filter.setEndDate(filters.getEndDate());
 		filter.setFromDate(filters.getFromDate());
 		SearchFilter disfilter = userService.distribute();
-		if (filter != null && filter.getDistribute() == null) {
-			return null;
-		} else {
-			filter.setDistribute(disfilter.getDistribute());
-		}
+		// if (filter != null && filter.getDistribute() == null) {
+		// return null;
+		// } else {
+		// filter.setDistribute(disfilter.getDistribute());
+		// }
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 		pageInfo.filter("overdue", Constant.YES);
@@ -294,11 +294,11 @@ public class SaleQuotationController {
 		filter.setEndDate(filters.getEndDate());
 		filter.setFromDate(filters.getFromDate());
 		SearchFilter disfilter = userService.distribute();
-		if (filter != null && filter.getDistribute() == null) {
-			return null;
-		} else {
-			filter.setDistribute(disfilter.getDistribute());
-		}
+		// if (filter != null && filter.getDistribute() == null) {
+		// return null;
+		// } else {
+		// filter.setDistribute(disfilter.getDistribute());
+		// }
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 		return saleQuotationService.findAllDetailByPageInfo(pageInfo, null, filter);

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

@@ -4922,7 +4922,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			page : 1, 
 			count : 20,
 			sorting: {
-                'quotation.date': 'desc'
+                'date': 'desc'
             }
 		}, {
 			total : 0,