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

@@ -2068,7 +2068,6 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 					$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

@@ -180,6 +180,7 @@
 	.search-check .search{
 		width: 550px;
 		margin-left: 150px;
+		margin-bottom: 10px;
 	}
 	.search-check .search .form-control{
 		width: 340px;

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

@@ -180,6 +180,7 @@
 	.search-check .search{
 		width: 550px;
 		margin-left: 150px;
+		margin-bottom: 10px;
 	}
 	.search-check .search .form-control{
 		width: 340px;