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

src/main/java/com/uas/platform/b2c/external/erp/commodity/service/impl/ProductDetailERPServiceImpl.java

@@ -143,6 +143,8 @@ public class ProductDetailERPServiceImpl implements ProductDetailERPService {
                 }
 
                 products.get(0).setErpReserve(productDetailERP.getReserve());
+                products.get(0).setProduceDate(productDetailERP.getProduceDate());
+                products.get(0).setPrice(productDetailERP.getPrice());
                 productList.add(products.get(0));
             }
         }

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

@@ -216,7 +216,8 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
                 $scope.uasBatchPutOnProperty.editMaxDelivery = $scope.uasBatchPutOnProperty.maxDelivery;
                 $scope.uasBatchPutOnProperty.editMinDelivery = $scope.uasBatchPutOnProperty.minDelivery;
             } else {
-                $scope.uasBatchPutOnProperty.editFluctuateRate = 1;
+				$scope.uasBatchPutOnProperty = {};
+                $scope.uasBatchPutOnProperty.editFluctuateRate = 100;
                 $scope.uasBatchPutOnProperty.editMaxDelivery = 1;
                 $scope.uasBatchPutOnProperty.editMinDelivery = 1;
             }

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

@@ -251,6 +251,7 @@
 	}
 	.search-check .batch-operate .operate-head .check-active {
 		font-weight: normal;
+		height: 40px;
 	}
 	.search-check .batch-operate .operate-content {
 		height: 70px;
@@ -258,10 +259,10 @@
 	}
 	.search-check .batch-operate .operate-content > div {
 		display: inline-block;
-		float: left;
 	}
 	.search-check .batch-operate .operate-content > div:first-child {
-		margin-right: 50px;
+		margin-right: 111px;
+		margin-left: 28px;
 	}
 	.search-check .batch-operate .operate-content > div p {
 		font-weight: bold;
@@ -293,6 +294,18 @@
 	}
 	.search-check .batch-operate .operate-content .batch-sale input {
 		width: 42px;
+		margin-right: 10px;
+	}
+	.search-check .batch-operate .operate-content .batch-sale div .com-btn-submit {
+		margin-right: 10px;
+	}
+	.search-check .batch-operate .operate-content .batch-sale > div {
+		position: relative;
+	}
+	.search-check .batch-operate .operate-content .batch-sale div i {
+		position: absolute;
+		left: 216px;
+		top: 2px;
 	}
 	.search-check .batch-operate .operate-content .batch-date input {
 		width: 56px;
@@ -1615,7 +1628,7 @@
 					<div class="operate-content">
 						<div class="batch-sale">
 							<p><span class="batch-price-title">批量设置销售价：</span><em>1</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()"> %
+							<div><span>销售价 = 近一个月的平均销售价 X </span><input type="number" ng-model="uasBatchPutOnProperty.editFluctuateRate" ng-change="onSalePriceChange()"><i>%</i>
 								<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>

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

@@ -251,6 +251,7 @@
 	}
 	.search-check .batch-operate .operate-head .check-active {
 		font-weight: normal;
+		height: 40px;
 	}
 	.search-check .batch-operate .operate-content {
 		height: 70px;
@@ -258,10 +259,10 @@
 	}
 	.search-check .batch-operate .operate-content > div {
 		display: inline-block;
-		float: left;
 	}
 	.search-check .batch-operate .operate-content > div:first-child {
-		margin-right: 50px;
+		margin-right: 111px;
+		margin-left: 28px;
 	}
 	.search-check .batch-operate .operate-content > div p {
 		font-weight: bold;
@@ -293,10 +294,32 @@
 	}
 	.search-check .batch-operate .operate-content .batch-sale input {
 		width: 42px;
+		margin-right: 10px;
+	}
+	.search-check .batch-operate .operate-content .batch-sale div .com-btn-submit {
+		margin-right: 10px;
+	}
+	.search-check .batch-operate .operate-content .batch-sale > div {
+		position: relative;
+	}
+	.search-check .batch-operate .operate-content .batch-sale div i {
+		position: absolute;
+		left: 216px;
+		top: 2px;
 	}
 	.search-check .batch-operate .operate-content .batch-date input {
 		width: 56px;
 	}
+	/*.search-check .batch-operate .operate-content .batch-sale > div > input::-webkit-outer-spin-button,
+	.search-check .batch-operate .operate-content .batch-sale > div > input::-webkit-inner-spin-button {
+		-webkit-appearance: revert !important;
+		margin: unset !important;
+		opacity: 1 !important;
+		height: auto !important;
+	}*/
+	/*.search-check .batch-operate .operate-content .batch-sale input {
+		-webkit-appearance: textfield !important;
+	}*/
 	.check-input input{
 		display: none;
 	}
@@ -1615,7 +1638,10 @@
 					<div class="operate-content">
 						<div class="batch-sale">
 							<p><span class="batch-price-title">批量设置销售价：</span><em>1</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()"> %
+							<div>
+								<span>销售价 = 近一个月的平均销售价 X </span>
+								<input type="number" ng-model="uasBatchPutOnProperty.editFluctuateRate" ng-change="onSalePriceChange()">
+								<i>%</i>
 								<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>