|
|
@@ -1,6 +1,6 @@
|
|
|
define([ 'app/app' ], function(app) {
|
|
|
'use strict';
|
|
|
- app.register.controller('vendorDeliveryRuleAddCtrl', ['$scope', '$rootScope', '$stateParams', 'Enterprise', 'toaster', 'DistributionRule', function ($scope, $rootScope, $stateParams, Enterprise, toaster, DistributionRule) {
|
|
|
+ app.register.controller('vendorDeliveryRuleAddCtrl', ['$scope', '$rootScope', '$stateParams', 'Enterprise', 'toaster', 'DistributionRule', '$state', function ($scope, $rootScope, $stateParams, Enterprise, toaster, DistributionRule, $state) {
|
|
|
$rootScope.active = 'vendor_deliveryRule';
|
|
|
// $scope.tab = 'deliverRule';
|
|
|
$scope.title = '新增配送规则';
|
|
|
@@ -10,6 +10,7 @@ define([ 'app/app' ], function(app) {
|
|
|
$scope.rule = angular.fromJson($stateParams.rule);
|
|
|
$scope.isModify = true;
|
|
|
$scope.isActive = $scope.rule.active == 1;
|
|
|
+ $scope.fareArray = angular.fromJson($scope.rule.fares);
|
|
|
if ($scope.rule.orderType){
|
|
|
var orderTypeArray = $scope.rule.orderType.split("-");
|
|
|
$scope.orderType = {
|
|
|
@@ -57,6 +58,7 @@ define([ 'app/app' ], function(app) {
|
|
|
$scope.fareArray = [];
|
|
|
var firstFare = {
|
|
|
start : 0,
|
|
|
+ end : 0,
|
|
|
fare : 0
|
|
|
};
|
|
|
var secondFare = {
|
|
|
@@ -66,11 +68,85 @@ define([ 'app/app' ], function(app) {
|
|
|
};
|
|
|
$scope.fareArray.push(firstFare);
|
|
|
$scope.fareArray.push(secondFare);
|
|
|
+ console.log($scope.fareArray.length);
|
|
|
}
|
|
|
};
|
|
|
initData();
|
|
|
|
|
|
+ $scope.addQtyFare = function (data) {
|
|
|
+ var fare = {
|
|
|
+ start : data.end,
|
|
|
+ end : 0,
|
|
|
+ fare : 0
|
|
|
+ };
|
|
|
+ $scope.fareArray.push(fare);
|
|
|
+ };
|
|
|
+
|
|
|
+ $scope.deleteQtyFare = function (index) {
|
|
|
+ $scope.fareArray[index+1].start = $scope.fareArray[index-1].end;
|
|
|
+ $scope.fareArray.splice(index, 1);
|
|
|
+ };
|
|
|
+
|
|
|
+ $scope.inputFare = function (data) {
|
|
|
+ if(!data.fare) {
|
|
|
+ data.fare = 0;
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ if(isNaN(data.fare)){
|
|
|
+ data.fare = 0;
|
|
|
+ toaster.pop('warning', '提示', '运费必须是整数');
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ if(Number(data.fare) < 0 || Number(data.fare) % 1 != 0) {
|
|
|
+ data.fare = 0;
|
|
|
+ toaster.pop('warning', '提示', '运费必须是整数');
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ if(Number(data.fare) > 100000){
|
|
|
+ data.fare = 100000;
|
|
|
+ }
|
|
|
+ data.fare = Number(data.fare);
|
|
|
+ };
|
|
|
+
|
|
|
+ $scope.inputQtyFare = function (data, index) {
|
|
|
+ if(!data.start && !data.end) {
|
|
|
+ data.start = 0;
|
|
|
+ data.end = 0;
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ if(isNaN(data.start) || isNaN(data.end)) {
|
|
|
+ data.end = data.start + 1;
|
|
|
+ $scope.fareArray[index+1].start = Number(data.end);
|
|
|
+ toaster.pop('warning', '提示', '金额必须是数字');
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ if(Number(data.start) < 0) {
|
|
|
+ data.start = 0;
|
|
|
+ toaster.pop('warning', '提示', '金额必须大于0');
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ if(Number(data.end) < 0){
|
|
|
+ data.end = data.start + 1;
|
|
|
+ $scope.fareArray[index+1].start = Number(data.end);
|
|
|
+ toaster.pop('warning', '提示', '金额必须大于0');
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ if(Number(data.end) <= Number(data.start)){
|
|
|
+ data.end = data.start + 1;
|
|
|
+ }
|
|
|
+ if(Number(data.start) > 100000){
|
|
|
+ data.start = 100000;
|
|
|
+ }
|
|
|
+ if(Number(data.end) > 100000){
|
|
|
+ data.end = 100000;
|
|
|
+ }
|
|
|
+ data.start = Number(data.start);
|
|
|
+ data.end = Number(data.end);
|
|
|
+ $scope.fareArray[index+1].start = Number(data.end);
|
|
|
+ };
|
|
|
+
|
|
|
$scope.saveDistributionRule = function (isAdd) {
|
|
|
+ console.log(angular.toJson($scope.fareArray));
|
|
|
if (!$scope.rule.shippingMethod){
|
|
|
toaster.pop('error', "请选择配送方式");
|
|
|
return;
|
|
|
@@ -104,6 +180,7 @@ define([ 'app/app' ], function(app) {
|
|
|
typeArray.push(1203);
|
|
|
}
|
|
|
$scope.rule.orderType = typeArray.join("-");
|
|
|
+ $scope.rule.qtyFare = angular.toJson($scope.fareArray);
|
|
|
DistributionRule.saveRule({isAdd:isAdd, isActive:$scope.isActive}, $scope.rule , function (data) {
|
|
|
if (data){
|
|
|
// $scope.loadDeliveryRule();
|
|
|
@@ -114,7 +191,7 @@ define([ 'app/app' ], function(app) {
|
|
|
};
|
|
|
|
|
|
$scope.close = function () {
|
|
|
- window.open("vendor#/vendor_deliveryRule", '_blank');
|
|
|
+ $state.go('vendor_deliveryRule');
|
|
|
};
|
|
|
|
|
|
// 切换tab
|
hulh