Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

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

@@ -212,9 +212,9 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
         UASBatchPutOnPropertyServices.get(null, function (data) {
             if (data) {
                 $scope.uasBatchPutOnProperty = data;
-                $scope.uasBatchPutOnProperty.editFluctuateRate = $scope.uasBatchPutOnProperty.fluctuateRate * 100;
-                $scope.uasBatchPutOnProperty.editMaxDelivery = $scope.uasBatchPutOnProperty.maxDelivery;
-                $scope.uasBatchPutOnProperty.editMinDelivery = $scope.uasBatchPutOnProperty.minDelivery;
+                $scope.uasBatchPutOnProperty.editFluctuateRate = NumberService.mul($scope.uasBatchPutOnProperty.fluctuateRate, 100) || 100;
+                $scope.uasBatchPutOnProperty.editMaxDelivery = $scope.uasBatchPutOnProperty.maxDelivery || 1;
+                $scope.uasBatchPutOnProperty.editMinDelivery = $scope.uasBatchPutOnProperty.minDelivery || 1;
             } else {
 				$scope.uasBatchPutOnProperty = {};
                 $scope.uasBatchPutOnProperty.editFluctuateRate = 100;
@@ -2020,10 +2020,11 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 			UASBatchPutOnPropertyServices.save(null, $scope.uasBatchPutOnProperty, function (data) {
 				if (data.code == 1) {
 					$scope.uasBatchPutOnProperty = data.data;
-					$scope.uasBatchPutOnProperty.editFluctuateRate =  $scope.uasBatchPutOnProperty.fluctuateRate * 100;
+					$scope.uasBatchPutOnProperty.editFluctuateRate =  NumberService.mul($scope.uasBatchPutOnProperty.fluctuateRate, 100);
 					$scope.uasBatchPutOnProperty.editMinDelivery = $scope.uasBatchPutOnProperty.minDelivery;
 					$scope.uasBatchPutOnProperty.editMaxDelivery = $scope.uasBatchPutOnProperty.maxDelivery;
 					toaster.pop('success', '成功', "保存成功");
+					$scope.isBatch = false;
 				} else {
 					toaster.pop('error', '失败', data.message);
 				}

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

@@ -295,6 +295,7 @@
 	.search-check .batch-operate .operate-content .batch-sale input {
 		width: 42px;
 		margin-right: 10px;
+		padding-right: 10px;
 	}
 	.search-check .batch-operate .operate-content .batch-sale div .com-btn-submit {
 		margin-right: 10px;

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

@@ -295,6 +295,7 @@
 	.search-check .batch-operate .operate-content .batch-sale input {
 		width: 42px;
 		margin-right: 10px;
+		padding-right: 10px;
 	}
 	.search-check .batch-operate .operate-content .batch-sale div .com-btn-submit {
 		margin-right: 10px;