From bfdd29363e252e133aaf2ada85a9e67a89f8bb65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=96=E4=BB=95=E5=81=A5?= <564208006@qq.com> Date: Thu, 26 Oct 2017 16:36:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E8=AE=A1=E5=88=92=20=E8=AF=B7=E6=B1=82=E5=89=8D=20=E7=A6=81?= =?UTF-8?q?=E6=AD=A2=E7=82=B9=E5=87=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/s.ctrl.js | 60 +++++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/public/js/ctrl/s.ctrl.js b/public/js/ctrl/s.ctrl.js index a20fbd0c..0b0ad821 100644 --- a/public/js/ctrl/s.ctrl.js +++ b/public/js/ctrl/s.ctrl.js @@ -1166,38 +1166,42 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService }]) .controller('shipmentPlanCtrl.dialog',['$scope','shipmentPlanService',function(scope,shipmentPlanService){ //发运计划 ctrl dialog + scope.flag = true; //禁止多次点击 //保存发运计划 scope.saveShipmentPlanClick = function () { + if(scope.flag){ + scope.flag = false; + if(!scope.shipment || !scope.shipment.estimateLoadingTime){ //判断计划装车时间 + scope.Tools.alert('请选择计划装车时间'); + return; + } - if(!scope.shipment || !scope.shipment.estimateLoadingTime){ //判断计划装车时间 - scope.Tools.alert('请选择计划装车时间'); - return; - } - - if(!scope.shipment || !scope.shipment.estimateFinishTime){ //判断预计完成时间 - scope.Tools.alert('请选择预计完成时间'); - return; - } + if(!scope.shipment || !scope.shipment.estimateFinishTime){ //判断预计完成时间 + scope.Tools.alert('请选择预计完成时间'); + return; + } - var listArr = new Array(); - angular.forEach(scope.ngDialogData.Data,function (v,k) { - listArr.push({ - spId : v.spId, - estimateLoadingTime : scope.shipment.estimateLoadingTime, //计划装车时间 - estimateFinishTime : scope.shipment.estimateFinishTime //预计完成时间 + var listArr = new Array(); + angular.forEach(scope.ngDialogData.Data,function (v,k) { + listArr.push({ + spId : v.spId, + estimateLoadingTime : scope.shipment.estimateLoadingTime, //计划装车时间 + estimateFinishTime : scope.shipment.estimateFinishTime //预计完成时间 + }); }); - }); - shipmentPlanService.createPreparationPlan(listArr) - .then(function(result){ - if(result.success){ - scope.Tools.alert('创建发运计划成功'); - scope.list(scope.listParam()); - //置空详情list - scope.$parent.outboundOrderDetailList = null; - scope.closeThisDialog(); - }else{ - scope.Tools.alert(result.message); - } - }) + shipmentPlanService.createPreparationPlan(listArr) + .then(function(result){ + if(result.success){ + scope.Tools.alert('创建发运计划成功'); + scope.list(scope.listParam()); + //置空详情list + scope.$parent.outboundOrderDetailList = null; + scope.closeThisDialog(); + }else{ + scope.Tools.alert(result.message); + } + scope.flag = true; + }) + } } }]) -- Gitee From 6a99ea443eef46832738fe489923ed42f48ea674 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=96=E4=BB=95=E5=81=A5?= <564208006@qq.com> Date: Thu, 26 Oct 2017 17:08:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9ico=20=E6=B8=85=E9=99=A4?= =?UTF-8?q?=E9=92=A5=E5=8C=99=E9=A2=86=E5=8F=96=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- favicon.ico | Bin 9662 -> 9662 bytes public/js/ctrl/o.ctrl.js | 3 +++ 2 files changed, 3 insertions(+) diff --git a/favicon.ico b/favicon.ico index b5b67c53edd8b61c476766d63a01ae1cfaaad3d8..db5e5219096e85ae17bcc953bb07aed1bd809fa9 100644 GIT binary patch literal 9662 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