erp 标准非标展示问题

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

@@ -4,7 +4,7 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 		$rootScope.active = 'vendor_material';
 		document.title = '卖家产品库-优软商城';
 		$scope.tab = 'material';
-		$scope.standard_tab = $stateParams.standardParam ? $stateParams.standardParam : 'unstandard';
+		$scope.standard_tab = $stateParams.standardParam ? $stateParams.standardParam : 'standard';
 		$scope.choosedIds = [];
 		$scope.showTip = true;
 		$scope.resultTip = true;

src/main/webapp/resources/view/vendor/forstore/erp/vendor_material_erp.html

@@ -1576,7 +1576,7 @@
 								<span
 										ng-show="!isBatch" ng-bind="(param.page - 1) * 10 + $index + 1"></span>
 							</td>
-							<td>0</td>
+							<td><span ng-bind="material.erpReserve ? material.erpReserve : 0" title="{{material.erpReserve}}"></span></td>
 							<td>
 								<span ng-if="material.kind" ng-bind="material.kind" title="{{material.kind}}"></span>
 								<span ng-if="!material.kind" ng-bind="material.kinden || '-'" title="{{material.kinden || '-'}}"></span>

src/main/webapp/resources/view/vendor/forstore/erp/vendor_material_unstandard_erp.html

@@ -1576,7 +1576,7 @@
 								<span
 										ng-show="!isBatch" ng-bind="(param.page - 1) * 10 + $index + 1"></span>
 							</td>
-							<td>0</td>
+							<td><span ng-bind="material.erpReserve ? material.erpReserve : 0" title="{{material.erpReserve}}"></span></td>
 							<td>
 								<span ng-if="material.kind" ng-bind="material.kind" title="{{material.kind}}"></span>
 								<span ng-if="!material.kind" ng-bind="material.kinden || '-'" title="{{material.kinden || '-'}}"></span>

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

@@ -1500,8 +1500,8 @@
 		</div>
 		<div class="com_tab">
 			<ul class="fl distance" style="width: 100%">
-				<li ng-class="{active : standard_tab == 'unstandard'}"  ng-click="toggleStandard('unstandard')" title="非标产品({{nCount}})"><a href="" class="standard">非标产品(<em class="count">{{nCount}}</em>)</a></li>
 				<li ng-class="{active : standard_tab =='standard'}" ng-click="toggleStandard('standard')" title="标准产品({{sCount}})"><a href="" class="standard">标准产品(<em class="count">{{sCount}}</em>)</a></li>
+				<li ng-class="{active : standard_tab == 'unstandard'}"  ng-click="toggleStandard('unstandard')" title="非标产品({{nCount}})"><a href="" class="standard">非标产品(<em class="count">{{nCount}}</em>)</a></li>
 			</ul>
 			<!--匹配结果导航-->
 			<div class="match-menu" ng-if="resultFrame">