搜索过滤条件修改

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

@@ -69,12 +69,14 @@ public class PurcOrderChangeController {
         com.uas.search.b2b.model.PageParams params = searchService.convertPageParams(pageParams, searchFilter);
         if (!StringUtils.isEmpty(filter.getKeyword())) {
             params.getFilters().put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
+            params.getFilters().put("pu_source", "B2B");
             List<Sort> sortList = new ArrayList<>();
             sortList.add(new Sort("pu_id", false, Sort.Type.LONG, new Long(1)));
             params.getFilters().put(SearchConstants.SORT_KEY, sortList);
             return searchService.findEnableToChange(filter.getKeyword(), params);
         } else {
             pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
+            params.getFilters().put("pu_source", "B2B");
             return orderChangeService.findEnableToChange(pageInfo, filter);
         }
 

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

@@ -279,7 +279,7 @@ public class PurchaseOrderAll {
     private Long auId;
 
 	/**
-	 * 订单来源
+	 * 订单来源(UAS,B2B)
 	 */
 	@Column(name = "pu_source")
 	private String source;

src/main/java/com/uas/platform/b2b/service/impl/BaseInfoServiceImpl.java

@@ -552,6 +552,7 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 			userBaseInfo = userBaseInfos.get(0);
 		}
 		// 主记录
+		order.setSource("B2B");
 		order.setCode(neworder.getCode());
 		order.setDate(neworder.getDate());
 		order.setEnUU(SystemSession.getUser().getEnterprise().getUu());

src/main/java/com/uas/platform/b2b/service/impl/CartServiceImpl.java

@@ -75,6 +75,7 @@ public class CartServiceImpl implements CartService {
 	public ModelMap addToOrder(Long id) {
 		ModelMap map = new ModelMap();
 		PurchaseOrderAll purcOrder = purchaseOrderAllDao.findOne(id);
+		purcOrder.setSource("B2B");
 		purcOrder.setType("平台采购");
 		purcOrder.setSendStatus((short) Status.NOT_UPLOAD.value());
 		purcOrder.setStatus((short) Status.NOT_REPLY.value());

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

@@ -299,7 +299,7 @@
 		<tr class="order-bd" ng-repeat="item in ::change.orderChangeItems">
 			<td class="product">
 				<div>
-					<span class="text-num text-bold" ng-class="{'text-inverse'}" ng-bind="::item.oldProduct.code"></span><span class="text-muted">（型号）</span>
+					<span class="text-num text-bold"  ng-bind="::item.oldProduct.code"></span><span class="text-muted">（型号）</span>
 					<span class="text-light">&nbsp;&nbsp;&nbsp;订单第 <span class="text-num">{{::item.orderItemNumber}}</span> 行</span>
 				</div>
 				<!--<div>-->
@@ -310,7 +310,7 @@
 				</div>
 				<!--<div><span ng-bind="::item.oldProduct.title"></span></div>-->
 				<div>
-					<span ng-class="{'text-inverse'}" ng-bind="::item.oldProduct.spec"></span><span class="text-muted">（规格）</span>
+					<span ng-bind="::item.oldProduct.spec"></span><span class="text-muted">（规格）</span>
 				</div>
 				<!--<div><span class="text-muted" ng-bind="::item.oldProduct.spec"></span></div>-->
 			</td>