Browse Source

调整ERP批量上架的逻辑。

yujia 8 years ago
parent
commit
20da0395fb

+ 2 - 2
src/main/webapp/resources/js/vendor/controllers/forstore/vendor_materialCtrl.js

@@ -26,8 +26,8 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 		}
 
 		$scope.onSalePriceChange = function (salePrice) {
-			if ($scope.uasBatchPutOnProperty.editFluctuateRate < 0) {
-				$scope.uasBatchPutOnProperty.editFluctuateRate = 0;
+			if ($scope.uasBatchPutOnProperty.editFluctuateRate < 1) {
+				$scope.uasBatchPutOnProperty.editFluctuateRate = 1;
 			} else if ($scope.uasBatchPutOnProperty.editFluctuateRate > 200) {
 				$scope.uasBatchPutOnProperty.editFluctuateRate = 200;
 			}

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

@@ -1608,13 +1608,13 @@
 						<div class="fr">
 							<span class="com-btn-level1 com-btn-submit" ng-click="batchPutOn()">上架</span>
 							<span class="com-btn-level1 com-btn-submit" ng-mouseenter="enterBatchPutOnPropertySaveButton()" ng-mouseleave="leaveBatchPutOnPropertySaveButton()" ng-click="saveBatchPutOnProperty()">保存</span>
-							<span class="com-btn-level1 com-btn-red">删除</span>
+							<span class="com-btn-level1 com-btn-red" ng-click="deleteBatch()">删除</span>
 							<span class="com-btn-level1 com-btn-cancel" ng-click="exitBatch()">取消</span>
 						</div>
 					</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: {{uasBatchPutOnProperty.editFluctuateRate ? uasBatchPutOnProperty.editFluctuateRate > 200 ? '100%' : uasBatchPutOnProperty.editFluctuateRate / 2 + '%' : 0}}"></i></span><em>200</em></p>
+							<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()"> %
 								<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>

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

@@ -1606,15 +1606,15 @@
 							<span>全选</span>
 						</label>
 						<div class="fr">
-							<span class="com-btn-level1 com-btn-submit">上架</span>
-							<span class="com-btn-level1 com-btn-submit">保存</span>
-							<span class="com-btn-level1 com-btn-red">删除</span>
+							<span class="com-btn-level1 com-btn-submit" ng-click="batchPutOn()">上架</span>
+							<span class="com-btn-level1 com-btn-submit" ng-mouseenter="enterBatchPutOnPropertySaveButton()" ng-mouseleave="leaveBatchPutOnPropertySaveButton()" ng-click="saveBatchPutOnProperty()">保存</span>
+							<span class="com-btn-level1 com-btn-red" ng-click="deleteBatch()">删除</span>
 							<span class="com-btn-level1 com-btn-cancel" ng-click="exitBatch()">取消</span>
 						</div>
 					</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: {{uasBatchPutOnProperty.editFluctuateRate ? uasBatchPutOnProperty.editFluctuateRate > 200 ? '100%' : uasBatchPutOnProperty.editFluctuateRate / 2 + '%' : 0}}"></i></span><em>200</em></p>
+							<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()"> %
 								<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>
@@ -1624,7 +1624,7 @@
 						</div>
 						<div class="batch-date">
 							<p>批量设置交期:</p>
-							<div><span>交期(天)= </span><input type="number"> - <input type="number"></div>
+							<div><span>交期(天)= </span><input type="number" ng-model="uasBatchPutOnProperty.editMinDelivery" ng-blur="uasBatchChangeDeliver(uasBatchPutOnProperty.editMinDelivery, uasBatchPutOnProperty.editMaxDelivery, false)"> - <input type="number" ng-model="uasBatchPutOnProperty.editMaxDelivery" ng-blur="uasBatchChangeDeliver(uasBatchPutOnProperty.editMinDelivery, uasBatchPutOnProperty.editMaxDelivery, true)"></div>
 						</div>
 					</div>
 				</div>