Browse Source

修改 库存管理,

shenjj 7 years ago
parent
commit
9408289c2d

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

@@ -3830,8 +3830,8 @@ define(['app/app', 'jquery-uploadify'], function(app) {
           flag = false
           break;
         }
-        else if ($scope.productUpOff.goods.prices[i + 1] && $scope.productUpOff.goods.prices[i].start < $scope.productUpOff.goods.prices[i + 1].rMBPrice) {
-          toaster.pop('warning','提示','价格梯度不能为空')
+        else if ($scope.productUpOff.goods.prices[i + 1] && $scope.productUpOff.goods.prices[i].start < $scope.productUpOff.goods.prices[i + 1].start) {
+          toaster.pop('warning','提示','输入值会导致梯度重叠,请重新修改')
           flag = false
           break;
         }

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

@@ -1401,7 +1401,7 @@
 																	 class="form-control inputText"
 																	 oninput="if(value.length>3)value=value.slice(0,3)"
 																	 ng-model="productUpOff.goods.minDelivery"
-																	 ng-blur="changeDelivery(productUpOff.goods.b2cMinDelivery,productUpOff.goods.minDelivery, true, productUpOff)"
+																	 ng-blur="changeDelivery(productUpOff.goods.minDelivery,productUpOff.goods.maxDelivery, true, productUpOff)"
 																	 ng-class="{'error' : productUpOff.editMinDeliveryinValid}"
 																	 style="width: 80px;display: inline-block;"
 														/>&nbsp;-&nbsp;<input type="text"
@@ -1411,7 +1411,7 @@
 																	 class="form-control inputText"
 																	 oninput="if(value.length>3)value=value.slice(0,3)"
 																	 ng-model="productUpOff.goods.maxDelivery"
-																	 ng-blur="changeDelivery(productUpOff.goods.b2cMinDelivery, productUpOff.goods.maxDelivery, true, productUpOff)"
+																	 ng-blur="changeDelivery(productUpOff.goods.minDelivery, productUpOff.goods.maxDelivery, true, productUpOff)"
 																	 ng-class="{'error' : productUpOff.editMaxDeliveryinValid}"
 														/>
 													</div>