修复了客户模具询价管理，界面上的更过筛选条件，操作无效果bug

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

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

@@ -5,6 +5,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.http.HttpStatus;
@@ -74,9 +76,11 @@ public class SaleInquiryMouldController {
 	 */
 	@RequestMapping(method = RequestMethod.GET)
 	@ResponseBody
-	public SPage<PurchaseInquiryMould> getReceivedMouldInquiries(PageParams params, String keyword) {
+	public SPage<PurchaseInquiryMould> getReceivedMouldInquiries(PageParams params, String searchFilter) {
 		logger.log("客户模具询价单", "查看收到的客户模具询价单列表（全部）");
-		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		JSONObject jsonObject = JSONObject.parseObject(searchFilter);
+		String keyword = jsonObject.getString("keyword");
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("im_venduu", SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = userService.distribute();
@@ -104,9 +108,11 @@ public class SaleInquiryMouldController {
 	 */
 	@RequestMapping(params = RequestState.TODO, method = RequestMethod.GET)
 	@ResponseBody
-	public SPage<PurchaseInquiryMould> getTodoInquiryMould(PageParams params, String keyword) {
+	public SPage<PurchaseInquiryMould> getTodoInquiryMould(PageParams params, String searchFilter) {
 		logger.log("客户模具询价单", "查看收到的客户模具询价单列表（待回复）");
-		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		JSONObject jsonObject = JSON.parseObject(searchFilter);
+		String keyword = jsonObject.getString("keyword");
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("im_venduu", SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = userService.distribute();
@@ -137,9 +143,11 @@ public class SaleInquiryMouldController {
 	 */
 	@RequestMapping(params = RequestState.END, method = RequestMethod.GET)
 	@ResponseBody
-	public SPage<PurchaseInquiryMould> getEndInquiryMould(PageParams params, String keyword) {
+	public SPage<PurchaseInquiryMould> getEndInquiryMould(PageParams params, String searchFilter) {
 		logger.log("客户模具询价单", "查看收到的客户模具询价单列表（已过期）");
-		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		JSONObject jsonObject = JSON.parseObject(searchFilter);
+		String keyword = jsonObject.getString("keyword");
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("im_venduu", SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = userService.distribute();
@@ -170,9 +178,11 @@ public class SaleInquiryMouldController {
 	 */
 	@RequestMapping(params = RequestState.DONE, method = RequestMethod.GET)
 	@ResponseBody
-	public SPage<PurchaseInquiryMould> getDoneInquiryMould(PageParams params, String keyword) {
+	public SPage<PurchaseInquiryMould> getDoneInquiryMould(PageParams params, String searchFilter) {
 		logger.log("客户模具询价单", "查看收到的客户模具询价单列表（已回复）");
-		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		JSONObject jsonObject = JSON.parseObject(searchFilter);
+		String keyword = jsonObject.getString("keyword");
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("im_venduu", SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = userService.distribute();
@@ -202,9 +212,11 @@ public class SaleInquiryMouldController {
 	 */
 	@RequestMapping(params = RequestState.INVALID, method = RequestMethod.GET)
 	@ResponseBody
-	public SPage<PurchaseInquiryMould> getInvalidInquiryMould(PageParams params, String keyword) {
+	public SPage<PurchaseInquiryMould> getInvalidInquiryMould(PageParams params, String searchFilter) {
 		logger.log("客户模具询价单", "查看收到的客户模具询价单列表（已回复）");
-		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
+		JSONObject jsonObject = JSON.parseObject(searchFilter);
+		String keyword = jsonObject.getString("keyword");
+		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, searchFilter);
 		// 当前登录企业作为供应商
 		pageParams.getFilters().put("im_venduu", SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = userService.distribute();

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

@@ -4216,6 +4216,31 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 	// 模具询价管理 
 	app.controller('SaleInquiryMouldCtrl',['$scope', '$filter', 'PurcInquiryMould', 'ngTableParams', 'toaster', 'BaseService', '$upload', function($scope, $filter, PurcInquiryMould, ngTableParams, toaster, BaseService, $upload){
 		BaseService.scrollBackToTop();
+        /**
+         * 改变单据日期范围
+         */
+        var getTenderDateCondition = function(zone, condition) {
+            var date = new Date();
+            if(zone == -1) {
+                condition.dateFrom = null;
+                condition.dateTo = null;
+            } else if(zone == 1) { // 一个月内
+                date.setMonth(date.getMonth() - 1);
+                condition.dateFrom = date;
+                condition.dateTo = new Date();
+            } else if (zone == 6) { // 半年内
+                date.setMonth(date.getMonth() - 6);
+                condition.dateFrom = date;
+                condition.dateTo = new Date();
+            } else if (zone == -6) { // 半年前
+                date.setMonth(date.getMonth() - 6);
+                condition.dateFrom = null;
+                condition.dateTo = date;
+            } else {  // 无效zone，转为查找全部
+                condition.dateFrom = null;
+                condition.dateTo = null;
+            }
+        };
 		$scope.active = 'todo';
 		$scope.agreedText = '全部';
 		$scope.dateZoneText = '不限';
@@ -4228,8 +4253,11 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		};
 		$scope.changeDateZone = function(zone) {
 			$scope.condition.dateZone = zone;
-			$scope.dateZoneText = typeof zone == 'undefined' ? '半年前' : (zone == 1 ? '一个月内' : '半年内');
+			$scope.dateZoneText = zone == -6 ? '半年前' : (zone == 1 ? '一个月内' : '半年内');
 			$scope.condition.$dateZoneOpen = false;
+            $scope.condition.dateZone = zone;
+            getTenderDateCondition(zone, $scope.condition);
+            $scope.tableParams.reload();
 		};
 		
 		$scope.setActive = function(state) {
@@ -4257,7 +4285,11 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				$scope.loading = true;
 				var pageParams = params.url();
 				var realActive = {};
-				pageParams.keyword = $scope.keyword;
+				pageParams.searchFilter = {
+                    keyword: $scope.keyword,
+                    fromDate: getDateTime($scope.condition.dateFrom),
+                    endDate: getDateTime($scope.condition.dateTo)
+                };
 				getService()[getState($scope.active)].call(null, BaseService.parseParams(pageParams), function(page){
 					$scope.loading = false;
 					// 用来验证价格修改

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

@@ -244,7 +244,7 @@ tbody td div.text-mould {
 							<ul class="dropdown-menu">
 								<li><a ng-click="changeDateZone(1)">一个月内</a></li>
 								<li><a ng-click="changeDateZone(6)">半年内</a></li>
-								<li><a ng-click="changeDateZone()">半年前</a></li>
+								<li><a ng-click="changeDateZone(-6)">半年前</a></li>
 							</ul>
 						</div>
 						<div class="form-group input-group input-group-xs input-trigger">