主动报价，已采纳未采纳数据同步到商务平台

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

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

@@ -162,7 +162,6 @@ public class SaleQuotationController {
 		HashMap<String, Object> map = new HashMap<>();
 		map.put("qu_overdue", Constant.NO); // 未过报价截至有效期
 		pageParams.setNotEqualFilters(map);
-		pageParams.getFilters().put("qu_status", Status.SUBMITTED.value());
 		pageParams.getFilters().put("qu_agreed", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("qu_id", false, Type.LONG, new Long(1)));
@@ -199,7 +198,6 @@ public class SaleQuotationController {
 		HashMap<String, Object> map = new HashMap<>();
 		map.put("qu_overdue", Constant.NO); // 未过报价截至有效期
 		pageParams.setNotEqualFilters(map);
-		pageParams.getFilters().put("qu_status", Status.SUBMITTED.value());
 		pageParams.getFilters().put("qu_agreed", Constant.NO);
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("qu_id", false, Type.LONG, new Long(1)));
@@ -357,7 +355,6 @@ public class SaleQuotationController {
 		}
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
-		pageInfo.filter("status", Status.SUBMITTED.value());
 		pageInfo.filter("agreed", Constant.YES);
 		pageInfo.filter("overdue", Constant.NO);
 		return saleQuotationService.findAllDetailByPageInfo(pageInfo, null, filter);
@@ -388,7 +385,6 @@ public class SaleQuotationController {
 		}
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
-		pageInfo.filter("status", Status.SUBMITTED.value());
 		pageInfo.filter("agreed", Constant.NO);
 		pageInfo.filter("overdue", Constant.NO);
 		return saleQuotationService.findAllDetailByPageInfo(pageInfo, null, filter);

src/main/java/com/uas/platform/b2b/model/SaleQuotationDone.java

@@ -29,7 +29,7 @@ import org.hibernate.annotations.Where;
  * 
  */
 @Table(name = "v$sale$quotation")
-@Where(clause = "qu_status = 101 or qu_status = 311")
+@Where(clause = "(qu_status = 101 or qu_status = 311) and qu_agreed is null")
 @Entity
 public class SaleQuotationDone implements Serializable {
 

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

@@ -275,16 +275,19 @@
 				<div ng-if="quotationItem.status == 101 && quotationItem.quotationItems[0].agreed == null && quotationItem.overdue != 1" class="block">
 					<span class="text-trans warning">已提交</span>
 				</div>
+				<div ng-if="quotationItem.status == 311 && quotationItem.quotationItems[0].agreed == null && quotationItem.overdue != 1" class="block">
+					<span class="text-trans warning">正在审批...</span>
+				</div>
 				<div ng-if="quotationItem.status == 101 && quotationItem.overdue == 1" class="block">
 					<span class="text-trans text-muted">已过期</span>
 				</div>
 				<div ng-if="quotationItem.status == 314" class="block">
 					<span class="text-trans text-light">已作废</span>
 				</div>
-				<div ng-if="quotationItem.status == 101 && quotationItem.quotationItems[0].agreed == 1 && quotationItem.overdue != 1" class="block">
+				<div ng-if=" quotationItem.quotationItems[0].agreed == 1 && quotationItem.overdue != 1" class="block">
 					<span class="text-trans success">报价已采纳</span>
 				</div>
-				<div ng-if="quotationItem.status == 101 && quotationItem.quotationItems[0].agreed == 0 && quotationItem.overdue != 1" class="block">
+				<div ng-if="quotationItem.quotationItems[0].agreed == 0 && quotationItem.overdue != 1" class="block">
 					<span class="text-trans error">报价未采纳</span>
 				</div>
 				<div ng-if="quotationItem.status == 100">