修改模具询价单过滤条件，之前会出现未报价已作废的单据，会同时显示在待报价和已作废状态下。

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

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

@@ -122,6 +122,7 @@ public class SaleInquiryMouldController {
 		}
 		pageParams.getFilters().put("im_status", Status.NOT_REPLY.value());
 		pageParams.getFilters().put("im_overdue", Constant.NO);
+		pageParams.getFilters().put("im_valid", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("im_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
@@ -154,6 +155,7 @@ public class SaleInquiryMouldController {
 		}
 		pageParams.getFilters().put("im_status", Status.NOT_REPLY.value());
 		pageParams.getFilters().put("im_overdue", Constant.YES);
+		pageParams.getFilters().put("im_valid", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("im_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
@@ -216,7 +218,6 @@ public class SaleInquiryMouldController {
 			}
 			pageParams.getFilters().put("im_enuu", new MultiValue(list, true));
 		}
-		pageParams.getFilters().put("im_status", Status.REPLIED.value());
 		pageParams.getFilters().put("im_valid", Constant.NO);
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("im_id", false, Type.LONG, new Long(1)));

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

@@ -358,7 +358,7 @@ tbody td div.text-mould {
 						<!-- <a ng-click="print(inquiryMould)" class="text-muted" title="打印"><i
 							class="fa fa-print fa-lg"></i></a> -->
 							<!-- 待报价 -->
-						<div ng-if="inquiryMould.status == 200 && inquiryMould.overdue != 1 && inquiryMould.adoptStatus == null">
+						<div ng-if="inquiryMould.status == 200 && inquiryMould.overdue != 1 && inquiryMould.adoptStatus == null && inquiryMould.valid != 0">
 							<div ng-if="inquiryMould.overdue == 0">
 								<span ng-show="!inquiryMould.$editing">
 									<a ng-click="inquiryMould.$editing=!inquiryMould.$editing">报价</a>

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

@@ -213,7 +213,7 @@ tbody td .text-waiting {
 		</div>
 	</div>
 </div>
-<div ng-if="inquiryMould.status == 200 && inquiryMould.overdue != 1 && inquiryMould.adoptStatus == null">
+<div ng-if="inquiryMould.status == 200 && inquiryMould.overdue != 1 && inquiryMould.adoptStatus == null && inquiryMould.valid != 0">
 	<div class="text-center btn-items" ng-show="!inquiryMould.$editing">
 		<button class="btn btn-success btn-items" 
 			ng-click="inquiryMould.$editing=!inquiryMould.$editing">