From 68815e9665abd05789d646dd689111183e26aa0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=96=E4=BB=95=E5=81=A5?= <564208006@qq.com> Date: Mon, 20 Nov 2017 14:43:57 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E6=96=99?= =?UTF-8?q?=E8=AE=A1=E5=88=92=20=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warehouseManagement/outboundOrder/outbound-order-list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/templates/warehouseManagement/outboundOrder/outbound-order-list.html b/public/templates/warehouseManagement/outboundOrder/outbound-order-list.html index b8c15a06..33d012cf 100644 --- a/public/templates/warehouseManagement/outboundOrder/outbound-order-list.html +++ b/public/templates/warehouseManagement/outboundOrder/outbound-order-list.html @@ -148,7 +148,7 @@ 出库状态 备料司机 完成时间 - 操作 + 操作 -- Gitee From b2ed72103c73a176c1aae0d59a152a89ebc503ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=96=E4=BB=95=E5=81=A5?= <564208006@qq.com> Date: Mon, 20 Nov 2017 15:38:01 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=A4=87=E6=96=99=E8=AE=A1=E5=88=92=20?= =?UTF-8?q?=E5=90=9B=E9=A9=AC=E5=8E=BB=E6=8E=89=20=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E6=8C=87=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../outboundOrder/outbound-order-list.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/templates/warehouseManagement/outboundOrder/outbound-order-list.html b/public/templates/warehouseManagement/outboundOrder/outbound-order-list.html index 33d012cf..93302282 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 @@ - + -- Gitee From 778a6518b220d5183fdd49d3d43bef52c7ebd2fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=96=E4=BB=95=E5=81=A5?= <564208006@qq.com> Date: Mon, 20 Nov 2017 17:18:44 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E9=99=86bug,?= =?UTF-8?q?=E5=8F=8A=E5=AF=BC=E5=85=A5=E9=97=AA=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/a.ctrl.js | 2 +- views/login.ejs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/public/js/ctrl/a.ctrl.js b/public/js/ctrl/a.ctrl.js index 80e796d1..83b98af5 100644 --- a/public/js/ctrl/a.ctrl.js +++ b/public/js/ctrl/a.ctrl.js @@ -295,7 +295,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/views/login.ejs b/views/login.ejs index 0b6a012d..ad20de9e 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); } } -- Gitee From 1d775c206422345a84fbd974d49b849012094424 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=96=E4=BB=95=E5=81=A5?= <564208006@qq.com> Date: Mon, 20 Nov 2017 18:12:49 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=A6=BB=E5=9C=BA=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/o.ctrl.js | 2 +- .../warehouseRecord/warehouse-record-list.html | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/public/js/ctrl/o.ctrl.js b/public/js/ctrl/o.ctrl.js index a20e2369..bf04e46c 100644 --- a/public/js/ctrl/o.ctrl.js +++ b/public/js/ctrl/o.ctrl.js @@ -322,10 +322,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; diff --git a/public/templates/warehouseManagement/warehouseRecord/warehouse-record-list.html b/public/templates/warehouseManagement/warehouseRecord/warehouse-record-list.html index a2a594b5..0fbcbdf9 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 @@ + -- Gitee From a49f64dafcc36c200ee15971308f71d3a0b74544 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=96=E4=BB=95=E5=81=A5?= <564208006@qq.com> Date: Wed, 22 Nov 2017 11:49:58 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E9=A9=B3=E5=9B=9E=20=E5=A4=87=E6=96=99?= =?UTF-8?q?=E9=80=80=E5=BA=93=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shipmentPlanReject/shipment-plan-reject-list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/templates/warehouseManagement/shipmentPlanReject/shipment-plan-reject-list.html b/public/templates/warehouseManagement/shipmentPlanReject/shipment-plan-reject-list.html index a2a330c2..535771bf 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 @@
-- Gitee From b31675fa614ddb769f535ad249d5ea4bfe217545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= <1308369732@qq.com> Date: Wed, 22 Nov 2017 15:25:13 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=80=9F=E7=94=A8=E5=8D=95=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E4=BC=A0=E5=87=AD=E8=AF=81=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/b.ctrl.js | 25 +++++++++++-------- .../layer/printHTML.html | 8 +++--- routes/resource/base-config.js | 2 +- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/public/js/ctrl/b.ctrl.js b/public/js/ctrl/b.ctrl.js index 4c095e68..966fe173 100644 --- a/public/js/ctrl/b.ctrl.js +++ b/public/js/ctrl/b.ctrl.js @@ -459,18 +459,23 @@ wmsCtrl.controller('borrowCarRegistrationCtrl',['$scope','Tools','$rootScope','$ } 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/templates/vehicleBorrowingManagement/layer/printHTML.html b/public/templates/vehicleBorrowingManagement/layer/printHTML.html index b85acaf3..c1bb667c 100644 --- a/public/templates/vehicleBorrowingManagement/layer/printHTML.html +++ b/public/templates/vehicleBorrowingManagement/layer/printHTML.html @@ -37,8 +37,8 @@ 物料名称 车型 颜色 - 库区 - 库位 + + {{key+1}} @@ -46,8 +46,8 @@ - - + +
diff --git a/routes/resource/base-config.js b/routes/resource/base-config.js index f63a2c3c..12d1e2b0 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 -- Gitee From 5bc6a5d55ef64b91b4a3023d0e9c1f57cf77a4cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=96=E4=BB=95=E5=81=A5?= <564208006@qq.com> Date: Wed, 22 Nov 2017 15:32:24 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E9=A9=B3=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/s.ctrl.js | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/public/js/ctrl/s.ctrl.js b/public/js/ctrl/s.ctrl.js index 07b44cdb..af730d3f 100644 --- a/public/js/ctrl/s.ctrl.js +++ b/public/js/ctrl/s.ctrl.js @@ -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){ //板车离场登记 //更多条件默认值 -- Gitee From 16172b5e2fd21e5dd2b998845c67ec9c0b8666cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= <1308369732@qq.com> Date: Wed, 22 Nov 2017 15:37:29 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E5=80=9F=E8=BD=A6=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=BA=93=E5=8C=BA=EF=BC=8C=E5=BA=93=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/b.ctrl.js | 3 ++- .../layer/printHTML.html | 14 +++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/public/js/ctrl/b.ctrl.js b/public/js/ctrl/b.ctrl.js index 966fe173..c68b6985 100644 --- a/public/js/ctrl/b.ctrl.js +++ b/public/js/ctrl/b.ctrl.js @@ -453,7 +453,8 @@ 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:'', diff --git a/public/templates/vehicleBorrowingManagement/layer/printHTML.html b/public/templates/vehicleBorrowingManagement/layer/printHTML.html index c1bb667c..649b7b7a 100644 --- a/public/templates/vehicleBorrowingManagement/layer/printHTML.html +++ b/public/templates/vehicleBorrowingManagement/layer/printHTML.html @@ -32,8 +32,8 @@
- - + + @@ -46,8 +46,8 @@ - - + +
序  号车架号(VIN码)序  号车架号(VIN码) 物料名称 车型 颜色
@@ -55,11 +55,11 @@
- - + + - +
制单人{{userInfo.name}}制单人{{userInfo.name}} 打印时间 {{currTime}}仓管员(签字)仓管员(签字)
-- Gitee From dff62a3a070c89b640ac7baad81e7d39aad15116 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=96=E4=BB=95=E5=81=A5?= <564208006@qq.com> Date: Wed, 22 Nov 2017 18:12:46 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/a.ctrl.js | 7 ++++--- public/js/ctrl/i.ctrl.js | 6 +++--- public/js/ctrl/o.ctrl.js | 3 ++- public/js/ctrl/s.ctrl.js | 4 ++-- .../inventorySelect/inventory-select-list.html | 4 ++-- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/public/js/ctrl/a.ctrl.js b/public/js/ctrl/a.ctrl.js index 83b98af5..2741fd87 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 diff --git a/public/js/ctrl/i.ctrl.js b/public/js/ctrl/i.ctrl.js index 39885e91..85b6be75 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 bf04e46c..757c8cdc 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 @@ -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 af730d3f..f52a204e 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 diff --git a/public/templates/inventoryManagement/inventorySelect/inventory-select-list.html b/public/templates/inventoryManagement/inventorySelect/inventory-select-list.html index 0b20d371..9498b790 100644 --- a/public/templates/inventoryManagement/inventorySelect/inventory-select-list.html +++ b/public/templates/inventoryManagement/inventorySelect/inventory-select-list.html @@ -30,7 +30,7 @@
-
+
车型
-- Gitee From 0fb78b9fb925b21e6ff038c44a19c07b93d2bfac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= <1308369732@qq.com> Date: Wed, 22 Nov 2017 18:43:52 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../borrowAndReturnRecordSearch.html | 14 +++++++------- .../borrowCarRegistration.html | 6 ++++++ routes/resource/base-config.js | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/public/templates/vehicleBorrowingManagement/borrowAndReturnRecordSearch.html b/public/templates/vehicleBorrowingManagement/borrowAndReturnRecordSearch.html index 0d175872..a93fc25b 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 743645a2..3ce32e3a 100644 --- a/public/templates/vehicleBorrowingManagement/borrowCarRegistration.html +++ b/public/templates/vehicleBorrowingManagement/borrowCarRegistration.html @@ -61,6 +61,12 @@
    • +
    +
    至
    +
    + +
    +
  • diff --git a/routes/resource/base-config.js b/routes/resource/base-config.js index 12d1e2b0..19e3b247 100644 --- a/routes/resource/base-config.js +++ b/routes/resource/base-config.js @@ -1,3 +1,3 @@ /**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 -- Gitee