Merge branch 'erp_batchToGoods_20180117' of ssh://10.10.100.21/source/platform-b2c into erp_batchToGoods_20180117

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

@@ -19,17 +19,17 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 
 		$scope.$$nonProduct.enterBatchPutOnPropertySaveButton = false;
 
-		$scope.salePrice = 0;
+		// $scope.salePrice = 0;
 
 		$scope.setSalePrice = function (price) {
-			$scope.salePrice = price;
+			$scope.uasBatchPutOnProperty.editFluctuateRate = price;
 		}
 
 		$scope.onSalePriceChange = function (salePrice) {
-			if (salePrice < 0) {
-				$scope.salePrice = 0;
-			} else if (salePrice > 200) {
-				$scope.salePrice = 200;
+			if ($scope.uasBatchPutOnProperty.editFluctuateRate < 0) {
+				$scope.uasBatchPutOnProperty.editFluctuateRate = 0;
+			} else if ($scope.uasBatchPutOnProperty.editFluctuateRate > 200) {
+				$scope.uasBatchPutOnProperty.editFluctuateRate = 200;
 			}
 		}
 

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

@@ -1614,7 +1614,7 @@
 					</div>
 					<div class="operate-content">
 						<div class="batch-sale">
-							<p><span class="batch-price-title">批量设置销售价：</span><em>0</em><span class="batch-progress"><i style="left: {{salePrice ? salePrice > 200 ? '100%' : salePrice / 2 + '%' : 0}}"></i></span><em>200</em></p>
+							<p><span class="batch-price-title">批量设置销售价：</span><em>0</em><span class="batch-progress"><i style="left: {{uasBatchPutOnProperty.editFluctuateRate ? uasBatchPutOnProperty.editFluctuateRate > 200 ? '100%' : uasBatchPutOnProperty.editFluctuateRate / 2 + '%' : 0}}"></i></span><em>200</em></p>
 							<div><span>销售价 = 近一个月的平均销售价 X </span><input type="number" ng-model="uasBatchPutOnProperty.editFluctuateRate" ng-change="onSalePriceChange()"> %
 								<span class="com-btn-level2 com-btn-submit" ng-click="setSalePrice(100)">100%</span>
 								<span class="com-btn-level2 com-btn-submit" ng-click="setSalePrice(120)">120%</span>

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

@@ -1614,8 +1614,8 @@
 					</div>
 					<div class="operate-content">
 						<div class="batch-sale">
-							<p><span class="batch-price-title">批量设置销售价：</span><em>0</em><span class="batch-progress"><i style="left: {{salePrice ? salePrice > 200 ? '100%' : salePrice / 2 + '%' : 0}}"></i></span><em>200</em></p>
-							<div><span>销售价 = 近一个月的平均销售价 X </span><input type="number" ng-model="salePrice" ng-change="onSalePriceChange()"> %
+							<p><span class="batch-price-title">批量设置销售价：</span><em>0</em><span class="batch-progress"><i style="left: {{uasBatchPutOnProperty.editFluctuateRate ? uasBatchPutOnProperty.editFluctuateRate > 200 ? '100%' : uasBatchPutOnProperty.editFluctuateRate / 2 + '%' : 0}}"></i></span><em>200</em></p>
+							<div><span>销售价 = 近一个月的平均销售价 X </span><input type="number" ng-model="uasBatchPutOnProperty.editFluctuateRate" ng-change="onSalePriceChange()"> %
 								<span class="com-btn-level2 com-btn-submit" ng-click="setSalePrice(100)">100%</span>
 								<span class="com-btn-level2 com-btn-submit" ng-click="setSalePrice(120)">120%</span>
 								<span class="com-btn-level2 com-btn-submit" ng-click="setSalePrice(130)">130%</span>