客户采购询价单、样品认定单过滤条件修改。认定单界面选项样式调整。

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

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

@@ -2,10 +2,7 @@ package com.uas.platform.b2b.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.uas.platform.b2b.erp.model.Inquiry;
-import com.uas.platform.b2b.mobile.model.InquiryItem;
 import com.uas.platform.b2b.model.FileUpload;
-import com.uas.platform.b2b.model.PurcInquiryItemInfo;
 import com.uas.platform.b2b.model.PurchaseInquiryItem;
 import com.uas.platform.b2b.model.SearchFilter;
 import com.uas.platform.b2b.search.SearchService;
@@ -17,7 +14,6 @@ import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.b2b.temporary.model.InquiryMessage;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.platform.core.model.Constant;
-import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.platform.core.model.Status;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
@@ -28,7 +24,6 @@ import com.uas.search.b2b.model.Sort;
 import com.uas.search.b2b.model.Sort.Type;
 import com.uas.search.b2b.util.SearchConstants;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort.Direction;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
@@ -41,7 +36,6 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 卖家对询价单的操作
@@ -287,6 +281,7 @@ public class SaleInquiryController {
 			pageParams.getFilters().put("id_inid", new MultiValue(list, true));
 		}
 		pageParams.getFilters().put("id_agreed", Constant.YES);
+		pageParams.getFilters().put("id_status", Status.REPLIED.value());
 		HashMap<String, Object> map = new HashMap<>();
 		map.put("id_invalid", Constant.YES);
 		pageParams.setNotEqualFilters(map);
@@ -323,6 +318,7 @@ public class SaleInquiryController {
 			pageParams.getFilters().put("id_inid", new MultiValue(list, true));
 		}
 		pageParams.getFilters().put("id_agreed", Constant.NO);
+		pageParams.getFilters().put("id_status", Status.REPLIED.value());
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("id_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);

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

@@ -26,6 +26,7 @@ import org.springframework.data.domain.Sort.Direction;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -303,6 +304,9 @@ public class SaleSampleController {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		pageParams.getFilters().put("psa_venduu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("psa_finalresult", "合格");
+		ModelMap map = new ModelMap();
+		map.put("psa_finalresult", "不合格");
+		pageParams.setNotEqualFilters(map);
 		SearchFilter filter = userService.distribute();
 		if (filter != null && filter.getDistribute() == null) {
 			return null;

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

@@ -538,7 +538,7 @@ define([ 'ngResource'], function() {
 		return $resource('sale/sample/approval/:id', {}, {
 			getItem: {
 				url: 'sale/sample/approval/:id',
-				method: 'GET',
+				method: 'GET'
 			},
 			getAgreed: {
                 params: {

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

@@ -146,11 +146,11 @@
 					</div>
 					<div class="btn-group btn-group-sm">
 						<button type="button" class="btn btn-default btn-line"
-								ng-class="{'btn-info':active=='done'}" ng-click="setActive('agreed')">合格</button>
+								ng-class="{'btn-info':active=='agreed'}" ng-click="setActive('agreed')">合格</button>
 					</div>
 					<div class="btn-group btn-group-sm">
 						<button type="button" class="btn btn-default btn-line"
-								ng-class="{'btn-info':active=='todo'}" ng-click="setActive('refused')">不合格</button>
+								ng-class="{'btn-info':active=='refused'}" ng-click="setActive('refused')">不合格</button>
 					</div>
 				</div>
 			</div>