Merge remote-tracking branch 'origin/2018-0205-replaceProduct-wangdy' into 2018-0205-replaceProduct-wangdy

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductServiceImpl.java

@@ -290,7 +290,7 @@ public class ProductServiceImpl implements ProductService {
             SimpleExpression standard = PredicateUtils.eq("standard", (short) 0, false);
             page.orExpression(standard);
             page.orExpression(logicalExpression);
-            page.sorting("standard", Sort.Direction.DESC);
+            page.sorting("createTime", Sort.Direction.DESC);
         }
 
         if (StringUtils.hasText(keyword)) {

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_materialPersonCtrl.js

@@ -1001,6 +1001,7 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 				updateTagCount();
 				angular.forEach($scope.currenctMaterial, function (material, index) {
 					material.isChoosed = false;
+					material.showMoreReplace = false;
 					material.submitProduct = {
 						brand: {},
 						commponent: {},
@@ -1022,6 +1023,13 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 			})
 		};
 
+		$scope.setProductReplacesByPerson = function (productReplaceList) {
+			Material.setProductReplacesByPerson(productReplaceList , function (data) {
+
+            }, function (response) {
+            })
+        }
+
 		$scope.onSearch = function () {
 			loadDataReload();
 		};

src/main/webapp/resources/view/vendor/forstore/vendor_material_person.html

@@ -2140,34 +2140,14 @@
 							<div>
 								<p>可替代型号：</p>
 								<div class="replace-list">
-									<div class="replace-item">
-										<i>1</i>
-										<span>型号：asjfkahsfha</span>
-										<span>品牌：asjfkahsfha</span>
-									</div>
-									<div class="replace-item">
-										<i>1</i>
-										<span>型号：asjfkahsfha</span>
-										<span>品牌：asjfkahsfha</span>
-									</div>
-									<div class="replace-item">
-										<i>11</i>
-										<span>型号：asjfkahsfha</span>
-										<span>品牌：asjfkahsfha</span>
-									</div>
-									<div class="replace-item">
-										<i>12</i>
-										<span>型号：asjfkahsfha</span>
-										<span>品牌：asjfkahsfha</span>
-									</div>
-									<div class="replace-item">
-										<i>12</i>
-										<span>型号：asjfkahsfha</span>
-										<span>品牌：asjfkahsfha</span>
+									<div class="replace-item" ng-repeat="replace in material.productReplaceList track by replace.detno" ng-if="material.showMoreReplace || (!material.showMoreReplace && replace.detno < 5) ">
+										<i>{{replace.detno}}</i>
+										<span>型号：{{replace.ptrCmpcode}}</span>
+										<span>品牌：{{replace.ptrBranden}}</span>
 									</div>
 								</div>
 								<div class="expand-operate">
-									<a href="">查看更多</a>
+									<a href="" ng-click="material.showMoreReplace = !material.showMoreReplace">查看更多</a>
 								</div>
 							</div>
 						</td>