Merge branch 'feature/yc-erp_unstandard-0102' into dev-mysql

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

@@ -47,13 +47,6 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 		};
 
 		$scope.goods = { editBreakUp: false, editSelfSale: 2, editPrices: [{}] };
-		if ($location.$$path.endsWith('vendor_material_unstandard_erp')) {
-			$scope.tab = 'unstandard_material';
-			// $scope.standard_tab = 'unstandard';
-            $scope.param.type = "nStandard";
-            // $scope.param.sorting = {code : 'ASC'};
-            $scope.isBatch = false;
-		}
 
         $scope.sortByERP = 'none';
         $scope.sortByERPReserve = function () {
@@ -1046,6 +1039,19 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 			loadData();
 		};
 
+		var init = function () {
+			$scope.param.keyword = '';
+			if ($scope.standard_tab == 'standard') {
+				$scope.param.type = "standard";
+			} else if ($scope.standard_tab == 'unstandard') {
+				$scope.param.type = "nStandard";
+			}
+			$scope.isBatch = false;
+			$scope.param.count = 10;
+		};
+
+		init();
+
 		loadData();
 
 		var saveNoSaleInfo = function (product) {

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

@@ -512,9 +512,9 @@
     <div class="pro_management device">
         <div class="com_tab">
             <ul class="fl" style="width: 100%">
-                <li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material_erp">可上架产品</a></li>
-                <li ng-class="{'active': tab == 'unstandard_material'}"><a ui-sref="vendor_material_unstandard_erp">暂不可上架产品</a></li>
-                <li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale_erp">已上架</a></li>
+                <li ng-class="{'active': tab == 'material'}"><a ui-sref="vendor_material_erp">标准产品</a></li>
+                <li ng-class="{'active': tab == 'unstandard_material'}"><a ui-sref="vendor_material_unstandard_erp">非标产品</a></li>
+                <li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale_erp">在售产品</a></li>
                 <li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage_erp">上下架历史</a></li>
                 <li class="down-goods">
                     <!--<span ng-click="downGoods()">

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

@@ -539,9 +539,9 @@
     <div class="pro_management device">
         <div class="com_tab">
             <ul class="fl" style="width: 100%">
-                <li ng-class="{'active': tab == 'vendor_material'}"><a ui-sref="vendor_material_erp">可上架产品</a></li>
-                <li ng-class="{'active': tab == 'unstandard_material'}"><a ui-sref="vendor_material_unstandard_erp">暂不可上架产品</a></li>
-                <li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale_erp">已上架</a></li>
+                <li ng-class="{'active': tab == 'vendor_material'}"><a ui-sref="vendor_material_erp">标准产品</a></li>
+                <li ng-class="{'active': tab == 'unstandard_material'}"><a ui-sref="vendor_material_unstandard_erp">非标产品</a></li>
+                <li ng-class="{'active': tab == 'onSale'}"><a ui-sref="vendor_onSale_erp">在售产品</a></li>
                 <li ng-class="{'active': tab == 'undercarriage'}"><a ui-sref="vendor_undercarriage_erp">上下架历史</a></li>
             </ul>
         </div>