采购询价数据滤状态调整，页面状态更新

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

@@ -303,7 +303,6 @@ public class PurcInquiryController {
             pageInfo.filter("status", Status.REPLIED.value());
             pageInfo.filter("invalid", Constant.NO);
             pageInfo.filter("overdue", Constant.NO);
-            pageInfo.filter("decideStatus", Status.UNAUDIT.value());
             SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
             return detailService.findByPageInfo(pageInfo, keyword, filter);
         } else {
@@ -311,7 +310,6 @@ public class PurcInquiryController {
             // 当前登录企业作为供应商
             pageParams.getFilters().put("id_inid", SystemSession.getUser().getEnterprise().getUu());
             pageParams.getFilters().put("id_status", Status.REPLIED.value());
-            pageParams.getFilters().put("id_decidestatus", Status.UNAUDIT.value());
 			HashMap<String, Object> map = new HashMap<>();
 			map.put("id_invalid", Constant.YES);
 			pageParams.setNotEqualFilters(map);
@@ -338,6 +336,7 @@ public class PurcInquiryController {
             pageInfo.filter("agreed", Constant.YES);
             pageInfo.filter("status", Status.REPLIED.value());
             pageInfo.filter("overdue", Constant.NO);
+			pageInfo.filter("invalid", Constant.NO);
             SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
             SearchFilter distribute = userService.distribute();
             if (distribute != null && distribute.getDistribute() == null) {
@@ -375,6 +374,7 @@ public class PurcInquiryController {
             pageInfo.filter("agreed", Constant.NO);
             pageInfo.filter("status", Status.REPLIED.value());
             pageInfo.filter("overdue", Constant.NO);
+			pageInfo.filter("invalid", Constant.NO);
             SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
             SearchFilter distribute = userService.distribute();
             if (distribute != null && distribute.getDistribute() == null) {

src/main/webapp/resources/tpl/index/purc/inquiry.html

@@ -653,16 +653,16 @@ margin-left: 55px;
 						<a ng-click="accept(inquiryItem.id);setOrdersRead(inquiryItem.id)">采纳</a>
 						<a ng-click="refuse(inquiryItem.id);setOrdersRead(inquiryItem.id)">拒绝</a></div>
 				</div>
-				<div ng-if="inquiryItem.status == 201 && inquiryItem.agreed == null && inquiryItem.invalid == 1" class="block">
+				<div ng-if="inquiryItem.invalid == 1" class="block">
 					<span class="text-trans text-light">已失效</span>
 				</div>
-				<div ng-if="inquiryItem.status == 201 && inquiryItem.agreed == 1" class="block">
+				<div ng-if="inquiryItem.status == 201 && inquiryItem.agreed == 1 && inquiryItem.invalid != 1" class="block">
 					<span class="text-trans success">已采纳</span>
 				</div>
-				<div ng-if="inquiryItem.status == 201 && inquiryItem.agreed == 0" class="block">
+				<div ng-if="inquiryItem.status == 201 && inquiryItem.agreed == 0 && inquiryItem.invalid != 1" class="block">
 					<span class="text-trans error">未采纳</span>
 				</div>
-				<div ng-if="inquiryItem.status == 200">
+				<div ng-if="inquiryItem.status == 200 && inquiryItem.invalid != 1">
 					<span class="text-trans half">未报价</span>
 				</div>
 			</td>