Browse Source

erp产品管理页面修改

yangc 8 years ago
parent
commit
85ee857fd4

+ 12 - 7
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,18 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 			loadData();
 		};
 
+		$scope.init = function () {
+			$scope.param.keyword = '';
+			if ($scope.standard_tab == 'standard')
+				$scope.param.type = "standard";
+			if ($scope.standard_tab == 'unstandard')
+				$scope.param.type = "nStandard";
+			$scope.isBatch = false;
+			$scope.param.count = 10;
+		};
+
+		$scope.init();
+
 		loadData();
 
 		var saveNoSaleInfo = function (product) {

File diff suppressed because it is too large
+ 1727 - 293
src/main/webapp/resources/view/vendor/forstore/erp/vendor_material_erp.html


File diff suppressed because it is too large
+ 1736 - 320
src/main/webapp/resources/view/vendor/forstore/erp/vendor_material_unstandard_erp.html


Some files were not shown because too many files changed in this diff