diff --git a/public/js/ctrl/a.ctrl.js b/public/js/ctrl/a.ctrl.js index 80e796d1efc6493ac880eacfe34968c1b5a49fb7..2741fd87696315ca9c68ed2261a3fa8cff623a24 100644 --- a/public/js/ctrl/a.ctrl.js +++ b/public/js/ctrl/a.ctrl.js @@ -274,9 +274,10 @@ wmsCtrl.controller('asnCtrl',['$scope','dropDownService','inStorageBillService', //重置 click scope.resetClick = function(){ scope.search = {}; - scope.dropDownDefault.shipper = scope.dropDownList.shipper[0]; - scope.dropDownDefault.vehicleSpec = scope.dropDownList.vehicleSpec[0]; - scope.dropDownDefault.status = scope.dropDownList.status[0]; + scope.dropDownDefault.shipper = scope.dropDownList.shipper[0]; //货主 + scope.dropDownDefault.vehicleSpec = scope.dropDownList.vehicleSpec[0]; //车型 + scope.dropDownDefault.status = scope.dropDownList.status[0]; //状态 + scope.dropDownDefault.carColour = scope.dropDownList.carColour[0]; //颜色 } //刷新 click @@ -295,7 +296,7 @@ wmsCtrl.controller('asnCtrl',['$scope','dropDownService','inStorageBillService', } layui.use('layer',function(){ var layer = layui.layer; - layer.closeAll(); + layer.close($('div[type=loading]').attr('times')); }); }); scope.uploadAll(); diff --git a/public/js/ctrl/b.ctrl.js b/public/js/ctrl/b.ctrl.js index 4c095e68182c1c1f1255611f7a3f8077dfbc96d2..c68b698523adfe8bb05d977e817c336213da05ee 100644 --- a/public/js/ctrl/b.ctrl.js +++ b/public/js/ctrl/b.ctrl.js @@ -453,24 +453,30 @@ wmsCtrl.controller('borrowCarRegistrationCtrl',['$scope','Tools','$rootScope','$ $scope.addSave = function(){ $scope.addObj.uploadKey = $rootScope.uploadKey; - if (!$scope.addObj.bcBorrowName || !$scope.addObj.bcBorrowDepartment || !$scope.addObj.bcBorrowTel || !$scope.addObj.bcBorrowDate || !$scope.addObj.bcEstimatedReturnDate || !$scope.addObj.bcBorrowReason || !$scope.addObj.uploadKey || $scope.addObj.wmsBorrowCarDetailList.length==0 ){ + if (!$scope.addObj.bcBorrowName || !$scope.addObj.bcBorrowDepartment || !$scope.addObj.bcBorrowTel || !$scope.addObj.bcBorrowDate || !$scope.addObj.bcEstimatedReturnDate || !$scope.addObj.bcBorrowReason || $scope.addObj.wmsBorrowCarDetailList.length==0 ){ + console.log($scope.addObj); $scope.Tools.alert('请完整填写 借车人信息 和 车辆信息 ！'); } else { // bcBorrowDate:'', bcEstimatedReturnDate:'', debugger; if($scope.Tools.isRange($scope.addObj.bcBorrowDate,$scope.addObj.bcEstimatedReturnDate)){ - borrowCarRegistrationService.add($scope.addObj).then(function(data){ - if(data.success){ - $scope.Tools.alert('新增保存成功'); - ngDialog.closeAll(); - $rootScope.bcrGetList(); + if($scope.addObj.uploadKey){ + borrowCarRegistrationService.add($scope.addObj).then(function(data){ + if(data.success){ + $scope.Tools.alert('新增保存成功'); + ngDialog.closeAll(); + $rootScope.bcrGetList(); - $rootScope.bcDetail = ''; + $rootScope.bcDetail = ''; + + } else { + $scope.Tools.alert(data.message); + } + }) + } else { + $scope.Tools.alert('请上传凭证！'); + } - } else { - $scope.Tools.alert(data.message); - } - }) } else { $scope.Tools.alert('预计还车时间必须大于等于借车时间！'); } diff --git a/public/js/ctrl/i.ctrl.js b/public/js/ctrl/i.ctrl.js index 39885e91aa6af0b3f742696a151b64b259ba28cb..85b6be75fb3fb1ef9e5d6e21f90de442f6dcb748 100644 --- a/public/js/ctrl/i.ctrl.js +++ b/public/js/ctrl/i.ctrl.js @@ -1220,7 +1220,7 @@ wmsCtrl.controller('inStorageBillCtrl',['$scope','inStorageBillService','dropDow }) //获取仓库 - dropDownService.getWarehouse() + /*dropDownService.getWarehouse() .then(function(result){ if(result.success){ scope.dropDownList.warehouse = result.data; @@ -1229,7 +1229,7 @@ wmsCtrl.controller('inStorageBillCtrl',['$scope','inStorageBillService','dropDow }else{ scope.Tools.alert(result.message); } - }) + })*/ //获取车型 dropDownService.getVehicleSpec() @@ -1321,7 +1321,7 @@ wmsCtrl.controller('inStorageBillCtrl',['$scope','inStorageBillService','dropDow scope.search = {}; scope.dropDownDefault.shipper = scope.dropDownList.shipper[0]; scope.dropDownDefault.vehicleSpec = scope.dropDownList.vehicleSpec[0]; - scope.dropDownDefault.warehouse = scope.dropDownList.warehouse[0]; + /*scope.dropDownDefault.warehouse = scope.dropDownList.warehouse[0];*/ } //刷新 click diff --git a/public/js/ctrl/o.ctrl.js b/public/js/ctrl/o.ctrl.js index a20e23690def81f53b01c81b67f9a7b0afb68fcb..757c8cdc765ce657633c76a9553dddec0449325a 100644 --- a/public/js/ctrl/o.ctrl.js +++ b/public/js/ctrl/o.ctrl.js @@ -149,6 +149,7 @@ wmsCtrl.controller('outboundOrderCtrl', ['$scope','warehouseService','warehouseM scope.search = {}; scope.dropDownDefault.outboundStatus = scope.dropDownList.outboundStatus[0]; scope.dropDownDefault.warehouse = scope.dropDownList.warehouse[0]; + scope.dropDownDefault.estimateLane = scope.dropDownList.estimateLane[0]; //装车道 } //刷新 click @@ -322,10 +323,10 @@ wmsCtrl.controller('outboundOrderCtrl', ['$scope','warehouseService','warehouseM if(result.success){ if(scope.key = result.data){ scope.key = result.data; - scope.Tools.alert('校验通过'); warehouseService.updateStatus(scope.keyVin) .then(function(result){ if(result.success){ + scope.Tools.alert('校验通过'); //清空输入框数据 scope.driverVin = null; scope.keyVin = null; @@ -460,7 +461,7 @@ wmsCtrl.controller('outboundOrderCtrl', ['$scope','warehouseService','warehouseM //重置 click scope.resetClick = function(){ scope.search = {}; - /*scope.dropDownDefault.status = scope.dropDownList.status[0];*/ + scope.dropDownDefault.printStatus = scope.dropDownList.printStatus; //打印状态 } //刷新 click diff --git a/public/js/ctrl/s.ctrl.js b/public/js/ctrl/s.ctrl.js index 07b44cdb6cae92b8076c43103ff8dc1bef1e2847..f52a204e9ca535fad5a85b33a7db3d283aa78548 100644 --- a/public/js/ctrl/s.ctrl.js +++ b/public/js/ctrl/s.ctrl.js @@ -1149,8 +1149,8 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService //重置 click scope.resetClick = function(){ scope.search = {}; - scope.dropDownDefault.shipper = scope.dropDownList.shipper[0]; - scope.dropDownDefault.shipmentPlanStatus = scope.dropDownList.shipmentPlanStatus[0]; + scope.dropDownDefault.shipper = scope.dropDownList.shipper[0]; //货主 + scope.dropDownDefault.shipmentPlanStatus = scope.dropDownList.shipmentPlanStatus[0]; //发运状态 } //刷新 click @@ -1371,7 +1371,7 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService $rootScope.currSelectTrTwoEq = eq; } - $rootScope.queryDetailListsprl =[]; + scope.queryDetailListsprl =[]; //点击每行列表的数据 click scope.selectItemClick = function(e,id){ @@ -1380,7 +1380,7 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService shipmentPlanRejectService.queryDetailList(id) .then(function(result){ if(result.success){ - $rootScope.queryDetailListsprl = result.data + scope.queryDetailListsprl = result.data }else{ scope.Tools.alert(result.message); } @@ -1497,20 +1497,13 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService $rootScope.sprlDialogTwoOrignialVin = data.data.orignialVin; $rootScope.sprlDialogTwoChangeVin = data.data.changeVin; - // 刷新列表 - shipmentPlanRejectService.queryDetailList($rootScope.currSelectTr) - .then(function(result){ - if(result.success){ - $rootScope.queryDetailListsprl = result.data - }else{ - scope.Tools.alert(result.message); - } - }); - if(!$rootScope.sprlDialogTwoChangeVin){ //判断是否是无车可换 scope.Tools.alert('无车可换'); return; } + //刷新列表数据 + scope.list(scope.listParam()); + scope.queryDetailListsprl = null; scope.Tools.dialog({ controller:'shipmentPlanRejectCtrl.dialog', @@ -1523,7 +1516,6 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService title : '备料更换', scope : scope }) - } scope.Tools.alert(data.message); }) @@ -1556,7 +1548,7 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService shipmentPlanRejectService.queryDetailList($rootScope.currSelectTr) .then(function(result){ if(result.success){ - $rootScope.queryDetailListsprl = result.data + scope.queryDetailListsprl = result.data }else{ scope.Tools.alert(result.message); } @@ -1571,9 +1563,6 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService //备料更换 保存 click scope.planDetailId = ''; scope.planId =''; - scope.saveOutBoundChangeClick = function(){ - scope.closeThisDialog(); - } }]) .controller('scooterOffRegistrationCtrl',['$scope','scooterOffRegistrationService',function(scope,scooterOffRegistrationService){ //板车离场登记 //更多条件默认值 diff --git a/public/templates/inventoryManagement/inventorySelect/inventory-select-list.html b/public/templates/inventoryManagement/inventorySelect/inventory-select-list.html index 0b20d3717b39058569d6e2f506b9552b700d1ec4..9498b790ea78bd57209489e3f70397cb283130aa 100644 --- a/public/templates/inventoryManagement/inventorySelect/inventory-select-list.html +++ b/public/templates/inventoryManagement/inventorySelect/inventory-select-list.html @@ -30,7 +30,7 @@ -
+
车型
diff --git a/public/templates/vehicleBorrowingManagement/borrowAndReturnRecordSearch.html b/public/templates/vehicleBorrowingManagement/borrowAndReturnRecordSearch.html index 0d175872f6d253f6a65f918a22d955d9b18b9b2f..a93fc25bc314188069d9494656cab742902635c2 100644 --- a/public/templates/vehicleBorrowingManagement/borrowAndReturnRecordSearch.html +++ b/public/templates/vehicleBorrowingManagement/borrowAndReturnRecordSearch.html @@ -57,12 +57,12 @@
-
是否还车
+
还车状态
@@ -81,7 +81,7 @@
  • -
    还车日期
    +
    实际还车日期
    @@ -110,10 +110,10 @@ 序号 车架号(VIN码) - 是否还车 + 还车状态 借用人 借用日期 - 预计换车日期 + 预计还车日期 还车人 实际还车日期 @@ -125,7 +125,7 @@ - + diff --git a/public/templates/vehicleBorrowingManagement/borrowCarRegistration.html b/public/templates/vehicleBorrowingManagement/borrowCarRegistration.html index 743645a2b1d4055828d805ad3cae35cca9a44412..3ce32e3a6470f805f2610eb1e60ec6a1f3028fbb 100644 --- a/public/templates/vehicleBorrowingManagement/borrowCarRegistration.html +++ b/public/templates/vehicleBorrowingManagement/borrowCarRegistration.html @@ -61,6 +61,12 @@
    • +
    +
    至
    +
    + +
    +
  • diff --git a/public/templates/vehicleBorrowingManagement/layer/printHTML.html b/public/templates/vehicleBorrowingManagement/layer/printHTML.html index b85acaf39328f87e57b15c65a17037fdaebd3a3a..649b7b7a280ce846d957aa7f45f1dfb1414e96f0 100644 --- a/public/templates/vehicleBorrowingManagement/layer/printHTML.html +++ b/public/templates/vehicleBorrowingManagement/layer/printHTML.html @@ -32,13 +32,13 @@
    - - + + - - + + @@ -46,8 +46,8 @@ - - + +
    序  号车架号(VIN码)序  号车架号(VIN码) 物料名称 车型 颜色库区库位
    {{key+1}}
    @@ -55,11 +55,11 @@
    - - + + - +
    制单人{{userInfo.name}}制单人{{userInfo.name}} 打印时间 {{currTime}}仓管员(签字)仓管员(签字)
    diff --git a/public/templates/warehouseManagement/outboundOrder/outbound-order-list.html b/public/templates/warehouseManagement/outboundOrder/outbound-order-list.html index b8c15a060cb97a6a087be2626b50966a24b80b4d..9330228265fb3cbc2ad076f6ec278123acef0571 100644 --- a/public/templates/warehouseManagement/outboundOrder/outbound-order-list.html +++ b/public/templates/warehouseManagement/outboundOrder/outbound-order-list.html @@ -95,7 +95,7 @@
    备料编号 - 发运指令号 + 发运指令号 备料员 创建时间 计划装车道 @@ -111,7 +111,7 @@ - + @@ -148,7 +148,7 @@ 出库状态 备料司机 完成时间 - 操作 + 操作 diff --git a/public/templates/warehouseManagement/shipmentPlanReject/shipment-plan-reject-list.html b/public/templates/warehouseManagement/shipmentPlanReject/shipment-plan-reject-list.html index a2a330c2b2e00fec32dc15ae12c69c44f2590985..535771bf1829abe5de07f115e8cf9b3bd4aa12e5 100644 --- a/public/templates/warehouseManagement/shipmentPlanReject/shipment-plan-reject-list.html +++ b/public/templates/warehouseManagement/shipmentPlanReject/shipment-plan-reject-list.html @@ -159,7 +159,7 @@
    diff --git a/public/templates/warehouseManagement/warehouseRecord/warehouse-record-list.html b/public/templates/warehouseManagement/warehouseRecord/warehouse-record-list.html index a2a594b53e5969c196860c5e885c896bc5c4ba02..0fbcbdf9ceb75bb25d78457b28d313c3f31a7e76 100644 --- a/public/templates/warehouseManagement/warehouseRecord/warehouse-record-list.html +++ b/public/templates/warehouseManagement/warehouseRecord/warehouse-record-list.html @@ -66,6 +66,7 @@ 出库类型 出库确认时间 出库确认人 + 板车出库时间 @@ -75,6 +76,7 @@ + diff --git a/routes/resource/base-config.js b/routes/resource/base-config.js index f63a2c3c771983e0ad62236d10925d352d33c501..19e3b247668201a8ede99662ee4769e03c45e71c 100644 --- a/routes/resource/base-config.js +++ b/routes/resource/base-config.js @@ -1,3 +1,3 @@ -/**Created on 2017-11-20*/ +/**Created on 2017-11-22*/ 'use strict'; - module.exports = {"version":"1.0.2","compressed":false,"devView":true,"validate":false,"tmsMap":true,"host":"http://120.77.8.167/wms-extra-web/","ticketUser":{"phone":"11111111111","password":"123456a"}}; \ No newline at end of file + module.exports = {"version":"1.0.2","compressed":false,"devView":true,"validate":false,"tmsMap":true,"host":"http://10.2.7.91:8080/","ticketUser":{"phone":"11111111111","password":"123456a"}}; \ No newline at end of file diff --git a/views/login.ejs b/views/login.ejs index 0b6a012d4faaee4d81ae1f4544b44d6d5c716743..ad20de9eba73ff713d5f9f0976d5f90967377360 100644 --- a/views/login.ejs +++ b/views/login.ejs @@ -110,6 +110,7 @@ var t = cookies.getObject('user'); location.href = 'index' } else { + $('input').blur(); //清除焦点 layer.alert(data.message); } }