From c12a7244d64bc7ccbe4732e929c78bd17d749468 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= <1308369732@qq.com> Date: Tue, 12 Dec 2017 14:17:05 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=87=BA=EF=BC=8C?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2=EF=BC=8C?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=AE=A1=E7=90=86=20=E7=9A=84=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/i.ctrl.js | 124 +++++++++++++++++- public/js/ctrl/w.ctrl.js | 57 +++++++- public/js/wms-service.js | 19 ++- .../inventoryRecordsQuery/export.html | 26 ++++ .../inventory-records-query-list.html | 1 + .../inventory-select-list.html | 3 +- .../warehouseRecord/export.html | 40 ++++++ .../warehouse-record-list.html | 1 + routes/resource/base-config.js | 4 +- 9 files changed, 266 insertions(+), 9 deletions(-) create mode 100644 public/templates/inStorageManagement/inventoryRecordsQuery/export.html create mode 100644 public/templates/warehouseManagement/warehouseRecord/export.html diff --git a/public/js/ctrl/i.ctrl.js b/public/js/ctrl/i.ctrl.js index cd699fcb..17b22453 100644 --- a/public/js/ctrl/i.ctrl.js +++ b/public/js/ctrl/i.ctrl.js @@ -1063,8 +1063,17 @@ wmsCtrl.controller('inStorageBillCtrl',['$scope','inStorageBillService','dropDow } } }]) - .controller('inventoryRecordsQueryCtrl',['$scope','dropDownService','inStorageBillService',function(scope,dropDownService,inStorageBillService){ //入库记录查询 controller - + .controller('inventoryRecordsQueryCtrl',['$scope','dropDownService','inStorageBillService','ngDialog',function(scope,dropDownService,inStorageBillService,ngDialog){ //入库记录查询 controller + + //导出 + scope.exports = function(){ + ngDialog.open({ + template: "templates/inStorageManagement/inventoryRecordsQuery/export.html", + controller: "inventoryRecordsQueryCtrl.dialog", + title: '导出入库记录', + width:590 + }); + }; //更多条件默认值 scope.moreText = scope.constant.moreText.spread; //更多条件 @@ -1184,10 +1193,76 @@ wmsCtrl.controller('inStorageBillCtrl',['$scope','inStorageBillService','dropDow scope.searchClick(); } }]) - .controller('inventoryRecordsQueryCtrl.dialog',['$scope',function(scope){ //入库记录查询 dialog controller + .controller('inventoryRecordsQueryCtrl.dialog',['$scope','inventoryRecordsQueryservice','$timeout','ngDialog',function(scope,inventoryRecordsQueryservice,$timeout,ngDialog){ //入库记录查询 dialog controller + scope.search = { + recieveStartTime:'', + recieveEndTime:'', + whCode:scope.userInfo.whCode, + userId:scope.userInfo.id + }; + scope.excelUrl = ''; + scope.formatData = function(obj){ + var str ='?'; + for(var k in obj){ + str+='&'+k+'='+obj[k]; + } + return str; + }; + scope.getData = function(e){ + if(scope.search.recieveStartTime && scope.search.recieveStartTime ){ + inventoryRecordsQueryservice.queryRecordCount(scope.formatData(scope.search)).then(function(res){ + if(res.success==false){ + e.preventDefault(); + scope.Tools.alert(res.message) + } else { + scope.excelUrl = contextPath + 'asnOrder/recordImportExcel'+ scope.formatData(scope.search); + $timeout(function(){ + document.getElementById('irqExport').click(); + scope.search.recieveStartTime =''; + scope.search.recieveEndTime =''; + ngDialog.closeAll(); + },20) + } + }); + + } else { + e.preventDefault(); + scope.Tools.alert('有时间未填！') + } + }; + scope.close = function(){ + ngDialog.closeAll() + } }]) - .controller('inventorySelectCtrl',['$scope','inventorySelectService','dropDownService',function(scope,inventorySelectService,dropDownService){ //库存查询 controller + .controller('inventorySelectCtrl',['$scope','$timeout','inventorySelectService','dropDownService',function(scope,$timeout,inventorySelectService,dropDownService){ //库存查询 controller + scope.isSearch ={ + whCode:scope.userInfo.whCode, + userId:scope.userInfo.id + }; + scope.excelUrl =''; + + scope.formatData = function(obj){ + var str ='?'; + for(var k in obj){ + str+='&'+k+'='+obj[k]; + } + return str; + }; + //导出 + scope.export = function() { + inventorySelectService.queryInventoryRecordCount(scope.formatData(scope.isSearch)).then(function(res){ + if (res.success == false) { + debugger + scope.Tools.alert(res.message) + } else { + scope.excelUrl = contextPath + 'wmsInventory/inventoryRecordImport' + scope.formatData(scope.isSearch); + $timeout(function () { + document.getElementById('islExport').click(); + }, 20) + } + }); + } //更多条件 scope.moreText = scope.constant.moreText.spread; scope.moreClick = function(){ @@ -1364,4 +1439,45 @@ wmsCtrl.controller('inStorageBillCtrl',['$scope','inStorageBillService','dropDow } }]) .controller('inventorySelectCtrl.dialog',['$scope',function(scope){ //库存查询 dialog controller + }]) + .controller('inventorySelectExportCtrl.dialog',['$scope','inventoryRecordsQueryservice','$timeout','ngDialog',function(scope,inventoryRecordsQueryservice,$timeout,ngDialog){ //入库记录查询 dialog controller + scope.search = { + recieveStartTime:'', + recieveEndTime:'', + whCode:scope.userInfo.whCode, + userId:scope.userInfo.id + }; + scope.excelUrl = ''; + scope.formatData = function(obj){ + var str ='?'; + for(var k in obj){ + str+='&'+k+'='+obj[k]; + } + return str; + }; + scope.getData = function(e){ + if(scope.search.recieveStartTime && scope.search.recieveStartTime ){ + inventoryRecordsQueryservice.queryRecordCount(scope.formatData(scope.search)).then(function(res){ + if(res.success==false){ + e.preventDefault(); + scope.Tools.alert(res.message) + } else { + scope.excelUrl = contextPath + 'asnOrder/recordImportExcel'+ scope.formatData(scope.search); + $timeout(function(){ + document.getElementById('irqExport').click(); + scope.search.recieveStartTime =''; + scope.search.recieveEndTime =''; + ngDialog.closeAll(); + },20) + } + }); + + } else { + e.preventDefault(); + scope.Tools.alert('有时间未填！') + } + }; + scope.close = function(){ + ngDialog.closeAll() + } }]) \ No newline at end of file diff --git a/public/js/ctrl/w.ctrl.js b/public/js/ctrl/w.ctrl.js index 521692ce..1b19090b 100644 --- a/public/js/ctrl/w.ctrl.js +++ b/public/js/ctrl/w.ctrl.js @@ -799,7 +799,17 @@ wmsCtrl.controller('warehouseCtrl',['$scope','warehouseService','dropDownService }) } }]) - .controller('warehouseRecordCtrl',['$scope','warehouseService','dropDownService',function(scope,warehouseService,dropDownService){ //出库记录查询 ctrl + .controller('warehouseRecordCtrl',['$scope','warehouseService','dropDownService','ngDialog',function(scope,warehouseService,dropDownService,ngDialog){ //出库记录查询 ctrl + + //导出 + scope.export = function(){ + ngDialog.open({ + template:'/templates/warehouseManagement/warehouseRecord/export.html', + controller:'warehouseRecordExportCtrl.dialog', + title:'出库记录导出', + width:590 + }) + }; //更多条件默认值 scope.moreText = scope.constant.moreText.spread; @@ -927,6 +937,51 @@ wmsCtrl.controller('warehouseCtrl',['$scope','warehouseService','dropDownService }]) .controller('warehouseRecordCtrl.dialog',['$scope',function(scope){ //出库记录查询 ctrl dialog }]) + .controller('warehouseRecordExportCtrl.dialog',['$scope','warehouseRecordExportService','$timeout','ngDialog',function(scope,warehouseRecordExportService,$timeout,ngDialog){ //入库记录查询 dialog controller + scope.search = { + outConfirmStartTime:'', + outConfirmEndTime:'', + shipStartTime:'', + shipEndTime:'', + whCode:scope.userInfo.whCode, + userId:scope.userInfo.id + }; + scope.excelUrl = ''; + scope.formatData = function(obj){ + var str ='?'; + for(var k in obj){ + str+='&'+k+'='+obj[k] + } + return str; + }; + scope.getData = function(e){ + if((scope.search.outConfirmStartTime && scope.search.outConfirmEndTime) || (scope.search.shipStartTime && scope.search.shipEndTime ) ){ + warehouseRecordExportService.outboundRecordImportExcel(scope.formatData(scope.search)).then(function(res){ + if(res.success==false){ + e.preventDefault(); + scope.Tools.alert(res.message) + } else { + scope.excelUrl = contextPath + 'outboundTask/outboundRecordImportExcel'+ scope.formatData(scope.search); + $timeout(function(){ + document.getElementById('wrlExport').click(); + scope.search.outConfirmStartTime=''; + scope.search.outConfirmEndTime=''; + scope.search.shipStartTime=''; + scope.search.shipEndTime=''; + ngDialog.closeAll() + },20) + } + }); + + } else { + e.preventDefault(); + scope.Tools.alert('出库起始时间、发运起始时间，至少完整填写一组！') + } + }; + scope.close = function(){ + ngDialog.closeAll() + } +}]) .controller('wmsAppCtrl',['$scope','$rootScope','$timeout',function($scope,$rootScope,$timeout){ // fs == fullScreen diff --git a/public/js/wms-service.js b/public/js/wms-service.js index 40957402..4322c149 100644 --- a/public/js/wms-service.js +++ b/public/js/wms-service.js @@ -116,6 +116,16 @@ var wmsService = angular.module('wms.services', []) }, detail : function(id){ //详情 return httpService.customGET('wmsInventory/listInventoryLocation/' + id); + }, + queryInventoryRecordCount: function(data){ //库存导出验证接口 + return httpService.customGET('wmsInventory/queryInventoryRecordCount'+data) + } + } + }]) + .service('inventoryRecordsQueryservice',['HttpService',function(HttpService){ + return { + queryRecordCount:function(data){ + return HttpService.customGET('/asnOrder/queryRecordCount'+ data) } } }]) @@ -211,6 +221,13 @@ var wmsService = angular.module('wms.services', []) } } }]) + .service('warehouseRecordExportService',['HttpService',function(HttpService){ + return { + outboundRecordImportExcel :function(data){ + return HttpService.customGET('outboundTask/outboundRecordImportExcel'+data) + } + } + }]) .service('warehouseService',['HttpService',function(httpService){ //出库单 return { list : function(data){ //出库单列表 @@ -658,6 +675,6 @@ var wmsService = angular.module('wms.services', []) }, updateToClosed : function(data){ // 异常关闭 return HttpService.customPOST('/excpManage/updateToClosed',data) - }, + } } }]); diff --git a/public/templates/inStorageManagement/inventoryRecordsQuery/export.html b/public/templates/inStorageManagement/inventoryRecordsQuery/export.html new file mode 100644 index 00000000..2fd70fba --- /dev/null +++ b/public/templates/inStorageManagement/inventoryRecordsQuery/export.html @@ -0,0 +1,26 @@ +
+ +
+
+ + 导出 + +
+
+ diff --git a/public/templates/inStorageManagement/inventoryRecordsQuery/inventory-records-query-list.html b/public/templates/inStorageManagement/inventoryRecordsQuery/inventory-records-query-list.html index b9dcf81e..4a3d46f2 100644 --- a/public/templates/inStorageManagement/inventoryRecordsQuery/inventory-records-query-list.html +++ b/public/templates/inStorageManagement/inventoryRecordsQuery/inventory-records-query-list.html @@ -2,6 +2,7 @@
diff --git a/public/templates/inventoryManagement/inventorySelect/inventory-select-list.html b/public/templates/inventoryManagement/inventorySelect/inventory-select-list.html index 9498b790..cfd2c156 100644 --- a/public/templates/inventoryManagement/inventorySelect/inventory-select-list.html +++ b/public/templates/inventoryManagement/inventorySelect/inventory-select-list.html @@ -2,7 +2,8 @@
    - + +
diff --git a/public/templates/warehouseManagement/warehouseRecord/export.html b/public/templates/warehouseManagement/warehouseRecord/export.html new file mode 100644 index 00000000..1db9e73d --- /dev/null +++ b/public/templates/warehouseManagement/warehouseRecord/export.html @@ -0,0 +1,40 @@ +
+
    +
  • +
    +
    出库时间
    +
    + +
    +
    + +
    +
    至
    +
    + +
    +
    +
    • +
  • +
    +
    发运时间
    +
    + +
    +
    + +
    +
    至
    +
    + +
    +
    +
    • +
+
+
+ + 导出 + +
+
diff --git a/public/templates/warehouseManagement/warehouseRecord/warehouse-record-list.html b/public/templates/warehouseManagement/warehouseRecord/warehouse-record-list.html index f5dc00cc..22022605 100644 --- a/public/templates/warehouseManagement/warehouseRecord/warehouse-record-list.html +++ b/public/templates/warehouseManagement/warehouseRecord/warehouse-record-list.html @@ -2,6 +2,7 @@
    +
diff --git a/routes/resource/base-config.js b/routes/resource/base-config.js index 1222ca1f..b19c6009 100644 --- a/routes/resource/base-config.js +++ b/routes/resource/base-config.js @@ -1,3 +1,3 @@ -/**Created on 2017-12-07*/ +/**Created on 2017-12-12*/ 'use strict'; - 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 + module.exports = {"version":"1.0.2","compressed":false,"devView":true,"validate":false,"tmsMap":true,"host":"http://10.2.4.80:8080/ils-wms-extra-web/","ticketUser":{"phone":"11111111111","password":"123456a"}}; \ No newline at end of file -- Gitee From 6bbac8882df8cdbb04c65172e368086baae52c96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= <1308369732@qq.com> Date: Thu, 14 Dec 2017 10:29:53 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=85=A5=E5=BA=93=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AF=BC=E5=87=BA=20---=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inStorageManagement/inventoryRecordsQuery/export.html | 2 +- routes/resource/base-config.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/templates/inStorageManagement/inventoryRecordsQuery/export.html b/public/templates/inStorageManagement/inventoryRecordsQuery/export.html index 2fd70fba..5c1897ec 100644 --- a/public/templates/inStorageManagement/inventoryRecordsQuery/export.html +++ b/public/templates/inStorageManagement/inventoryRecordsQuery/export.html @@ -2,7 +2,7 @@
  • -
    收货时间
    +
    入库时间
    diff --git a/routes/resource/base-config.js b/routes/resource/base-config.js index b19c6009..a25394b8 100644 --- a/routes/resource/base-config.js +++ b/routes/resource/base-config.js @@ -1,3 +1,3 @@ -/**Created on 2017-12-12*/ +/**Created on 2017-12-14*/ 'use strict'; - module.exports = {"version":"1.0.2","compressed":false,"devView":true,"validate":false,"tmsMap":true,"host":"http://10.2.4.80:8080/ils-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://120.77.8.167/wms-extra-web/","ticketUser":{"phone":"11111111111","password":"123456a"}}; \ No newline at end of file -- Gitee From 05ea7c1577b640fb74e450afd0721329cdfdeff8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= <1308369732@qq.com> Date: Tue, 19 Dec 2017 17:04:45 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=9C=A8=E9=80=94?= =?UTF-8?q?=EF=BC=8C=E8=BF=90=E8=BE=93=E6=96=B9=E5=BC=8F=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/images/driver.png | Bin 0 -> 695 bytes public/images/road.png | Bin 0 -> 599 bytes public/images/ship.png | Bin 0 -> 423 bytes public/images/train.png | Bin 0 -> 257 bytes public/images/tuobanche.png | Bin 0 -> 667 bytes public/js/ctrl/o.ctrl.js | 73 +++++++++++++++++- public/js/wms-directive.js | 27 ++++++- public/js/wms-filter.js | 6 +- public/js/wms-service.js | 4 +- .../bigScreen/components/transport.html | 3 + public/templates/bigScreen/onWay.html | 22 +++++- routes/resource/base-config.js | 4 +- 12 files changed, 127 insertions(+), 12 deletions(-) create mode 100644 public/images/driver.png create mode 100644 public/images/road.png create mode 100644 public/images/ship.png create mode 100644 public/images/train.png create mode 100644 public/images/tuobanche.png create mode 100644 public/templates/bigScreen/components/transport.html diff --git a/public/images/driver.png b/public/images/driver.png new file mode 100644 index 0000000000000000000000000000000000000000..a8d0b59f8f135931b124b61f4dbae97a944f275a GIT binary patch literal 695 zcmV;o0!aOdP)g`ZSC#pF`}R- zRJC6#jaofDJu_J60`StzKA731nZ1q2H^VTj$8o&x3}-{n0RX!2o0$njZf(u%J;^6; zTsHv6<>}5X$+N!!KrcUc2EHZv$+OqRKz#iVPr$h6iR3HKelGyM=A$RzY>%|CX`S%` zP@s3MV2l4ZB-gDo{|$hDo&uT9LyOMY|7VgVuQ&+fN`X!Q*qPaDCx|~=h7o{V&{K*( z2Pi#D)4C$5>N#3j0Kd_G65_?^ z<-DN;KtXz_|4#B8Ky7HbBZ(yiM*slyHlF7QR=%Lz*OpjNwd8#Ofby54uohGTQ&5jh zAI*yg3^XXrf%r=D5En%gJN4XVyic#tlbJIFaf(!s+&Fd8k zQd+wBx;5tk5E$vG2IQV(@QDOKhiU?v4(L#{*a`5CT*hV#3gp04S#y8MG>~6XgrQ=b61Ws?CD)0Z{XjH{@2BniGK1 z#(=UzphrRjkYo3eWMFY#1-Xq<>#noR5{Lv|ViSAwHT8x$03lM&CiRj`4DDN-XZ|O9 dUb1^2=wA&V2{7bU8HE4<002ovPDHLkV1oAyIKBV? literal 0 HcmV?d00001 diff --git a/public/images/road.png b/public/images/road.png new file mode 100644 index 0000000000000000000000000000000000000000..fd5d7382d6688793078427b94cbe8634a0c15bbb GIT binary patch literal 599 zcmV-d0;v6oP)1|9}xAn zHzRo;!B6fYHsk`pX@tY=7E&b%;IaYa4S=HmyCKc&7{F^$0q+%1Jtu(4uZFAvPDpMb z%}iygUo6O`il36y9>Lc6PMVpZRH|Em+A#s-62MoD#;So0A?*ZdW>)|n0bG!jf^Jy? z$jmvHX%p}Ll4Kn?gt42tR$4=2$s~ZRLiASJu9@_Czj4k0R0StLjQ3um^OERJriU~$ ziHQ`o&1MlHp8(|Ls=JxITz3Rns`XZ2Nh*-R)>^KCkm{E)#=0hT1xZy^u*HT{iK)%> zwf8{>^janrVU2DoC&8$-lq23o_J1Or&*vKdHl`uNIk#6nh|x0Y`-fz5U4RMh%sIF6 z-b)~)xOW{>cTF-gGp!Mr6j`RAm7u-Vv=8J%F`s@`oGeIA%`9&*Ev9e8+aeb7e`~qc?oT=1m56Q$74Qmp1sYMnTH7U}q_FjnnNw@+l8A(e7R)?9 zWciH%OsCVHh`eYJ0Jo#jXlbq0;3Ogs#+Zo*@Cy7N1>B0RGA%JP8tsDeG7(u2Q3@at zkv9M{5t$WG10tFLxCU^r#oPq)JYS5*A>m0B_ti-4xA3$0oEQIR(v2g$kO9Ml5*tEB(~fLjSnOMrK%5x|w?J!j=8fUT|?>GzEM z0FeCXjPHz;t`{39Esz6rfMNr=4UN|I4mp#IM|Z&9)&Pq&K-0INCZChF z0kaG|_2nda@gI>z1|rFBORNRJMDp|ksOg=Sdpv}0z}&zJ6Yh4;y5?oq9A7H{D+X2!TnPj2J~Fe7{)msqXW>Frr5rUwYfs35~9?#^{5 z7y}j=!{Q;*>+bkR(%0)X6Z1<4W|zB@JuG~eguKGQ;N|Wlg`fe3*`M|VP8Yt8>$_pZ zOb?DcV^}k0M5oQ&wy)&>z`uZA0a!7xV&K{t_zB-w0x+)hh@b!f002ovPDHLkV1hsA BB3A$a literal 0 HcmV?d00001 diff --git a/public/js/ctrl/o.ctrl.js b/public/js/ctrl/o.ctrl.js index 5657c5e0..89a6b123 100644 --- a/public/js/ctrl/o.ctrl.js +++ b/public/js/ctrl/o.ctrl.js @@ -527,11 +527,76 @@ wmsCtrl.controller('outboundOrderCtrl', ['$scope','warehouseService','warehouseM }]) .controller('onWayCtrl',['$scope','$rootScope','$timeout','$state','onWayService',function($scope,$rootScope,$timeout,$state,onWayService){ $scope.tableList = []; - onWayService.onWayLine().then(function(data){ - if(data.success){ - $scope.tableList = data.data; + $scope.search = { + status: '10' + }; + $scope.selectReset = function(){ + $scope.pageNo = 1; + $scope.pageSize = 20; + $scope.getList() + }; + + $scope.fristSelect = true; + + // 获取列表 + $scope.getList = function(){ + var params = { + pageNo:$scope.pageNo || 1, + pageSize:$scope.pageSize || 20 + }; + params = angular.extend(params,$scope.search); + onWayService.onWayLine(params) + .then(function(result){ + if(result.success){ + + $scope.tableList = result.data; + $rootScope.totalPageALL = result.pageVo.totalPage; + if(true){ + $scope.Tools.page(document.getElementById('pages'),{ + pages : result.pageVo.totalPage, + curr : result.pageVo.pageNo, + count : result.pageVo.totalRecord, + limit:result.pageVo.pageSize + ,limits: [10,20,30,40,50] + },function(obj, first){ + $scope.fristSelect = first; //设置状态 + + if(!first){ //判断不是第一次加载 + var param = {}; + param.pageNo = obj.curr; //当前页 + param.pageSize = obj.limit; //最大页 + $scope.pageSize = obj.limit; //设置最大页 + $scope.pageNo = obj.curr; //设置当前页 + $scope.getList(param); + } + }) + } + }else{ + $scope.Tools.alert(result.message); } - }); + }) + }; + // $scope.getList = function(){ + // onWayService.onWayLine().then(function(data){ + // if(data.success){ + // $scope.tableList = data.data; + // } + // }); + // }; + /** + * 每隔5秒跳一个页面 + * @type {number} + */ + $scope.count = 1; + $scope.getList(); + $scope.time = setInterval(function(){ + $scope.pageNo < $rootScope.totalPageALL?$scope.pageNo++:$scope.pageNo=1; + $timeout(function(){ + $scope.getList(); + },1); + + },10000); + window.clearTimeout($rootScope.bs_timer1); window.clearTimeout($rootScope.bs_timer2); window.clearTimeout($rootScope.bs_timer3); diff --git a/public/js/wms-directive.js b/public/js/wms-directive.js index 76ef526f..3d89f8fc 100644 --- a/public/js/wms-directive.js +++ b/public/js/wms-directive.js @@ -158,4 +158,29 @@ var directive = angular.module('wms.directives', []) } } } - }]); \ No newline at end of file + }]) + .directive('transport',['$timeout',function($timeout){ + return { + restrict:'AE', + replace: true, + transclude: true, + scope:{ + ts:'=' + }, + templateUrl:'./templates/bigScreen/components/transport.html', + link: function(scope, elem, attrs, $timeout){ + scope.tsURL = ''; + scope.imageArr = [ + {name:'板车陆运',url:'tuobanche.png'}, + {name:'水运',url:'ship.png'}, + {name:'铁运',url:'train.png'}, + {name:'地跑陆运',url:'driver.png'} + ]; + for(var i=0; i + +
    \ No newline at end of file diff --git a/public/templates/bigScreen/onWay.html b/public/templates/bigScreen/onWay.html index bd2bd26d..911b4f53 100644 --- a/public/templates/bigScreen/onWay.html +++ b/public/templates/bigScreen/onWay.html @@ -5,6 +5,21 @@ 设置

前段在途

+
+
    +
  • +
    +
    还车状态
    +
    + +
    +
    +
    • +
+
@@ -20,7 +35,9 @@ - +
S/N{{key+1}} {{item.dispatchNo}} {{item.orderCount}}{{item.transModel}} + + {{item.startPlace}} @@ -32,4 +49,7 @@
+
+
+
\ No newline at end of file diff --git a/routes/resource/base-config.js b/routes/resource/base-config.js index a25394b8..38a92c8c 100644 --- a/routes/resource/base-config.js +++ b/routes/resource/base-config.js @@ -1,3 +1,3 @@ -/**Created on 2017-12-14*/ +/**Created on 2017-12-19*/ '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.4.76:8080/wms-extra-web/","ticketUser":{"phone":"11111111111","password":"123456a"}}; \ No newline at end of file -- Gitee From e9a3931fadbb518e2fb25b18f7baa75db6592e41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= <1308369732@qq.com> Date: Fri, 22 Dec 2017 18:27:58 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=8C=89=E6=9C=80?= =?UTF-8?q?=E5=A4=A7=E5=80=BC=E5=8A=A0=E4=B8=80=E7=99=BE=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/pom.json | 14 +- public/js/ctrl/b.ctrl.js | 192 +++++++++++++++++- public/js/ctrl/d.ctrl.js | 6 +- public/js/ctrl/p.ctrl.js | 12 +- public/js/ctrl/s.ctrl.js | 147 ++++++++++++-- public/js/ctrl/t.ctrl.js | 3 +- public/js/wms-config.js | 8 +- public/js/wms-constant.js | 10 + public/js/wms-filter.js | 20 ++ public/js/wms-service.js | 15 +- public/js/wms-tools.js | 89 ++++++++ .../index.html | 108 ++++++++++ .../layer/export.html | 17 ++ .../layer/openGate.html | 16 ++ .../scooterOffRegistration/layer/export.html | 16 ++ .../layer/openGate.html | 16 ++ .../scooter-off-registration-list.html | 58 +++--- routes/resource/base-config.js | 4 +- 18 files changed, 695 insertions(+), 56 deletions(-) create mode 100644 public/templates/inStorageManagement/boardCar-inventory-registration/index.html create mode 100644 public/templates/inStorageManagement/boardCar-inventory-registration/layer/export.html create mode 100644 public/templates/inStorageManagement/boardCar-inventory-registration/layer/openGate.html create mode 100644 public/templates/warehouseManagement/scooterOffRegistration/layer/export.html create mode 100644 public/templates/warehouseManagement/scooterOffRegistration/layer/openGate.html diff --git a/config/pom.json b/config/pom.json index 2113a521..4d7aad54 100644 --- a/config/pom.json +++ b/config/pom.json @@ -29,7 +29,7 @@ "devView": true, "validate": false, "tmsMap" : true, - "host" : "http://120.77.8.167/wms-extra-web/", + "host" : "http://10.20.30.111/wms-extra-web/", "ticketUser": { "phone": "11111111111", "password": "123456a" @@ -47,6 +47,18 @@ "password": "plc_SUnCe)F*`WI" } }, + "prol": { + "version": "1.0.2", + "compressed": false, + "devView": true, + "validate": false, + "tmsMap" : true, + "host" : "http://wms.unlcn.com/wms-extra-web/", + "ticketUser": { + "phone": "11111111111", + "password": "plc_SUnCe)F*`WI" + } + }, "local": { "version": "1.0.2", "compressed": false, diff --git a/public/js/ctrl/b.ctrl.js b/public/js/ctrl/b.ctrl.js index fad71ed4..5ec13473 100644 --- a/public/js/ctrl/b.ctrl.js +++ b/public/js/ctrl/b.ctrl.js @@ -670,4 +670,194 @@ wmsCtrl.controller('borrowCarRegistrationCtrl',['$scope','Tools','$rootScope','$ }]) .controller('bcr_image_detailCtrl',['$scope','$rootScope','$timeout',function($scope,$rootScope,$timeout){ - }]); + }]) + .controller('boardCarInventoryRegistrationCtrl',['$scope','$rootScope','$timeout','boardCarInventoryRegistrationService',function(scope,rootScope,$timeout,boardCarInventoryRegistrationService){ + //更多条件默认值 + scope.moreText = scope.constant.moreText.spread; + //更多条件 + scope.moreClick = function(){ + scope.otherForm = !scope.otherForm; + if(scope.otherForm){ + scope.moreText = scope.constant.moreText.packUp; + }else{ + scope.moreText = scope.constant.moreText.spread; + } + }; + scope.openGateList = [ + {name:'自动tms调用成功开启',value:'10'}, + {name:'页面手动开启闸门',value:'20'}, + {name:'系统闸门开启失败',value:'30'} + ]; + scope.exportSrc = "#"; + + scope.formatGet = function(obj){ + var temp ='?'; + var tempObj = { + userId:scope.userInfo.id, + whCode:scope.userInfo.whCode + }; + var selfObj = angular.extend(obj,tempObj); + for(var k in selfObj){ + temp+=(k+'='+selfObj[k])+'&'; + } + return temp; + }; + + scope.export = function(){ + // scope.Tools.dialog({ + // controller : 'boardCarInventoryRegistrationCtrl.dialog', + // template : 'templates/inStorageManagement/boardCar-inventory-registration/layer/export.html', + // width : 190, + // title : '导出' + // }) + scope.exportSrc = contextPath+'gate/inGateRecordImportExcel'+scope.formatGet(scope.search); + }; + + //enter 进场 + scope.openGate = function(str){ + scope.Tools.dialog({ + controller : 'boardCarInventoryRegistrationCtrl.dialog', + template : 'templates/inStorageManagement/boardCar-inventory-registration/layer/openGate.html', + width : 190, + data: { + drId: str, + searchObj: scope.search + }, + title : '进场原因' + }) + }; + + + //创建搜索对象 + scope.search = { + vehicle:'', + departureType:'', + startDeparturTime:'', + endDepartureTime:'' + }; + + //列表 + scope.fristSelect = true; //判断是否是第一次查询 + scope.list = function(params){ + //设置分页参数 + if(!params){ + params = {}; + } + params.pageSize = params.pageSize ? params.pageSize : scope.constant.page.pageSize; + params.pageNo = params.pageNo ? params.pageNo : scope.constant.page.pageNo; + + scope.search.departureType?scope.search.departureType=scope.search.departureType.value:''; + + params = angular.extend(params,scope.search); + + boardCarInventoryRegistrationService.inboundGateList(params) + .then(function(result){ + if(result.success){ + scope.inboundGateList = result.data; + + if(scope.fristSelect){ + scope.Tools.page(document.getElementById('pages'),{ + pages : result.pageVo.totalPage, + curr : result.pageVo.pageNo, + count : result.pageVo.totalRecord + },function(obj, first){ + scope.fristSelect = first; //设置状态 + //初始化多选框 + scope.Tools.initCheckBox(); + if(!first){ //判断不是第一次加载 + var param = scope.listParam(); + param.pageNo = obj.curr; //当前页 + param.pageSize = obj.limit; //最大页 + scope.pageSize = obj.limit; //设置最大页 + scope.pageNo = obj.curr; //设置当前页 + scope.list(param); + } + }) + }else{ + //初始化多选框 + scope.Tools.initCheckBox(); + } + }else{ + scope.Tools.alert(result.message); + } + }) + }; + //初始化列表 + rootScope.birGetList = scope.list; + scope.list(); + + + + //查询 click + scope.searchClick = function(){ + scope.fristSelect = true; //设置为第一次查询 + scope.list(); + }; + + //重置 click + scope.resetClick = function(){ + scope.search = {}; + scope.list(); + }; + + //刷新 click + scope.refreshClick = function(){ + scope.searchClick(); + } + + }]) + .controller('boardCarInventoryRegistrationCtrl.dialog',['$scope','$rootScope','gateService','ngDialog',function(scope,rootScope,gateService,ngDialog){ + // 导出 + scope.reason = ''; + scope.enterFlag = false; + scope.confirmEnter = function(){ + //入库类型查询 并打开闸门 + gateService.getByType(scope.constant.gateType.inbound) + .then(function(result){ + if(result.success){ + gateService.open(result.data.channel,scope.constant.gateController.open,scope.ngDialogData.queryParam + '-收货质检成功，闸门已打开',scope.ngDialogData.queryParam + '-收货质检成功，闸门已打开',scope.ngDialogData.queryParam + '-收货质检成功，闸门已打开') + .success(function(data,status,headers,config){ + scope.Tools.alert('闸门打开成功'); + }) + .error(function(data,status,headers,config){ + scope.Tools.alert('闸门打开失败'); + }) + }else{ + scope.Tools.alert(result.message); + } + }); + + // 调取后台 + boardCarInventoryRegistrationService.inboundGateOpen({drId:scope.ngDialogData.drId}).then(function(res){ + if(res.success){ + // 成功 + ngDialog.closeAll(); + rootScope.birGetList(); + setTimeout(function(){ + scope.Tools.alert(res.message); + },100); + } else{ + // 失败 + ngDialog.closeAll(); + scope.Tools.alert(res.message); + } + }); + console.log('drId',scope.ngDialogData.drId) + }; + scope.formatGet = function(obj){ + var temp ='?'; + for(var k in obj){ + temp+=(k+'='+obj[k])+'&' + } + return temp; + }; + + scope.dgChange = function(){ + if(scope.reason){ + scope.enterFlag = true; + scope.exportSrc = contextPath+'/gate/inGateRecordImportExcel'+scope.formatGet(scope.ngDialogData.search); + } else { + scope.enterFlag = false; + } + } + }]) diff --git a/public/js/ctrl/d.ctrl.js b/public/js/ctrl/d.ctrl.js index aa769256..dbdf4526 100644 --- a/public/js/ctrl/d.ctrl.js +++ b/public/js/ctrl/d.ctrl.js @@ -3,7 +3,7 @@ */ 'use strict'; -wmsCtrl.controller('distributionCtrl',['$scope','$rootScope','$timeout','$state','distributionService',function($scope,$rootScope,$timeout,$state,distributionService){ +wmsCtrl.controller('distributionCtrl',['$scope','$rootScope','$timeout','$state','Tools','distributionService',function($scope,$rootScope,$timeout,$state,$Tools,distributionService){ $scope.pt1 = { title: { @@ -177,6 +177,7 @@ wmsCtrl.controller('distributionCtrl',['$scope','$rootScope','$timeout','$state' //获取主报表 distributionService.distributionChartCount().then(function(res){ if(res.success && res.data!=null){ + $Tools.bigScreenGetYMax($scope.pt1,res.data); var r_d = res.data; var pt_D = $scope.pt1.series; var temp = []; @@ -225,7 +226,7 @@ wmsCtrl.controller('distributionCtrl',['$scope','$rootScope','$timeout','$state' },$rootScope.bs_intervalTime*60000) }]) - .controller('drayOutInCtrl',['$scope','$rootScope','$timeout','$state','drayOutInService',function($scope,$rootScope,$timeout,$state,drayOutInService){ + .controller('drayOutInCtrl',['$scope','$rootScope','$timeout','$state','Tools','drayOutInService',function($scope,$rootScope,$timeout,$state,$Tools,drayOutInService){ $scope.pt1 = { title: { @@ -410,6 +411,7 @@ wmsCtrl.controller('distributionCtrl',['$scope','$rootScope','$timeout','$state' //获取主报表 drayOutInService.inOutDrayChartCount().then(function(res){ if(res.success){ + $Tools.bigScreenGetYMax($scope.pt1,res.data); var r_d = res.data; var pt_D = $scope.pt1.series; var temp = []; diff --git a/public/js/ctrl/p.ctrl.js b/public/js/ctrl/p.ctrl.js index 1c151a1a..4bbc26a0 100644 --- a/public/js/ctrl/p.ctrl.js +++ b/public/js/ctrl/p.ctrl.js @@ -2,7 +2,7 @@ * Created by lihao on 2017/11/07. */ 'use strict'; -wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pickCarService',function($scope,$rootScope,$timeout,$state,pickCarService){ +wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','Tools','$state','pickCarService',function($scope,$rootScope,$timeout,$Tools,$state,pickCarService){ $scope.pt1 = { @@ -347,6 +347,13 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic radius: '65%', center: ['50%', '50%'], selectedMode: 'single', + label: { + normal: { + show: true, + formatter: '{b}: ({d}%)' + // formatter: '{b}: {c}({d}%)' + } + }, data: [ { value: 0, @@ -568,6 +575,7 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic //提车推移图 pickCarService.pickDataCount().then(function (res) { if (res.success && res.data != null) { + $Tools.bigScreenGetYMax($scope.pt1,res.data); var r_d = res.data; var pt_D = $scope.pt1.series; var temp = []; @@ -600,6 +608,7 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic //前端发运推移图 pickCarService.shipmentDataCount().then(function (res) { if (res.success && res.data != null) { + $Tools.bigScreenGetYMax($scope.pt2,res.data); var r_d = res.data; var pt_D = $scope.pt2.series; var temp = []; @@ -645,6 +654,7 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic // 发运模式推移图 pickCarService.transModelCount().then(function (res) { if (res.success && res.data != null) { + $Tools.bigScreenGetYMax($scope.pt4,'',$Tools.arrTotalMax(res.data)); var r_d = res.data; var pt_D = $scope.pt4.series; var temp = []; diff --git a/public/js/ctrl/s.ctrl.js b/public/js/ctrl/s.ctrl.js index dd209dfe..8cf01e5c 100644 --- a/public/js/ctrl/s.ctrl.js +++ b/public/js/ctrl/s.ctrl.js @@ -1564,7 +1564,7 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService scope.planDetailId = ''; scope.planId =''; }]) - .controller('scooterOffRegistrationCtrl',['$scope','scooterOffRegistrationService',function(scope,scooterOffRegistrationService){ //板车离场登记 + .controller('scooterOffRegistrationCtrl',['$scope','$rootScope','scooterOffRegistrationService',function(scope,rootScope,scooterOffRegistrationService){ //板车离场登记 //更多条件默认值 scope.moreText = scope.constant.moreText.spread; //更多条件 @@ -1575,21 +1575,33 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService }else{ scope.moreText = scope.constant.moreText.spread; } - } - - //下拉 - scope.dropDownList = { - openGateStatus : scope.Tools.dropDown.openGateStatusDropDown.concat(), //开闸状态 - departureType : scope.Tools.dropDown.departureTypeDropDown.concat() //离场类型 }; - scope.dropDownList.openGateStatus.unshift(scope.constant.defaultDropDownNullData); //插入开闸状态空值 - scope.dropDownList.departureType.unshift(scope.constant.defaultDropDownNullData); //插入离场类型空值 - //下拉默认值 - scope.dropDownDefault = { - openGateStatus : scope.dropDownList.openGateStatus[0], //开闸状态默认值 - departureType : scope.dropDownList.departureType[0] //离场类型 + scope.search = { + drVehiclePlate:'', + drDepartureType:'', + startDeparturTime:'', + endDepartureTime:'' }; + scope.openGateList = [ + {name:'自动tms调用成功开启',value:'10'}, + {name:'页面手动开启闸门',value:'20'}, + {name:'系统闸门开启失败',value:'30'} + ]; + + // //下拉 + // scope.dropDownList = { + // openGateStatus : scope.Tools.dropDown.openGateStatusDropDown.concat(), //开闸状态 + // departureType : scope.Tools.dropDown.departureTypeDropDown.concat() //离场类型 + // }; + // scope.dropDownList.openGateStatus.unshift(scope.constant.defaultDropDownNullData); //插入开闸状态空值 + // scope.dropDownList.departureType.unshift(scope.constant.defaultDropDownNullData); //插入离场类型空值 + // //下拉默认值 + // scope.dropDownDefault = { + // openGateStatus : scope.dropDownList.openGateStatus[0], //开闸状态默认值 + // departureType : scope.dropDownList.departureType[0] //离场类型 + // }; + //列表查询接口参数构造 scope.listParam = function(){ @@ -1604,14 +1616,13 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService } if(scope.otherForm){ //展开了更多 - scope.search.drOpenStatus = scope.dropDownDefault.openGateStatus.value; //开闸状态 - scope.search.drDepartureType = scope.dropDownDefault.departureType.value; //离场类型 + // scope.search.drOpenStatus = scope.dropDownDefault.openGateStatus.value; //开闸状态 + // scope.search.drDepartureType = scope.dropDownDefault.departureType.value; //离场类型 return scope.search; }else{ //没有展开 return {}; } } - //列表 scope.fristSelect = true; //判断是否是第一次查询 scope.list = function(params){ @@ -1622,6 +1633,10 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService params.pageSize = params.pageSize ? params.pageSize : scope.constant.page.pageSize; params.pageNo = params.pageNo ? params.pageNo : scope.constant.page.pageNo; + scope.search.drDepartureType?scope.search.drDepartureType=scope.search.drDepartureType.value:''; + + params = angular.extend(params,scope.search); + scooterOffRegistrationService.queryRegisterList(params) .then(function(result){ if(result.success){ @@ -1656,8 +1671,10 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService } //列表 + rootScope.sorlGetList = scope.list; scope.list(); + //查询 click scope.searchClick = function(){ scope.fristSelect = true; //设置为第一次查询 @@ -1666,7 +1683,13 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService //重置 click scope.resetClick = function(){ - scope.search = {}; + scope.search = { + drVehiclePlate:'', + drDepartureType:'', + startDeparturTime:'', + endDepartureTime:'' + }; + scope.list(); } //刷新 click @@ -1743,16 +1766,52 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService data : { departureType : scope.constant.departureType.errorDeparture, //离场类型 scooterOffRegistration : { - drId : scooterOffRegistrationList[0].drId //id + drId : scope.scooterOffRegistrationList[0].drId //id } }, width : 450, title : '异常离场', scope : scope }) - } + }; + scope.exportSrc = '#'; + + scope.formatGet = function(obj){ + var temp ='?'; + var tempObj = { + userId:scope.userInfo.id, + whCode:scope.userInfo.whCode + }; + var selfObj = angular.extend(obj,tempObj); + for(var k in selfObj){ + temp+=(k+'='+selfObj[k])+'&' + } + return temp; + }; + + scope.export = function(){ + // scope.Tools.dialog({ + // controller : 'scooterOffRegistrationCtrl.dialog', + // template : 'templates/warehouseManagement/scooterOffRegistration/layer/export.html', + // width : 190, + // title : '导出' + // }) + scope.exportSrc = contextPath+'departrueRegister/outGateRecordImportExcel'+scope.formatGet(scope.search); + }; + //enter 出场-- 开启 + scope.openGate = function(str){ + scope.Tools.dialog({ + controller : 'scooterOffRegistrationCtrl.dialog', + template : 'templates/warehouseManagement/scooterOffRegistration/layer/openGate.html', + width : 190, + data: { + drId: str + }, + title : '出场原因' + }) + }; }]) - .controller('scooterOffRegistrationCtrl.dialog',['$scope','scooterOffRegistrationService',function(scope,scooterOffRegistrationService){ //板车离场登记 dialog + .controller('scooterOffRegistrationCtrl.dialog',['$scope','$rootScope','ngDialog','scooterOffRegistrationService','gateService',function(scope,rootScope,ngDialog,scooterOffRegistrationService,gateService){ //板车离场登记 dialog //保存离场原因 click scope.saveDepartureReasonClick = function(){ @@ -1779,6 +1838,54 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService } }) } + }; + // 出库确认，并开启闸门 + scope.confirmEnter = function(){ + //入库类型查询 并打开闸门 + gateService.getByType(scope.constant.gateType.inbound) + .then(function(result){ + if(result.success){ + gateService.open(result.data.channel,scope.constant.gateController.open,scope.ngDialogData.queryParam + '-chuchang成功，闸门已打开',scope.ngDialogData.queryParam + '-收货质检成功，闸门已打开',scope.ngDialogData.queryParam + '-收货质检成功，闸门已打开') + .success(function(data,status,headers,config){ + scope.Tools.alert('闸门打开成功'); + }) + .error(function(data,status,headers,config){ + scope.Tools.alert('闸门打开失败'); + }) + }else{ + scope.Tools.alert(result.message); + } + }); + + // 调取后台 + scooterOffRegistrationService.outboundGateOpen({drId:scope.ngDialogData.drId}).then(function(res){ + if(res.success){ + // 成功 + ngDialog.closeAll(); + rootScope.sorlGetList(); + setTimeout(function(){ + scope.Tools.alert(res.message); + },100); + + } else{ + // 失败 + ngDialog.closeAll(); + scope.Tools.alert(res.message); + } + }); + console.log('drId',scope.ngDialogData.drId) + }; + + + // 导出 + scope.reason = ''; + scope.enterFlag = false; + scope.dgChange = function(){ + if(scope.reason){ + scope.enterFlag = true; + } else { + scope.enterFlag = false; + } } }]) .controller('searchWaybillStatusCtrl',['$scope','$rootScope','$timeout','searchWaybillStatusService',function($scope,$rootScope,$timeout,searchWaybillStatusService){ diff --git a/public/js/ctrl/t.ctrl.js b/public/js/ctrl/t.ctrl.js index 3fd3c011..8f329342 100644 --- a/public/js/ctrl/t.ctrl.js +++ b/public/js/ctrl/t.ctrl.js @@ -3,7 +3,7 @@ */ 'use strict'; -wmsCtrl.controller('transferDepotCtrl',['$scope','$rootScope','$timeout','$state','transferDepotService',function($scope,$rootScope,$timeout,$state,transferDepotService){ +wmsCtrl.controller('transferDepotCtrl',['$scope','$rootScope','$timeout','$state','Tools','transferDepotService',function($scope,$rootScope,$timeout,$state,$Tools,transferDepotService){ $scope.pt1 = { title: { @@ -141,6 +141,7 @@ wmsCtrl.controller('transferDepotCtrl',['$scope','$rootScope','$timeout','$state //获取报表表数据 transferDepotService.invoicingStatisticsChartCount().then(function(res){ if(res.success){ + $Tools.bigScreenGetYMax($scope.pt1,res.data,'','NoRight'); var r_d = res.data; var pt_D = $scope.pt1.series; var temp = []; diff --git a/public/js/wms-config.js b/public/js/wms-config.js index ab807272..71885600 100644 --- a/public/js/wms-config.js +++ b/public/js/wms-config.js @@ -347,7 +347,13 @@ angular.module('wmsApp', ['ui.router', 'wms.controllers', 'wms.services','wms.fi controller : 'inventoryRecordsQueryCtrl', url: '/inventory-records-query', templateUrl: 'templates/inStorageManagement/inventoryRecordsQuery/inventory-records-query-list.html' - }).state('shipment-plan', { //发运计划管理 + }).state('boardCar-inventory-registration',{ //板车入场登记 + //boardCar-inventory-registration + controller : 'boardCarInventoryRegistrationCtrl', + url: '/boardCar-inventory-registration', + templateUrl: 'templates/inStorageManagement/boardCar-inventory-registration/index.html' + }) + .state('shipment-plan', { //发运计划管理 url: '/shipment-plan', templateUrl: 'templates/warehouseManagement/shipmentPlan/shipment-plan-list.html', controller : 'shipmentPlanCtrl' diff --git a/public/js/wms-constant.js b/public/js/wms-constant.js index 1ba7bd8a..54732582 100644 --- a/public/js/wms-constant.js +++ b/public/js/wms-constant.js @@ -366,6 +366,16 @@ angular.module('wms.constant',[]) notOpen : '未开闸', open : '已开闸' }, + openGateStatusTwo : { //开闸状态 + planError : '计划内装车出场异常', + notPlanError : '非计划装车出场异常', + dischargeCargo : '卸车离场' + }, + openGateStatusNameTwo : { //开闸状态 name + planError : '计划内装车出场异常', + notPlanError : '非计划装车出场异常', + dischargeCargo : '卸车离场' + }, departureType : { //离场类型 normalDeparture : 10, //正常离场 errorDeparture : 20 //异常离场 diff --git a/public/js/wms-filter.js b/public/js/wms-filter.js index b6db0579..f260aec9 100644 --- a/public/js/wms-filter.js +++ b/public/js/wms-filter.js @@ -454,6 +454,26 @@ var wmsFilter = angular.module('wms.filter', []) return input; } }]) + .filter('departureTypeFt',function(){ + return function(str){ + if(str == '10'){ + return '自动tms调用成功开启' + } else if (str == '20') { + return '页面手动开启闸门' + } else if(str == '30'){ + return '系统闸门开启失败' + } + } + }) + .filter('isOpenGateFail',function(){ + return function(str){ + if(str == '30'){ + return true + } else { + return false + } + } + }) .filter('bs_ow_md',function(){ return function(str){ if(str=='ROAD'){ diff --git a/public/js/wms-service.js b/public/js/wms-service.js index c5ff925d..03a542f7 100644 --- a/public/js/wms-service.js +++ b/public/js/wms-service.js @@ -563,6 +563,9 @@ var wmsService = angular.module('wms.services', []) }, errorDeparture : function(data){ //异常离场 return httpService.customPOST('/departrueRegister/errorDeparture',data); + }, + outboundGateOpen: function(data){ + return httpService.customPOST('/departrueRegister/outboundGateOpen',data); } } }]) @@ -677,4 +680,14 @@ var wmsService = angular.module('wms.services', []) return HttpService.customPOST('/excpManage/updateToClosed',data) } } - }]); + }]) + .service('boardCarInventoryRegistrationService',['HttpService',function(HttpService){ + return { + inboundGateList : function(data){ + return HttpService.customPOST('gate/inboundGateList',data) + }, + inboundGateOpen: function(data){ + return HttpService.customPOST('gate/inboundGateOpen',data) + } + } + }]) diff --git a/public/js/wms-tools.js b/public/js/wms-tools.js index 12e7b2d3..d6da7b6e 100644 --- a/public/js/wms-tools.js +++ b/public/js/wms-tools.js @@ -7,6 +7,95 @@ wmsService.service('Tools',['ngDialog','constant','$timeout',function(ngDialog,c var self = this; return { + //bigScreen 大屏y轴的显示高度为最大值高度加100 + bigScreenGetYMax : function(obj,arr,total,NoRight){ + var temp =0; + if(total){ + temp = total; + } else { + for(var i=0; i 7 -> 70 + var inter = num/10; // 7 + obj.yAxis[0].max = num; // yMax = 700 + obj.yAxis[0].interval =10; // inter = 100 + if(!(NoRight=='NoRight')) { + obj.yAxis[1].max = Math.ceil(120 / inter) * inter; // 120/7 -> 18 -> 126 + obj.yAxis[1].interval = Math.ceil(120 / inter); // + } + } else if(temp<= 400){ + var num = (Math.floor(temp/100)+1)*100; // 657/100 -> 7 -> 700 ---> floor + var inter = num/100; // 7 + obj.yAxis[0].max = num; // yMax = 700 + obj.yAxis[0].interval =100; // inter = 100 + if(!(NoRight=='NoRight')) { + obj.yAxis[1].max = Math.ceil(120 / inter) * inter; // 120/7 -> 18 -> 126 + obj.yAxis[1].interval = Math.ceil(120 / inter); // + } + } else if (temp<=2000){ + var num = (Math.ceil(temp/100)+1)*100; // 657/100 -> 7 -> 700 -----> ceil + var inter = num/100; // 7 + obj.yAxis[0].max = num; // yMax = 700 + obj.yAxis[0].interval =200; // inter = 100 + if(!total){ + if(!(NoRight=='NoRight')) { + obj.yAxis[1].max = Math.ceil(120 / inter) * inter; // 120/7 -> 18 -> 126 + obj.yAxis[1].interval = Math.ceil(120 / inter); // + } + } + + } else if (temp <= 10000){ + var num = (Math.ceil(temp/1000)+1)*1000; // 657/100 -> 7 -> 700 -----> ceil + var inter = num/1000; // 7 + obj.yAxis[0].max = num; // yMax = 700 + obj.yAxis[0].interval =1000; // inter = 100 + if(!total){ + obj.yAxis[1].max = Math.ceil(120/inter)*inter; // 120/7 -> 18 -> 126 + obj.yAxis[1].interval = Math.ceil(120/inter); // + } + + } + }, + arrTotalMax : function(arr){ + var temp =0; + var tempArr =[]; + for(var i=0; i +
+
+ +
+ + + +
+
+
+
    +
  • +
    +
    车牌号
    +
    + +
    +
    +
    +
    开闸类型
    +
    + + + + + + + + + 没有加载到数据 + + +
    +
    + +
    • + +
  • +
    +
    离场时间从
    +
    + +
    +
    +
    +
    至
    +
    + +
    +
    +
    • + +
  • +
    + + +
    +
    • +
+
+
+ + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ 		车牌号开闸类型异常登记原因离场登记时间操作
+ +
+ +
+ 		+ +
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/public/templates/inStorageManagement/boardCar-inventory-registration/layer/export.html b/public/templates/inStorageManagement/boardCar-inventory-registration/layer/export.html new file mode 100644 index 00000000..77996225 --- /dev/null +++ b/public/templates/inStorageManagement/boardCar-inventory-registration/layer/export.html @@ -0,0 +1,17 @@ +
+
+ +
+
+ + + + +
+ +
\ No newline at end of file diff --git a/public/templates/inStorageManagement/boardCar-inventory-registration/layer/openGate.html b/public/templates/inStorageManagement/boardCar-inventory-registration/layer/openGate.html new file mode 100644 index 00000000..26820756 --- /dev/null +++ b/public/templates/inStorageManagement/boardCar-inventory-registration/layer/openGate.html @@ -0,0 +1,16 @@ +
+
+ +
+
+ + + +
+
\ No newline at end of file diff --git a/public/templates/warehouseManagement/scooterOffRegistration/layer/export.html b/public/templates/warehouseManagement/scooterOffRegistration/layer/export.html new file mode 100644 index 00000000..0693db6c --- /dev/null +++ b/public/templates/warehouseManagement/scooterOffRegistration/layer/export.html @@ -0,0 +1,16 @@ +
+
+ +
+
+ + + + +
+
\ No newline at end of file diff --git a/public/templates/warehouseManagement/scooterOffRegistration/layer/openGate.html b/public/templates/warehouseManagement/scooterOffRegistration/layer/openGate.html new file mode 100644 index 00000000..26820756 --- /dev/null +++ b/public/templates/warehouseManagement/scooterOffRegistration/layer/openGate.html @@ -0,0 +1,16 @@ +
+
+ +
+
+ + + +
+
\ No newline at end of file diff --git a/public/templates/warehouseManagement/scooterOffRegistration/scooter-off-registration-list.html b/public/templates/warehouseManagement/scooterOffRegistration/scooter-off-registration-list.html index 5bb92f24..b5b0813c 100644 --- a/public/templates/warehouseManagement/scooterOffRegistration/scooter-off-registration-list.html +++ b/public/templates/warehouseManagement/scooterOffRegistration/scooter-off-registration-list.html @@ -2,8 +2,11 @@
@@ -21,13 +24,13 @@
-
开闸状态
+
开闸类型
- + - + @@ -37,22 +40,22 @@
-
-
离场类型
-
- - - - - - - - - 没有加载到数据 - - -
-
+ + + + + + + + + + + + + + + +
  • @@ -89,10 +92,10 @@
    • 车牌号 - 开闸状态 - 离场类型 - 离场原因 + 开闸类型 + 异常登记原因 离场登记时间 + 操作 @@ -102,10 +105,13 @@
    - - + + + + + diff --git a/routes/resource/base-config.js b/routes/resource/base-config.js index 38a92c8c..88430e96 100644 --- a/routes/resource/base-config.js +++ b/routes/resource/base-config.js @@ -1,3 +1,3 @@ -/**Created on 2017-12-19*/ +/**Created on 2017-12-22*/ 'use strict'; - module.exports = {"version":"1.0.2","compressed":false,"devView":true,"validate":false,"tmsMap":true,"host":"http://10.2.4.76:8080/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://wms.unlcn.com/wms-extra-web/","ticketUser":{"phone":"11111111111","password":"plc_SUnCe)F*`WI"}}; \ No newline at end of file -- Gitee From de515d7022dff86676d5849ae7e402edcdca38b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= <1308369732@qq.com> Date: Sat, 23 Dec 2017 18:04:13 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E5=92=8C=E9=83=A8=E5=88=86=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/d.ctrl.js | 4 +- public/js/ctrl/o.ctrl.js | 5 +- public/js/ctrl/p.ctrl.js | 13 +++-- public/js/ctrl/s.ctrl.js | 49 +++++++++++++------ public/js/ctrl/t.ctrl.js | 4 +- public/js/wms-config.js | 4 +- public/js/wms-service.js | 6 ++- public/js/wms-tools.js | 8 +-- public/templates/bigScreen/distribution.html | 4 ++ .../layer/openGate.html | 11 +++-- .../scooter-off-registration-list.html | 38 +++++++------- routes/resource/base-config.js | 4 +- 12 files changed, 95 insertions(+), 55 deletions(-) diff --git a/public/js/ctrl/d.ctrl.js b/public/js/ctrl/d.ctrl.js index dbdf4526..faf0583c 100644 --- a/public/js/ctrl/d.ctrl.js +++ b/public/js/ctrl/d.ctrl.js @@ -220,6 +220,7 @@ wmsCtrl.controller('distributionCtrl',['$scope','$rootScope','$timeout','$state' window.clearTimeout($rootScope.bs_timer3); window.clearTimeout($rootScope.bs_timer4); window.clearTimeout($rootScope.bs_timer5); + window.clearTimeout($rootScope.onwayIntertime); $rootScope.bs_timer4 = setTimeout(function(){ $state.go('drayOutIn') @@ -454,7 +455,8 @@ wmsCtrl.controller('distributionCtrl',['$scope','$rootScope','$timeout','$state' window.clearTimeout($rootScope.bs_timer2); window.clearTimeout($rootScope.bs_timer3); window.clearTimeout($rootScope.bs_timer4); - window.clearTimeout($rootScope.bs_timer5); + window.clearInterval($rootScope.bs_timer5); + window.clearTimeout($rootScope.onwayIntertime); $rootScope.bs_timer3 = setTimeout(function(){ $state.go('distribution') diff --git a/public/js/ctrl/o.ctrl.js b/public/js/ctrl/o.ctrl.js index 89a6b123..195a897e 100644 --- a/public/js/ctrl/o.ctrl.js +++ b/public/js/ctrl/o.ctrl.js @@ -589,7 +589,7 @@ wmsCtrl.controller('outboundOrderCtrl', ['$scope','warehouseService','warehouseM */ $scope.count = 1; $scope.getList(); - $scope.time = setInterval(function(){ + $rootScope.onwayIntertime = setInterval(function(){ $scope.pageNo < $rootScope.totalPageALL?$scope.pageNo++:$scope.pageNo=1; $timeout(function(){ $scope.getList(); @@ -601,7 +601,8 @@ wmsCtrl.controller('outboundOrderCtrl', ['$scope','warehouseService','warehouseM window.clearTimeout($rootScope.bs_timer2); window.clearTimeout($rootScope.bs_timer3); window.clearTimeout($rootScope.bs_timer4); - window.clearTimeout($rootScope.bs_timer5); + window.clearInterval($rootScope.bs_timer5); + window.clearTimeout($rootScope.onwayIntertime); $rootScope.bs_timer1 = setTimeout(function(){ $state.go('transferDepot') diff --git a/public/js/ctrl/p.ctrl.js b/public/js/ctrl/p.ctrl.js index 4bbc26a0..f89d83f2 100644 --- a/public/js/ctrl/p.ctrl.js +++ b/public/js/ctrl/p.ctrl.js @@ -657,6 +657,7 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','Tools','$sta $Tools.bigScreenGetYMax($scope.pt4,'',$Tools.arrTotalMax(res.data)); var r_d = res.data; var pt_D = $scope.pt4.series; + $scope.pt4.series = []; var temp = []; for (var i = 0; i < r_d.length; i++) { var obj = { @@ -674,7 +675,8 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','Tools','$sta }; obj.data = r_d[i].data; obj.name = r_d[i].name; // 加载柱状图 - pt_D.push(obj); + // pt_D.push(obj); + $scope.pt4.series.push(obj) temp.push(r_d[i].name); } $scope.pt4.legend.data = temp; // 加载条件注释 @@ -690,9 +692,14 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','Tools','$sta window.clearTimeout($rootScope.bs_timer2); window.clearTimeout($rootScope.bs_timer3); window.clearTimeout($rootScope.bs_timer4); - window.clearTimeout($rootScope.bs_timer5); + clearInterval($rootScope.bs_timer5); + window.clearTimeout($rootScope.onwayIntertime); + $scope.getData(); + console.log(parseInt($rootScope.bs_intervalTime)); $rootScope.bs_timer5 = setInterval(function(){ + console.log('变化了') $scope.getData(); - },$rootScope.bs_intervalTime*60000) + },600000); + // },1000); }]); \ No newline at end of file diff --git a/public/js/ctrl/s.ctrl.js b/public/js/ctrl/s.ctrl.js index 8cf01e5c..85f6c690 100644 --- a/public/js/ctrl/s.ctrl.js +++ b/public/js/ctrl/s.ctrl.js @@ -1577,8 +1577,9 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService } }; scope.search = { - drVehiclePlate:'', - drDepartureType:'', + vehicle:'', + departureType:'', + departureInOutType:'', startDeparturTime:'', endDepartureTime:'' }; @@ -1588,6 +1589,10 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService {name:'页面手动开启闸门',value:'20'}, {name:'系统闸门开启失败',value:'30'} ]; + scope.outorInList = [ + {name:'出场', value:'OUT'}, + {name:'入场', value:'IN'} + ]; // //下拉 // scope.dropDownList = { @@ -1633,24 +1638,25 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService params.pageSize = params.pageSize ? params.pageSize : scope.constant.page.pageSize; params.pageNo = params.pageNo ? params.pageNo : scope.constant.page.pageNo; - scope.search.drDepartureType?scope.search.drDepartureType=scope.search.drDepartureType.value:''; + scope.search.departureType?scope.search.departureType=scope.search.departureType.value:''; + scope.search.departureInOutType?scope.search.departureInOutType=scope.search.departureInOutType.value:''; params = angular.extend(params,scope.search); scooterOffRegistrationService.queryRegisterList(params) .then(function(result){ if(result.success){ - scope.scooterOffRegistrationList = result.data.dataList; + scope.scooterOffRegistrationList = result.data; if(scope.fristSelect){ scope.Tools.page(document.getElementById('pages'),{ - pages : result.data.page.totalPage, - curr : result.data.page.pageNo, - count : result.data.page.totalRecord + pages : result.pageVo.totalPage, + curr : result.pageVo.pageNo, + count : result.pageVo.totalRecord },function(obj, first){ scope.fristSelect = first; //设置状态 //初始化多选框 - scope.Tools.initCheckBox(); + // scope.Tools.initCheckBox(); if(!first){ //判断不是第一次加载 var param = scope.listParam(); param.pageNo = obj.curr; //当前页 @@ -1684,8 +1690,9 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService //重置 click scope.resetClick = function(){ scope.search = { - drVehiclePlate:'', - drDepartureType:'', + vehicle:'', + departureType:'', + departureInOutType:'', startDeparturTime:'', endDepartureTime:'' }; @@ -1796,23 +1803,31 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService // width : 190, // title : '导出' // }) - scope.exportSrc = contextPath+'departrueRegister/outGateRecordImportExcel'+scope.formatGet(scope.search); + + scope.search.departureType?scope.search.departureType=scope.search.departureType.value:''; + scope.search.departureInOutType?scope.search.departureInOutType=scope.search.departureInOutType.value:''; + + scope.exportSrc = contextPath+'gate/gateRecordsImpot'+scope.formatGet(scope.search); }; //enter 出场-- 开启 - scope.openGate = function(str){ + scope.openGate = function(str,type){ scope.Tools.dialog({ controller : 'scooterOffRegistrationCtrl.dialog', template : 'templates/warehouseManagement/scooterOffRegistration/layer/openGate.html', width : 190, data: { - drId: str + drId: str, + type: type }, - title : '出场原因' + title : '异常原因' }) }; }]) .controller('scooterOffRegistrationCtrl.dialog',['$scope','$rootScope','ngDialog','scooterOffRegistrationService','gateService',function(scope,rootScope,ngDialog,scooterOffRegistrationService,gateService){ //板车离场登记 dialog + // 出场离场判断 + scope.departureInOutFlag = scope.ngDialogData.type || ''; + //保存离场原因 click scope.saveDepartureReasonClick = function(){ if(scope.ngDialogData.departureType == scope.constant.departureType.normalDeparture){ //正常离场 @@ -1858,7 +1873,11 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService }); // 调取后台 - scooterOffRegistrationService.outboundGateOpen({drId:scope.ngDialogData.drId}).then(function(res){ + var params = { + drId:scope.ngDialogData.drId, + departureReason:scope.search + }; + scooterOffRegistrationService.outboundGateOpen(params).then(function(res){ if(res.success){ // 成功 ngDialog.closeAll(); diff --git a/public/js/ctrl/t.ctrl.js b/public/js/ctrl/t.ctrl.js index 8f329342..2c4382ec 100644 --- a/public/js/ctrl/t.ctrl.js +++ b/public/js/ctrl/t.ctrl.js @@ -180,7 +180,9 @@ wmsCtrl.controller('transferDepotCtrl',['$scope','$rootScope','$timeout','$state window.clearTimeout($rootScope.bs_timer2); window.clearTimeout($rootScope.bs_timer3); window.clearTimeout($rootScope.bs_timer4); - window.clearTimeout($rootScope.bs_timer5); + window.clearInterval($rootScope.bs_timer5); + window.clearTimeout($rootScope.onwayIntertime); + $rootScope.bs_timer2 = setTimeout(function(){ $state.go('onWay'); },$rootScope.bs_intervalTime*60000) diff --git a/public/js/wms-config.js b/public/js/wms-config.js index 71885600..e829cc33 100644 --- a/public/js/wms-config.js +++ b/public/js/wms-config.js @@ -18,8 +18,8 @@ angular.module('wmsApp', ['ui.router', 'wms.controllers', 'wms.services','wms.fi window.clearTimeout($rootScope.bs_timer2); window.clearTimeout($rootScope.bs_timer3); window.clearTimeout($rootScope.bs_timer4); - window.clearTimeout($rootScope.bs_timer5); - console.log('Aa'); + window.clearInterval($rootScope.bs_timer5); + window.clearTimeout($rootScope.onwayIntertime); }); },1000); diff --git a/public/js/wms-service.js b/public/js/wms-service.js index 03a542f7..b4906e4b 100644 --- a/public/js/wms-service.js +++ b/public/js/wms-service.js @@ -556,7 +556,8 @@ var wmsService = angular.module('wms.services', []) .service('scooterOffRegistrationService',['HttpService',function(httpService){ //板车离场 service return { queryRegisterList : function(data){ //列表 - return httpService.customPOST('departrueRegister/queryRegisterList',data); + // return httpService.customPOST('departrueRegister/queryRegisterList',data); + return httpService.customPOST('gate/gateOpenFailList',data); }, normarDeparture : function(data){ //正常离场 return httpService.customPOST('/departrueRegister/normarDeparture',data); @@ -565,7 +566,8 @@ var wmsService = angular.module('wms.services', []) return httpService.customPOST('/departrueRegister/errorDeparture',data); }, outboundGateOpen: function(data){ - return httpService.customPOST('/departrueRegister/outboundGateOpen',data); + // return httpService.customPOST('/departrueRegister/outboundGateOpen',data); + return httpService.customPOST('gate/gateOpenByHm',data); } } }]) diff --git a/public/js/wms-tools.js b/public/js/wms-tools.js index d6da7b6e..3c36e7c3 100644 --- a/public/js/wms-tools.js +++ b/public/js/wms-tools.js @@ -63,12 +63,12 @@ wmsService.service('Tools',['ngDialog','constant','$timeout',function(ngDialog,c } } else if (temp <= 10000){ - var num = (Math.ceil(temp/1000)+1)*1000; // 657/100 -> 7 -> 700 -----> ceil + var num = (Math.floor(temp/1000))*1000; // 657/100 -> 7 -> 700 -----> ceil var inter = num/1000; // 7 - obj.yAxis[0].max = num; // yMax = 700 - obj.yAxis[0].interval =1000; // inter = 100 + obj.yAxis[0].max = num+500; // yMax = 700 + obj.yAxis[0].interval =500; // inter = 100 if(!total){ - obj.yAxis[1].max = Math.ceil(120/inter)*inter; // 120/7 -> 18 -> 126 + obj.yAxis[1].max = Math.ceil(120/inter)*(inter+1); // 120/7 -> 18 -> 126 obj.yAxis[1].interval = Math.ceil(120/inter); // } diff --git a/public/templates/bigScreen/distribution.html b/public/templates/bigScreen/distribution.html index bf011a0e..582b8cb9 100644 --- a/public/templates/bigScreen/distribution.html +++ b/public/templates/bigScreen/distribution.html @@ -17,6 +17,8 @@ 司机 联系电话 计划抵达时间 + 实际入场时间 + 实际出场时间 状态 @@ -27,6 +29,8 @@ {{item.dirverName}} {{item.phone}} {{item.planArriveTime}} + {{item.gateInTime}} + {{item.gateOutTime}} {{item.status}} diff --git a/public/templates/warehouseManagement/scooterOffRegistration/layer/openGate.html b/public/templates/warehouseManagement/scooterOffRegistration/layer/openGate.html index 26820756..7eee3f80 100644 --- a/public/templates/warehouseManagement/scooterOffRegistration/layer/openGate.html +++ b/public/templates/warehouseManagement/scooterOffRegistration/layer/openGate.html @@ -2,10 +2,13 @@
    diff --git a/public/templates/warehouseManagement/scooterOffRegistration/scooter-off-registration-list.html b/public/templates/warehouseManagement/scooterOffRegistration/scooter-off-registration-list.html index b5b0813c..54dc2b23 100644 --- a/public/templates/warehouseManagement/scooterOffRegistration/scooter-off-registration-list.html +++ b/public/templates/warehouseManagement/scooterOffRegistration/scooter-off-registration-list.html @@ -20,13 +20,13 @@
    车牌号
    - +
    开闸类型
    - + @@ -40,22 +40,22 @@
    - - - - - - - - - - - - - - - - +
    +
    进出场类型
    +
    + + + + + + + + + 没有加载到数据 + + +
    +
  • @@ -110,7 +110,7 @@ - + diff --git a/routes/resource/base-config.js b/routes/resource/base-config.js index 88430e96..33ae60d2 100644 --- a/routes/resource/base-config.js +++ b/routes/resource/base-config.js @@ -1,3 +1,3 @@ -/**Created on 2017-12-22*/ +/**Created on 2017-12-23*/ 'use strict'; - module.exports = {"version":"1.0.2","compressed":false,"devView":true,"validate":false,"tmsMap":true,"host":"http://wms.unlcn.com/wms-extra-web/","ticketUser":{"phone":"11111111111","password":"plc_SUnCe)F*`WI"}}; \ No newline at end of file + module.exports = {"version":"1.0.2","compressed":false,"devView":true,"validate":false,"tmsMap":true,"host":"http://10.2.4.76:8080/wms-extra-web/","ticketUser":{"phone":"11111111111","password":"123456a"}}; \ No newline at end of file -- Gitee From 6a87ac858c3f07326024852fb6856c19fcb3bfa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= <1308369732@qq.com> Date: Mon, 25 Dec 2017 10:00:35 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=94=E5=9B=9E=E6=83=85=E5=86=B5=E4=B8=8B?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/pom.json | 2 +- public/css/ils-wms-web.min.css | 2 +- public/js/build/ils-wms-web.min.js | 15 +-- public/js/build/ils-wms-web.tmpl.js | 170 +++++++++++++++++++++------- public/js/ctrl/p.ctrl.js | 2 +- public/js/wms-tools.js | 11 +- routes/resource/base-config.js | 4 +- 7 files changed, 151 insertions(+), 55 deletions(-) diff --git a/config/pom.json b/config/pom.json index 4d7aad54..f85d15ae 100644 --- a/config/pom.json +++ b/config/pom.json @@ -29,7 +29,7 @@ "devView": true, "validate": false, "tmsMap" : true, - "host" : "http://10.20.30.111/wms-extra-web/", + "host" : "http://120.77.8.167/wms-extra-web/", "ticketUser": { "phone": "11111111111", "password": "123456a" diff --git a/public/css/ils-wms-web.min.css b/public/css/ils-wms-web.min.css index a6479ba2..37a06363 100644 --- a/public/css/ils-wms-web.min.css +++ b/public/css/ils-wms-web.min.css @@ -1 +1 @@ -a{color:inherit}.container{height:100%}.kas-popup .popup{border-radius:5px}.kas-popup .popup-buttons{min-height:35px}.bar.bar-kas{border-color:#fc8325;background-color:#fc8325;background-image:linear-gradient(0deg,#fc8325,#fc8325 50%,transparent 50%);color:#fff}.bar.bar-kas .title{color:#fff}ion-tabs.tabs-color-active-kas .tab-item{color:#444}ion-tabs.tabs-color-active-kas .tab-item.activated,ion-tabs.tabs-color-active-kas .tab-item.active,ion-tabs.tabs-color-active-kas .tab-item.tab-item-active{color:#fc8325}ion-tabs.tabs-striped.tabs-color-active-kas .tab-item.activated,ion-tabs.tabs-striped.tabs-color-active-kas .tab-item.active,ion-tabs.tabs-striped.tabs-color-active-kas .tab-item.tab-item-active{border-color:#fc8325;color:#fc8325}.button.button-kas{border-color:transparent;background-color:#fc8325;color:#fff}.button.button-kas-default{border-color:transparent;background-color:#eee;color:#aaa}.button.button-kas-waring{border-color:transparent;background-color:#fac652;color:#fff}.button.button-kas-waring2{border-color:transparent;background-color:#fcc552;color:#9b7423}.button.button-kas-black{border:1px solid #fcc552;background-color:transparent;color:#fcc552}.kas-color,.weui_btn_dialog.primary,.weui_cells_checkbox .weui_check:checked+.weui_icon_checked:before{color:#fc8325}.button-outline-kas.sm,.button.button-kas-default.sm,.button.button-kas.sm{min-height:35px;height:35px;padding:5px 8px;line-height:inherit}.padding-0,.row.padding-0 .col{padding:0}.button.button-outline-kas{border-color:#fc8325;background:0 0;color:#fc8325}.weui_mask,.weui_mask_transition,.weui_mask_transparent{z-index:50}.kas-popup{border-radius:5px}.top50{top:50px}.top44{top:44px}.margin-top-0{margin-top:0}.margin-top-44{margin-top:44px}.margin-bottom-0{margin-bottom:0}.margin-bottom-5{margin-bottom:5px}.margin-bottom-7{margin-bottom:7px}.padding-10{padding:10px}.padding-20{padding:20px}.padding-lr-10{padding-left:10px;padding-right:10px}.padding-lr-20{padding-left:20px;padding-right:20px}.padding-top2{padding-top:2px}.padding-top20{padding-top:20px}.padding-top83{padding-top:83px}.padding-top-bottom-20{padding-top:20px;padding-bottom:20px}.font-13{font-size:13px}.font-15{font-size:15px}.kas-item-input{height:24px!important;font-size:16px!important}.kas-background-gray,.kas-background-invitation{background-color:#e9eaeb}.kas-overflow-hidden{overflow-x:hidden}.kas-overflow-auto{overflow-x:auto}.kas-max-content{width:-webkit-max-content;width:-moz-max-content;width:max-content}.kas-default-color{color:#aaa}.kas-white-color{color:#fff!important}.kas-invitaton-button{border:1px dashed #FBC652;color:#FBC652;width:100%;font-size:17px;text-align:center}.kas-invitaton-button-memo{font-size:12px;color:#bebfc2;text-align:center}.kas-invitation-title{color:#fff}.kas-invitation-title .line{display:inline-block;width:100%;border-top:1px solid rgba(255,255,255,.6)}.kas-invitation-title .text{line-height:26px}.kas-invitation-title .memo{color:#bebfc2}.kas-invitation-input{width:100%;border-radius:5px;padding-left:10px!important}.kas-transport .padding10{padding:10px}.kas-transport .no-text-overflow p{overflow:inherit;text-overflow:inherit;white-space:inherit}.filename,.layui-table td,.layui-table th,.layui-table tr,h1,h2,h3,h4,h5,p{text-overflow:ellipsis;white-space:nowrap}.kas-transport .margin-top10{margin-top:10px}.kas-transport .padding-top10{padding-top:1px}.kas-transport .p-color{color:#515151;font-size:12px;line-height:20px;margin:7px 0}.stanbus-stransport .title_style{font-size:12px;line-height:20px;color:#ff8213}.stanbus-firefly-toast{position:absolute;bottom:0;width:100%;text-align:center;transition:all .3s ease-in-out;opacity:0}.stanbus-firefly-toast.active{bottom:50px;opacity:1;z-index:15}.stanbus-firefly-toast .text{display:inline-block;border-radius:10px;padding:10px;background-color:rgba(0,0,0,.7);color:rgba(255,255,255,.8);text-align:center;text-overflow:ellipsis;font-size:15px}.stanbus-position-icon{top:5px}.stanbus-icon{vertical-align:middle;width:130px;height:130px;margin-bottom:20px}.stanbus-icon-sm{width:20px;height:20px;display:inline-block;position:relative}.stanbus-icon-sm.pwd{background:url(../images/icon/sm-pwd.png) no-repeat;background-size:18px 25px;width:18px;height:25px}.stanbus-icon-sm.phone{background:url(../images/icon/sm-phone.png) no-repeat;background-size:18px 25px;width:18px;height:25px}.stanbus-icon.plus{background:url(../images/icon/+.png) no-repeat;display:inline-block;background-size:130px 130px}.stanbus-icon-logistics{width:20px;height:20px;display:inline-block;position:absolute;left:-35px;z-index:10}.stanbus-icon-logistics.line{display:inline-block;border-left:1px solid #dcddde;position:absolute;width:1px;height:75px;top:15px;left:-26px;z-index:1}.stanbus-icon-logistics.active{background:url(../images/icon/logistics-active.png) no-repeat;background-size:20px 20px}.stanbus-icon-logistics.default{background:url(../images/icon/logistics.png) no-repeat;background-size:20px 20px;top:1px}.stanbus-logistics .weui_cell:before{left:50px}.stanbus-logistics .weui_cell{padding:10px 15px 10px 50px}.stanbus-icon-position{position:relative;top:9px}.stanbus-icon-from-to{width:80%;height:30px;display:inline-block;background:url(../images/from-to-icon.png) no-repeat;background-size:100% auto}h1,h2,h3,h4,h5,p{overflow:hidden}.stanbus-icon-sm.leave-date{background:url(../images/icon/sm-leave-date.png) no-repeat;background-size:20px 20px;top:4px}.stanbus-icon-sm.receive-date{background:url(../images/icon/sm-send-date.png) no-repeat;background-size:20px 20px;top:4px}.stanbus-line-height{line-height:30px}.border-right{border-right:1px solid #ccc}.kas-add-detail-padding{padding-left:7px!important;padding-top:3px!important}.kas-addr-padding{padding-left:7px!important;padding-top:17px!important}.padding-left10{padding-left:10px!important}.kas-brand-logo-icon{width:30px;display:inline-block;position:relative;top:3px}.popup-title{font-size:18px}.kas-icon-tab{width:26px;height:26px;display:inline-block}.kas-icon-tab.implementation{background:url(../images/icon/order-implementation-o.png) no-repeat;background-size:26px 26px}.kas-icon-tab.implementation.active{background:url(../images/icon/order-implementation.png) no-repeat;background-size:26px 26px}.kas-icon-tab.complete{background:url(../images/icon/order-complete-o.png) no-repeat;background-size:26px 26px}.kas-icon-tab.complete.active{background:url(../images/icon/order-complete.png) no-repeat;background-size:26px 26px}.kas-tabs{border-bottom:1px solid #eee;display:flex;position:absolute;z-index:1;width:100%;background-color:#fff}.kas-tabs .tab{position:relative;display:block;-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1;padding:10px 0 2px;text-align:center;font-size:15px;-webkit-tap-highlight-color:transparent;border-bottom:3px solid #fff;transition:border-bottom .2s ease-in-out}.kas-tabs .tab:after{content:" ";position:absolute;right:0;top:0;width:1px;height:100%;color:#ccc;-webkit-transform-origin:100% 0;transform-origin:100% 0;-webkit-transform:scaleX(.5);transform:scaleX(.5)}.kas-tabs .tab.active{border-bottom:3px solid #ff8213}.border-top{border-top:1px solid #eee}.kas-inner-line{display:inline-block}.kas-form .weui_cell_hd{width:100px}.kas-form input{font-size:100%}.kas-img{width:130px;height:130px;border:1px dashed #ccc}.kas-city-background-color{background-color:#e2e2e2;color:#FFF}.weui_search_text{top:3px}.weui_icon_clear:before,.weui_icon_search:before{color:#fc8325;font-size:14px}.kas-overflow-y-hidden{height:100%;overflow:hidden}.kas-overflow-y-auto{height:100%;overflow-y:auto}.filename,.uploader{overflow:hidden;cursor:default}.kas-flex-top{position:absolute;z-index:1;width:100%;background-color:#ff8213;color:#fff}.weui_dialog{z-index:50}.kas-nav-right-header{position:absolute;right:0;top:0;padding:0 20px 0 0;background:0 0}.kas-nav-left-header{position:absolute;top:0;padding:0;background:0 0;left:220px;width:60%}.layui-input,.layui-select,.layui-textarea{height:32px;line-height:32px;font-size:12px!important}.layui-form-label{padding:6px 15px;font-size:13px!important}.layui-form-select dl{top:31px;font-size:12px!important}.circle{background-image:-webkit-linear-gradient(to right,#2c2f51,#482686,#491e67);background-image:linear-gradient(to right,#2c2f51,#482686,#491e67)}.layui-nav-tree .layui-nav-child dd.layui-this,.layui-nav-tree .layui-this,.layui-nav-tree .layui-this>a,.layui-nav-tree .layui-this>a:hover{background-color:#232b3b;border-left:2px solid #de531a}.layui-bg-black{background-color:#2c3551}.layui-nav{background-color:transparent}.layui-nav-itemed>a,.layui-nav-tree .layui-nav-title a,.layui-nav-tree .layui-nav-title a:hover{background-color:#29324b!important}.layui-nav .layui-this:after,.layui-nav-bar,.layui-nav-tree .layui-nav-itemed:after{height:3px!important;background-color:transparent}.button,.filename{height:32px;display:inline-block;float:left;outline:0}.layui-nav-tree .layui-nav-bar{background-color:transparent}.layui-nav .layui-nav-item{line-height:56px!important}.layui-this-nav{border-bottom:3px solid #de531a!important}.layui-table td,.layui-table th{font-size:11px}.uploader{position:relative;display:inline-block;padding:0;margin:10px 0;-moz-box-shadow:0 0 5px #ddd;-webkit-box-shadow:0 0 5px #ddd;box-shadow:0 0 5px #ddd;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px}.filename{width:180px;margin:0;padding:8px 10px;border:1px solid #ccc;border-right:0;font:9pt/100% Arial,Helvetica,sans-serif;color:#777;text-shadow:1px 1px 0 #fff;-moz-border-radius:5px 0 0 5px;-webkit-border-radius:5px 0 0 5px;border-radius:5px 0 0 5px;background:#f5f5f5;background:-moz-linear-gradient(top,#fafafa 0,#eee 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#fafafa),color-stop(100%,#f5f5f5));filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fafafa', endColorstr='#f5f5f5', GradientType=0);-moz-box-shadow:0 0 1px #fff inset;-webkit-box-shadow:0 0 1px #fff inset;box-shadow:0 0 1px #fff inset;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.button{padding:8px 12px;margin:0;cursor:pointer;border:1px solid #ccc;font:700 9pt/100% Arial,Helvetica,sans-serif;-moz-border-radius:0 5px 5px 0;-webkit-border-radius:0 5px 5px 0;border-radius:0 5px 5px 0;-moz-box-shadow:0 0 1px #fff inset;-webkit-box-shadow:0 0 1px #fff inset;box-shadow:0 0 1px #fff inset;background-color:#f5f5f5}*,.layui-btn{font-size:12px}.uploader input[type=file]{position:absolute;top:0;right:0;bottom:0;border:0;padding:0;margin:0;height:30px;cursor:pointer;filter:alpha(opacity=0);-moz-opacity:0;-khtml-opacity:0;opacity:0}input[type=button]::-moz-focus-inner{padding:0;border:0;-moz-box-sizing:content-box}input[type=button]::-webkit-focus-inner{padding:0;border:0;-webkit-box-sizing:content-box}input[type=text]::-moz-focus-inner{padding:0;border:0;-moz-box-sizing:content-box}input[type=text]::-webkit-focus-inner{padding:0;border:0;-webkit-box-sizing:content-box}*{margin:0;padding:0;font-family:"微软雅黑"}.custom_float_left{float:left}.custom_float_right{float:right}.contentBox *{box-sizing:content-box!important}.contentBox .layui-laypage-skip input,button{position:relative;top:-1px}.layui-btn{background-color:#de531a;border-radius:7px!important;padding:0 7px;height:26px!important;line-height:25px!important;min-width:62px}.bcrLayer table{margin:10px auto}.bcrLayer table td{border:1px solid #000!important}.wms-main-page-function{position:relative;margin-left:10px;min-width:925px;height:100%;padding-right:10px}.main-content,.scrollTable{min-width:1000px}body,html{box-sizing:content-box;height:100%;width:100%}.bs_fullScreen,.bs_pc_part,.wbph5,.wms-layer-add-tr td{box-sizing:border-box}.page-function{height:37px}.wms-wbm-fun-left{float:left}.bcr-add-image{width:175px;height:128px;position:relative;background-image:url(../images/u8117.png)}.bcr-add-image:hover{cursor:pointer}.wms-wbm-fun-left .wms-wbm-fun-left-label{width:280px;height:40px;line-height:30px}.wms-wbm-fun-left .wms-wbm-fun-left-label>div:first-child{width:95px;height:100%;float:left}.wms-wbm-fun-left .wms-wbm-fun-left-label>div:last-child{width:170px;height:100%;float:left}.wms-wbm-fun-right{float:right;margin-right:8px;position:relative;top:-4px}.ngdialog-header{font-size:14px;margin-bottom:5px}.search-input{width:160px;height:26px;line-height:27px;position:relative;top:2px;margin-right:2px;border:1px solid #cedce2!important;padding-left:8px}.clear{clear:both}.ui-select-bootstrap .ui-select-choices-row>span{height:22px}.scrollTable{overflow-x:auto;margin-top:3px;padding-bottom:7px;padding-right:6px;height:475px}.stockUnitForm,.stockUnit_top{min-width:1024px}.layui-table{margin:0!important;position:relative}.layui-table.wms_wbm_main_table.minScreen{text-align:center}.layui-table tr{height:22px;overflow:visible}.layui-table th{padding:0 10px;font-size:12px;line-height:20px!important;overflow:hidden;background-color:#f2f2f2!important;min-height:20px;border:1px solid #cedde2;color:#000;font-weight:700}.layui-table tr,option,select,td,th{text-align:center!important;border:1px solid #cedce2;cursor:pointer}.layui-table td{padding:0 10px!important;border:1px solid #cedde2;color:#666;overflow:visible}.layui-table.serial tr th:nth-child(1){width:11px}.layui-table .layui-unselect .layui-icon{width:14px!important;height:14px!important}.layui-form-checkbox .layui-icon{line-height:14px!important}.layui-form-checked[lay-skin=primary] i{border-color:#de531a;background-color:#de531a}.btn_margin{margin-left:10px}.btn_parent:hover .btn_spread{display:block}.btn_spread{width:93px;height:80px;position:absolute;display:none;z-index:1}::-webkit-scrollbar{width:5px;height:5px;background-color:#e2e2e2}/*!*滚动条的滑块按钮*!*/::-webkit-scrollbar-thumb{background-color:#c5c5c5}::-webkit-scrollbar-thumb:hover{background-color:#9e9e9e}::-webkit-scrollbar-button{width:0;height:0;border-top:30px solid transparent;border-bottom:30px solid transparent;border-right:30px solid #ff0}.dialog-body{width:97%;height:320px;margin:10px auto 0}.dialog-body.autoHeight{height:auto}.dialog-body .dialog-body-ul{width:100%;height:auto}.dialog-body .dialog-body-ul .dialog-body-li{width:100%;height:40px;float:left}.dialog-body .dialog-body-ul .dialog-body-li.textarea{height:35%}.dialog-body .dialog-body-ul .dialog-body-li .dialog-body-item{width:230px;height:100%;float:left;margin-right:7px}.dialog-body .dialog-body-ul .dialog-body-li .dialog-body-item>div{float:left}.dialog-body .dialog-body-ul .dialog-body-li .dialog-body-item .dialog-label{width:80px;height:100%;line-height:40px}.dialog-body .dialog-body-ul .dialog-body-li .dialog-body-item .dialog-content{width:150px;height:100%;padding-top:5px}.dialog-body .dialog-body-ul .dialog-body-li .dialog-body-item .dialog-content input{height:27px;line-height:normal}.dialog-body .dialog-body-ul .dialog-body-li .dialog-body-item.max_item{width:340px}.dialog-body .dialog-body-ul .dialog-body-li .dialog-body-item.max_item .dialog-content{width:259px}.dialog-toolbar{height:35px;width:100%;padding-left:57%;margin-top:8px}.dialog-body .qr-code{width:100%;height:240px}.dialog-body .qr-code .qr-code-top{width:100%;height:200px}.dialog-body .qr-code .qr-code-down{width:100%;height:30px}.dialog-body .qr-code .qr-code-top .qr-code-top-left{float:left;width:160px;margin-right:5px;height:100%}.dialog-body .qr-code .qr-code-top .qr-code-top-right{float:left;width:200px}.dialog-body .qr-code .qr-code-top .qr-code-top-right>div{width:250px;height:40px;margin-bottom:40px}.dialog-body .qr-code .qr-code-top .qr-code-top-right>div:last-child{width:250px;height:40px;margin-bottom:inherit}.dialog-body .qr-code .qr-code-top .qr-code-top-right>div>div{float:left;width:60px}.dialog-body .qr-code .qr-code-top .qr-code-top-right>div>div:last-child{width:150px}.dialog-body .qr-code .qr-code-down>div:first-child{width:60px;float:left}.dialog-body .dialog-body-ul .areaZtree{width:360px;height:310px;float:left}.dialog-body .dialog-body-ul .areaOperation{width:66px;height:300px;float:left;padding-top:120px}.dialog-body .dialog-body-ul .areaOperation .left_btn{width:25px;height:20px;background:url(../images/left_btn.png);margin:0 auto;cursor:pointer}.dialog-body .dialog-body-ul .areaOperation .right_btn{width:25px;height:20px;background:url(../images/right_btn.png);margin:0 auto 45px;cursor:pointer}.dialog-body .dialog-body-ul .areaTable{width:320px;height:310px;float:left;overflow-y:auto}.dialog-body .dest,.dialog-body .origin{width:175px;height:100%;float:left}.dialog-body .dest .dest_title,.dialog-body .origin .origin_title{width:100%;height:20px;line-height:20px}.otherForm{width:98%;height:auto;margin:0 auto}.otherForm>ul{width:100%;height:auto}.otherForm>ul>li{width:100%;height:40px}.otherForm ul li .otherFormItem{width:255px;height:100%;float:left;margin-right:20px}.otherForm ul li .otherFormItem>div:first-child{width:75px;height:100%;float:left;line-height:40px}.otherForm ul li .otherFormItem>div:last-child{padding-top:5px;width:180px;height:40px;float:left}.otherForm ul li div.otherFormItemButton{margin-left:75%}.otherForm ul li div.otherFormItemButton button{margin-top:7px;float:left}.stockUnit_top{height:320px}.stockUnit_top .stockUnit_top_left,.stockUnit_top .stockUnit_top_right{width:50%;float:left}.stockUnit_down,table{width:100%}.stockUnit_title{width:100%;height:30px}.stockUnit_title>buttom{float:left}.stockUnitForm .stockUnit_content{height:221px;overflow-y:auto}table{font-size:1rem;text-align:center}table tr.checkStatus{background-color:#e9f0d8}.ztree{width:175px;height:288px;overflow:auto}.ztree li{line-height:inherit}.ztree li ul{padding:0}.ztree li span.button{padding:0;cursor:pointer;margin:0}.custom_table{width:100%;height:auto;margin:0 auto}.custom_table tr td{height:36px;cursor:default}.wms-icon:hover,.wms-refresh{cursor:pointer;color:#de531a}.custom_table .custom_table_label{width:100px}.custom_table .custom_table_content{width:168px}.wms-refresh{top:5px;left:5px;opacity:.9;font-size:24px!important;position:relative}.layui-anim-rotate{-webkit-transform-origin:50% 50%;-moz-transform-origin:50% 50%;-o-transform-origin:50% 50%;-ms-transform-origin:50% 50%;transform-origin:50% 50%}.print-title{width:100%;height:40px;font-size:20px;text-align:center}.print-footer{margin-top:40px;width:100%;height:15px;padding-left:30%;margin-bottom:20px}.print-footer>div{float:left;width:160px;height:100%}.print_time_select{width:100%;height:40px}.print_time_select>div{float:left;line-height:35px;margin-right:10px}.print_time_select>div>div{float:left}.print_time_select>div>div:first-child{width:70px}.print_time_select>div>div>button{margin-top:5px}.key_left,.key_right{width:50%;height:470px;float:left;border:1px solid #666}.key_left>div.key_top,.key_right>div.key_top{width:100%;height:40px;margin-top:50px;margin-bottom:20px}.key_left>div.key_top>div:first-child,.key_right>div.key_top>div:first-child{width:30%;float:left;line-height:33px;text-align:right;padding-right:15px}.key_left>div.key_top>div:last-child,.key_right>div.key_top>div:last-child{width:30%;float:left}.key_left>div.key_body,.key_right>div.key_body{width:50%;margin:0 auto}.key_left>div.key_body>table>tbody>tr,.key_right>div.key_body>table>tbody>tr{height:45px}.role_left_ul{width:300px!important;height:200px!important;float:left}.role_right_tree{border:1px solid #000;width:300px;height:260px;float:left;margin-bottom:20px;overflow:auto}.wms-icon i{font-size:24px;position:relative;top:3px;left:-2px}.wms-bd-none-main td{border:1px solid #fff!important;padding:0 5px}.wms-bd-none td{border:1px solid #f0f0f0!important;padding:0 5px}.wms-bd-none-main tbody tr:hover{background-color:#fff!important}.wms-layer .layui-input{margin:5px 0;height:24px}.wms-layer-heard th{height:24px}.wms-layer-add-tr td{padding:0 5px}.wms-layer-btn{margin:5px 0 0;height:20px}.trSelect{background-color:#e9f0d8!important}.upload_btn{width:30px}.upload_btn input[type=file]{float:left;position:relative;right:0;width:120%;opacity:0;filter:alpha(opacity=0);outline:0;cursor:pointer!important;top:-23px;left:-5px}.print_outbound_receipt_top .wbph1{box-sizing:border-box;text-align:center}.print_outbound_receipt_top .wbph2{font-size:16px;text-align:center}.print_outbound_receipt_top .imgB{width:145px;margin:10px 30px;float:left}.print_outbound_receipt_top .wbph4{text-align:center;margin:13px 0}.wbph5{padding-left:634px}.print_outbound_receipt_top .w80{width:80px!important}.print_outbound_receipt_top .w120{width:120px!important}.print_outbound_receipt_top .w306{width:306px!important}.print_outbound_receipt_top .w174{width:174px!important}@media print{.print_outbound_receipt{margin-left:10px}}.print_outbound_receipt_top table td{padding:3px 5px!important}.print_outbound_receipt .layui-table,.print_outbound_receipt .layui-table td,.print_outbound_receipt .layui-table th,.print_outbound_receipt .layui-table>tr{border:1px solid #000!important}.print_outbound_receipt .layui-table th{background-color:transparent!important}.print_outbound_receipt_title{width:100%;height:100px}.print_outbound_receipt_title .receipt_title_left{width:160px;height:100%;float:left;padding-top:20px;margin-left:7%}.print_outbound_receipt_title .receipt_title_center{width:300px;height:100%;float:left;font-size:24px;text-align:center;font-weight:700;line-height:80px}.print_outbound_receipt_title .receipt_title_right{width:120px;height:100%;float:left}.print_outbound_receipt_top{width:100%;height:auto;margin-bottom:10px}.print_outbound_receipt_top .receipt_top_title{width:28%;height:20px;line-height:20px;font-size:16px;margin:0 auto}.brcPrintMain table{margin-bottom:10px!important}.print_outbound_receipt_top .receipt_top_bar_code{width:253px;height:100px;text-align:center;margin:10px auto 0}.print_outbound_receipt_top .receipt_top_bar_code>img{height:100px}.print_outbound_receipt_top .receipt_top_table{margin-top:10px;width:100%;height:auto}.receipt_top_table .print_table_min th{padding:0 3px}.receipt_top_table tr td.black_td{color:#000;font-weight:700}.layui-table tr td.tr_td{word-wrap:break-word;word-break:break-all;white-space:normal}.print_outbound_receipt_body{width:100%;height:auto}.print_outbound_receipt_down{margin-top:15px;width:100%;height:160px;border:1px solid #000}.print_outbound_receipt_down .print_outbound_receipt_down_left{width:49%;height:100%;float:left;border-right:1px solid #000}.print_outbound_receipt_down .print_outbound_receipt_down_right{width:50%;height:100%;float:left}.print_outbound_receipt_down .print_outbound_receipt_down_left>div,.print_outbound_receipt_down .print_outbound_receipt_down_right>div{width:100%;height:40px;color:#000}.print_outbound_receipt_down .print_outbound_receipt_down_left>div:last-child,.print_outbound_receipt_down .print_outbound_receipt_down_right>div:last-child{border-top:1px solid #000}.print_outbound_receipt_down .print_outbound_receipt_down_left>div:last-child>div:first-child,.print_outbound_receipt_down .print_outbound_receipt_down_right>div:last-child>div:first-child{border-right:1px solid #000}.print_outbound_receipt_down .print_outbound_receipt_down_left>div:last-child>div,.print_outbound_receipt_down .print_outbound_receipt_down_right>div:last-child>div{width:49%;height:100%;float:left}.print_outbound_receipt_footer{width:100%;height:20px;line-height:20px;margin-top:10px;margin-bottom:10px}.print_outbound_receipt_footer>div{width:25%;float:left}.out_confirm_left,.out_confirm_right{width:50%;height:350px;float:left}.out_confirm_left>div:first-child,.out_confirm_right>div:first-child{width:100%;height:35px}.out_confirm_left>div:first-child>div:first-child,.out_confirm_right>div:first-child>div:first-child{width:20%;height:100%;float:left;line-height:35px}.out_confirm_left>div:first-child>div:last-child,.out_confirm_right>div:first-child>div:last-child{width:70%;height:100%;float:left}.out_confirm_left>div:last-child,.out_confirm_right>div:last-child{margin-top:10px;width:90%;height:100%;float:left}#bs_pc_main canvas{width:100%}#bs_pc_main{width:100%;height:100%}.bs_pc_rootBox{display:-webkit-box;display:-moz-box;display:-ms-flexbox;display:-webkit-flex;display:flex;display:-webkit-box;height:50%;width:100%}.bs_pc_part{-webkit-box-flex:1;-moz-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1;border:1px solid #000;margin:5px;overflow:hidden;background-image:-webkit-radial-gradient(#737373,#2b2b2b);background-image:radial-gradient(#737373,#2b2b2b)}#bs_ow_heard{padding:10px 0 20px;text-align:center;font-size:30px}#bs_db_main table,#bs_ow_main table,#bs_td1_main table,#bs_td2_main table{width:100%;border-collapse:collapse}#bs_db_main th,#bs_ow_main th,#bs_td1_main th,#bs_td2_main th{background-color:#bdd7ee}#bs_ow_main td,#bs_ow_main th{border-bottom:1px solid #000;border-top:1px solid #000;border-left:0 solid #000;border-right:0 solid #000;text-align:center;padding:10px 0}#bs_db_main,#bs_td1_main,#bs_td2_main{display:-webkit-flex;flex-direction:column;-webkit-flex-direction:column;height:100%;width:100%}#bs_db_box,#bs_td1_box,#bs_td2_box{-webkit-box-flex:1;-moz-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1;background-image:-webkit-radial-gradient(#737373,#2b2b2b);background-image:radial-gradient(#737373,#2b2b2b)}#bs_db_table,#bs_td1_table,#bs_td2_table{-webkit-box-flex:1;-moz-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1;margin-top:15px}#bs_db_main td,#bs_db_main th,#bs_td1_main td,#bs_td1_main th,#bs_td2_main td,#bs_td2_main th{border:1px solid #000;text-align:center;padding:10px 0}#bs_ow_cp_pt_main{width:100%;background-color:#bfbfbf;height:20px;overflow:hidden}#bs_ow_cp_pt_percentage,.bs_ow_cp_pt_temp{height:100%;float:left;display:inline-block}#bs_ow_cp_pt_main table td{border-left:0 solid #000!important;border-right:0 solid #000!important}#bs_ow_cp_pt_percentage{background-color:#5b9bd5;width:0}.bs_ow_cp_pt_temp{width:10px;background-color:#ed7d31}.bs_ow_cp_pt_temp1{float:left;color:#fff;display:inline-block;line-height:22px;margin-left:5px}.bs_fullScreen{width:89px;position:absolute;z-index:9999;border:1px solid transparent;height:48px;padding:15px 0 0 15px} \ No newline at end of file +a{color:inherit}.container{height:100%}.kas-popup .popup{border-radius:5px}.kas-popup .popup-buttons{min-height:35px}.bar.bar-kas{border-color:#fc8325;background-color:#fc8325;background-image:linear-gradient(0deg,#fc8325,#fc8325 50%,transparent 50%);color:#fff}.bar.bar-kas .title{color:#fff}ion-tabs.tabs-color-active-kas .tab-item{color:#444}ion-tabs.tabs-color-active-kas .tab-item.activated,ion-tabs.tabs-color-active-kas .tab-item.active,ion-tabs.tabs-color-active-kas .tab-item.tab-item-active{color:#fc8325}ion-tabs.tabs-striped.tabs-color-active-kas .tab-item.activated,ion-tabs.tabs-striped.tabs-color-active-kas .tab-item.active,ion-tabs.tabs-striped.tabs-color-active-kas .tab-item.tab-item-active{border-color:#fc8325;color:#fc8325}.button.button-kas{border-color:transparent;background-color:#fc8325;color:#fff}.button.button-kas-default{border-color:transparent;background-color:#eee;color:#aaa}.button.button-kas-waring{border-color:transparent;background-color:#fac652;color:#fff}.button.button-kas-waring2{border-color:transparent;background-color:#fcc552;color:#9b7423}.button.button-kas-black{border:1px solid #fcc552;background-color:transparent;color:#fcc552}.kas-color,.weui_btn_dialog.primary,.weui_cells_checkbox .weui_check:checked+.weui_icon_checked:before{color:#fc8325}.button-outline-kas.sm,.button.button-kas-default.sm,.button.button-kas.sm{min-height:35px;height:35px;padding:5px 8px;line-height:inherit}.padding-0,.row.padding-0 .col{padding:0}.button.button-outline-kas{border-color:#fc8325;background:0 0;color:#fc8325}.weui_mask,.weui_mask_transition,.weui_mask_transparent{z-index:50}.kas-popup{border-radius:5px}.top50{top:50px}.top44{top:44px}.margin-top-0{margin-top:0}.margin-top-44{margin-top:44px}.margin-bottom-0{margin-bottom:0}.margin-bottom-5{margin-bottom:5px}.margin-bottom-7{margin-bottom:7px}.padding-10{padding:10px}.padding-20{padding:20px}.padding-lr-10{padding-left:10px;padding-right:10px}.padding-lr-20{padding-left:20px;padding-right:20px}.padding-top2{padding-top:2px}.padding-top20{padding-top:20px}.padding-top83{padding-top:83px}.padding-top-bottom-20{padding-top:20px;padding-bottom:20px}.font-13{font-size:13px}.font-15{font-size:15px}.kas-item-input{height:24px!important;font-size:16px!important}.kas-background-gray,.kas-background-invitation{background-color:#e9eaeb}.kas-overflow-hidden{overflow-x:hidden}.kas-overflow-auto{overflow-x:auto}.kas-max-content{width:-webkit-max-content;width:-moz-max-content;width:max-content}.kas-default-color{color:#aaa}.kas-white-color{color:#fff!important}.kas-invitaton-button{border:1px dashed #FBC652;color:#FBC652;width:100%;font-size:17px;text-align:center}.kas-invitaton-button-memo{font-size:12px;color:#bebfc2;text-align:center}.kas-invitation-title{color:#fff}.kas-invitation-title .line{display:inline-block;width:100%;border-top:1px solid rgba(255,255,255,.6)}.kas-invitation-title .text{line-height:26px}.kas-invitation-title .memo{color:#bebfc2}.kas-invitation-input{width:100%;border-radius:5px;padding-left:10px!important}.kas-transport .padding10{padding:10px}.kas-transport .no-text-overflow p{overflow:inherit;text-overflow:inherit;white-space:inherit}.filename,.layui-table td,.layui-table th,.layui-table tr,h1,h2,h3,h4,h5,p{white-space:nowrap;text-overflow:ellipsis}.kas-transport .margin-top10{margin-top:10px}.kas-transport .padding-top10{padding-top:1px}.kas-transport .p-color{color:#515151;font-size:12px;line-height:20px;margin:7px 0}.stanbus-stransport .title_style{font-size:12px;line-height:20px;color:#ff8213}.stanbus-firefly-toast{position:absolute;bottom:0;width:100%;text-align:center;transition:all .3s ease-in-out;opacity:0}.stanbus-firefly-toast.active{bottom:50px;opacity:1;z-index:15}.stanbus-firefly-toast .text{display:inline-block;border-radius:10px;padding:10px;background-color:rgba(0,0,0,.7);color:rgba(255,255,255,.8);text-align:center;text-overflow:ellipsis;font-size:15px}.stanbus-position-icon{top:5px}.stanbus-icon{vertical-align:middle;width:130px;height:130px;margin-bottom:20px}.stanbus-icon-sm{width:20px;height:20px;display:inline-block;position:relative}.stanbus-icon-sm.pwd{background:url(../images/icon/sm-pwd.png) no-repeat;background-size:18px 25px;width:18px;height:25px}.stanbus-icon-sm.phone{background:url(../images/icon/sm-phone.png) no-repeat;background-size:18px 25px;width:18px;height:25px}.stanbus-icon.plus{background:url(../images/icon/+.png) no-repeat;display:inline-block;background-size:130px 130px}.stanbus-icon-logistics{width:20px;height:20px;display:inline-block;position:absolute;left:-35px;z-index:10}.stanbus-icon-logistics.line{display:inline-block;border-left:1px solid #dcddde;position:absolute;width:1px;height:75px;top:15px;left:-26px;z-index:1}.stanbus-icon-logistics.active{background:url(../images/icon/logistics-active.png) no-repeat;background-size:20px 20px}.stanbus-icon-logistics.default{background:url(../images/icon/logistics.png) no-repeat;background-size:20px 20px;top:1px}.stanbus-logistics .weui_cell:before{left:50px}.stanbus-logistics .weui_cell{padding:10px 15px 10px 50px}.stanbus-icon-position{position:relative;top:9px}.stanbus-icon-from-to{width:80%;height:30px;display:inline-block;background:url(../images/from-to-icon.png) no-repeat;background-size:100% auto}h1,h2,h3,h4,h5,p{overflow:hidden}.stanbus-icon-sm.leave-date{background:url(../images/icon/sm-leave-date.png) no-repeat;background-size:20px 20px;top:4px}.stanbus-icon-sm.receive-date{background:url(../images/icon/sm-send-date.png) no-repeat;background-size:20px 20px;top:4px}.stanbus-line-height{line-height:30px}.border-right{border-right:1px solid #ccc}.kas-add-detail-padding{padding-left:7px!important;padding-top:3px!important}.kas-addr-padding{padding-left:7px!important;padding-top:17px!important}.padding-left10{padding-left:10px!important}.kas-brand-logo-icon{width:30px;display:inline-block;position:relative;top:3px}.popup-title{font-size:18px}.kas-icon-tab{width:26px;height:26px;display:inline-block}.kas-icon-tab.implementation{background:url(../images/icon/order-implementation-o.png) no-repeat;background-size:26px 26px}.kas-icon-tab.implementation.active{background:url(../images/icon/order-implementation.png) no-repeat;background-size:26px 26px}.kas-icon-tab.complete{background:url(../images/icon/order-complete-o.png) no-repeat;background-size:26px 26px}.kas-icon-tab.complete.active{background:url(../images/icon/order-complete.png) no-repeat;background-size:26px 26px}.kas-tabs{border-bottom:1px solid #eee;display:flex;position:absolute;z-index:1;width:100%;background-color:#fff}.kas-tabs .tab{position:relative;display:block;-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1;padding:10px 0 2px;text-align:center;font-size:15px;-webkit-tap-highlight-color:transparent;border-bottom:3px solid #fff;transition:border-bottom .2s ease-in-out}.kas-tabs .tab:after{content:" ";position:absolute;right:0;top:0;width:1px;height:100%;color:#ccc;-webkit-transform-origin:100% 0;transform-origin:100% 0;-webkit-transform:scaleX(.5);transform:scaleX(.5)}.kas-tabs .tab.active{border-bottom:3px solid #ff8213}.border-top{border-top:1px solid #eee}.kas-inner-line{display:inline-block}.kas-form .weui_cell_hd{width:100px}.kas-form input{font-size:100%}.kas-img{width:130px;height:130px;border:1px dashed #ccc}.kas-city-background-color{background-color:#e2e2e2;color:#FFF}.weui_search_text{top:3px}.weui_icon_clear:before,.weui_icon_search:before{color:#fc8325;font-size:14px}.kas-overflow-y-hidden{height:100%;overflow:hidden}.kas-overflow-y-auto{height:100%;overflow-y:auto}.filename,.uploader{overflow:hidden;cursor:default}.kas-flex-top{position:absolute;z-index:1;width:100%;background-color:#ff8213;color:#fff}.weui_dialog{z-index:50}.kas-nav-right-header{position:absolute;right:0;top:0;padding:0 20px 0 0;background:0 0}.kas-nav-left-header{position:absolute;top:0;padding:0;background:0 0;left:220px;width:60%}.layui-input,.layui-select,.layui-textarea{height:32px;line-height:32px;font-size:12px!important}.layui-form-label{padding:6px 15px;font-size:13px!important}.layui-form-select dl{top:31px;font-size:12px!important}.circle{background-image:-webkit-linear-gradient(to right,#2c2f51,#482686,#491e67);background-image:linear-gradient(to right,#2c2f51,#482686,#491e67)}.layui-nav-tree .layui-nav-child dd.layui-this,.layui-nav-tree .layui-this,.layui-nav-tree .layui-this>a,.layui-nav-tree .layui-this>a:hover{background-color:#232b3b;border-left:2px solid #de531a}.layui-bg-black{background-color:#2c3551}.layui-nav{background-color:transparent}.layui-nav-itemed>a,.layui-nav-tree .layui-nav-title a,.layui-nav-tree .layui-nav-title a:hover{background-color:#29324b!important}.layui-nav .layui-this:after,.layui-nav-bar,.layui-nav-tree .layui-nav-itemed:after{height:3px!important;background-color:transparent}.button,.filename{height:32px;display:inline-block;float:left;outline:0}.layui-nav-tree .layui-nav-bar{background-color:transparent}.layui-nav .layui-nav-item{line-height:56px!important}.layui-this-nav{border-bottom:3px solid #de531a!important}.layui-table td,.layui-table th{font-size:11px}.uploader{position:relative;display:inline-block;padding:0;margin:10px 0;-moz-box-shadow:0 0 5px #ddd;-webkit-box-shadow:0 0 5px #ddd;box-shadow:0 0 5px #ddd;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px}.filename{width:180px;margin:0;padding:8px 10px;border:1px solid #ccc;border-right:0;font:9pt/100% Arial,Helvetica,sans-serif;color:#777;text-shadow:1px 1px 0 #fff;-moz-border-radius:5px 0 0 5px;-webkit-border-radius:5px 0 0 5px;border-radius:5px 0 0 5px;background:#f5f5f5;background:-moz-linear-gradient(top,#fafafa 0,#eee 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0,#fafafa),color-stop(100%,#f5f5f5));filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fafafa', endColorstr='#f5f5f5', GradientType=0);-moz-box-shadow:0 0 1px #fff inset;-webkit-box-shadow:0 0 1px #fff inset;box-shadow:0 0 1px #fff inset;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.button{padding:8px 12px;margin:0;cursor:pointer;border:1px solid #ccc;font:700 9pt/100% Arial,Helvetica,sans-serif;-moz-border-radius:0 5px 5px 0;-webkit-border-radius:0 5px 5px 0;border-radius:0 5px 5px 0;-moz-box-shadow:0 0 1px #fff inset;-webkit-box-shadow:0 0 1px #fff inset;box-shadow:0 0 1px #fff inset;background-color:#f5f5f5}*,.layui-btn{font-size:12px}.uploader input[type=file]{position:absolute;top:0;right:0;bottom:0;border:0;padding:0;margin:0;height:30px;cursor:pointer;filter:alpha(opacity=0);-moz-opacity:0;-khtml-opacity:0;opacity:0}input[type=button]::-moz-focus-inner{padding:0;border:0;-moz-box-sizing:content-box}input[type=button]::-webkit-focus-inner{padding:0;border:0;-webkit-box-sizing:content-box}input[type=text]::-moz-focus-inner{padding:0;border:0;-moz-box-sizing:content-box}input[type=text]::-webkit-focus-inner{padding:0;border:0;-webkit-box-sizing:content-box}*{margin:0;padding:0;font-family:"微软雅黑"}.custom_float_left{float:left}.custom_float_right{float:right}.contentBox *{box-sizing:content-box!important}.contentBox .layui-laypage-skip input,button{position:relative;top:-1px}.layui-btn{background-color:#de531a;border-radius:7px!important;padding:0 7px;height:26px!important;line-height:25px!important;min-width:62px}.bcrLayer table{margin:10px auto}.bcrLayer table td{border:1px solid #000!important}.wms-main-page-function{position:relative;margin-left:10px;min-width:925px;height:100%;padding-right:10px}.main-content,.scrollTable{min-width:1000px}body,html{box-sizing:content-box;height:100%;width:100%}.bs_fullScreen,.bs_pc_part,.wbph5,.wms-layer-add-tr td{box-sizing:border-box}.page-function{height:37px}.wms-wbm-fun-left{float:left}.bcr-add-image{width:175px;height:128px;position:relative;background-image:url(../images/u8117.png);background-size:cover}.bcr-add-image:hover{cursor:pointer}.wms-wbm-fun-left .wms-wbm-fun-left-label{width:280px;height:40px;line-height:30px}.wms-wbm-fun-left .wms-wbm-fun-left-label>div:first-child{width:95px;height:100%;float:left}.wms-wbm-fun-left .wms-wbm-fun-left-label>div:last-child{width:170px;height:100%;float:left}.wms-wbm-fun-right{float:right;margin-right:8px;position:relative;top:-4px}.ngdialog-header{font-size:14px;margin-bottom:5px}.search-input{width:160px;height:26px;line-height:27px;position:relative;top:2px;margin-right:2px;border:1px solid #cedce2!important;padding-left:8px}.clear{clear:both}.ui-select-bootstrap .ui-select-choices-row>span{height:22px}.scrollTable{overflow-x:auto;margin-top:3px;padding-bottom:7px;padding-right:6px;height:475px}.stockUnitForm,.stockUnit_top{min-width:1024px}.layui-table{margin:0!important;position:relative}.layui-table.wms_wbm_main_table.minScreen{text-align:center}.layui-table tr{height:22px;overflow:visible}.layui-table th{padding:0 10px;font-size:12px;line-height:20px!important;overflow:hidden;background-color:#f2f2f2!important;min-height:20px;border:1px solid #cedde2;color:#000;font-weight:700}.layui-table tr,option,select,td,th{text-align:center!important;border:1px solid #d2d2d2;cursor:pointer}.layui-table td{padding:0 10px!important;border:1px solid #cedde2;color:#666;overflow:visible}.layui-table.serial tr th:nth-child(1){width:11px}.layui-table .layui-unselect .layui-icon{width:14px!important;height:14px!important}.layui-table.layui-table-small td{padding:0!important}.layui-form-checkbox .layui-icon{line-height:14px!important}.layui-form-checked[lay-skin=primary] i{border-color:#de531a;background-color:#de531a}.btn_margin{margin-left:10px}.btn_parent:hover .btn_spread{display:block}.btn_spread{width:93px;height:80px;position:absolute;display:none;z-index:1}::-webkit-scrollbar{width:5px;height:5px;background-color:#e2e2e2}/*!*滚动条的滑块按钮*!*/::-webkit-scrollbar-thumb{background-color:#c5c5c5}::-webkit-scrollbar-thumb:hover{background-color:#9e9e9e}::-webkit-scrollbar-button{width:0;height:0;border-top:30px solid transparent;border-bottom:30px solid transparent;border-right:30px solid #ff0}.dialog-body{width:97%;height:320px;margin:10px auto 0}.dialog-body.autoHeight{height:auto}.dialog-body .dialog-body-ul{width:100%;height:auto}.dialog-body .dialog-body-ul .dialog-body-li{width:100%;height:40px;float:left}.dialog-body .dialog-body-ul .dialog-body-li.textarea{height:35%}.dialog-body .dialog-body-ul .dialog-body-li .dialog-body-item{width:230px;height:100%;float:left;margin-right:7px}.dialog-body .dialog-body-ul .dialog-body-li .dialog-body-item>div{float:left}.dialog-body .dialog-body-ul .dialog-body-li .dialog-body-item .dialog-label{width:80px;height:100%;line-height:40px}.dialog-body .dialog-body-ul .dialog-body-li .dialog-body-item .dialog-content{width:150px;height:100%;padding-top:5px}.dialog-body .dialog-body-ul .dialog-body-li .dialog-body-item .dialog-content input{height:27px;line-height:normal}.dialog-body .dialog-body-ul .dialog-body-li .dialog-body-item.max_item{width:340px}.dialog-body .dialog-body-ul .dialog-body-li .dialog-body-item.max_item .dialog-content{width:259px}.dialog-toolbar{height:35px;width:100%;padding-left:57%;margin-top:8px}.dialog-body .qr-code{width:100%;height:240px}.dialog-body .qr-code .qr-code-top{width:100%;height:200px}.dialog-body .qr-code .qr-code-down{width:100%;height:30px}.dialog-body .qr-code .qr-code-top .qr-code-top-left{float:left;width:160px;margin-right:5px;height:100%}.dialog-body .qr-code .qr-code-top .qr-code-top-right{float:left;width:200px}.dialog-body .qr-code .qr-code-top .qr-code-top-right>div{width:250px;height:40px;margin-bottom:40px}.dialog-body .qr-code .qr-code-top .qr-code-top-right>div:last-child{width:250px;height:40px;margin-bottom:inherit}.dialog-body .qr-code .qr-code-top .qr-code-top-right>div>div{float:left;width:60px}.dialog-body .qr-code .qr-code-top .qr-code-top-right>div>div:last-child{width:150px}.dialog-body .qr-code .qr-code-down>div:first-child{width:60px;float:left}.dialog-body .dialog-body-ul .areaZtree{width:360px;height:310px;float:left}.dialog-body .dialog-body-ul .areaOperation{width:66px;height:300px;float:left;padding-top:120px}.dialog-body .dialog-body-ul .areaOperation .left_btn{width:25px;height:20px;background:url(../images/left_btn.png);margin:0 auto;cursor:pointer}.dialog-body .dialog-body-ul .areaOperation .right_btn{width:25px;height:20px;background:url(../images/right_btn.png);margin:0 auto 45px;cursor:pointer}.dialog-body .dialog-body-ul .areaTable{width:320px;height:310px;float:left;overflow-y:auto}.dialog-body .dest,.dialog-body .origin{width:175px;height:100%;float:left}.dialog-body .dest .dest_title,.dialog-body .origin .origin_title{width:100%;height:20px;line-height:20px}.otherForm{width:98%;height:auto;margin:0 auto}.otherForm>ul{width:100%;height:auto}.otherForm>ul>li{width:100%;height:40px}.otherForm ul li .otherFormItem{width:255px;height:100%;float:left;margin-right:20px}.otherForm ul li .otherFormItem>div:first-child{width:75px;height:100%;float:left;line-height:40px}.otherForm ul li .otherFormItem>div:last-child{padding-top:5px;width:180px;height:40px;float:left}.otherForm ul li div.otherFormItemButton{margin-left:75%}.otherForm ul li div.otherFormItemButton button{margin-top:7px;float:left}.stockUnit_top{height:320px}.stockUnit_top .stockUnit_top_left,.stockUnit_top .stockUnit_top_right{width:50%;float:left}.stockUnit_down,table{width:100%}.stockUnit_title{width:100%;height:30px}.stockUnit_title>buttom{float:left}.stockUnitForm .stockUnit_content{height:221px;overflow-y:auto}table{font-size:1rem;text-align:center}table tr.checkStatus{background-color:#e9f0d8}.ztree{width:175px;height:288px;overflow:auto}.ztree li{line-height:inherit}.ztree li ul{padding:0}.ztree li span.button{padding:0;cursor:pointer;margin:0}.custom_table{width:100%;height:auto;margin:0 auto}.custom_table tr td{height:36px;cursor:default}.wms-icon:hover,.wms-refresh{cursor:pointer;color:#de531a}.custom_table .custom_table_label{width:100px}.custom_table .custom_table_content{width:168px}.wms-refresh{top:5px;left:5px;opacity:.9;font-size:24px!important;position:relative}.layui-anim-rotate{-webkit-transform-origin:50% 50%;-moz-transform-origin:50% 50%;-o-transform-origin:50% 50%;-ms-transform-origin:50% 50%;transform-origin:50% 50%}.print-title{width:100%;height:40px;font-size:20px;text-align:center}.print-footer{margin-top:40px;width:100%;height:15px;padding-left:30%;margin-bottom:20px}.print-footer>div{float:left;width:160px;height:100%}.print_time_select{width:100%;height:40px}.print_time_select>div{float:left;line-height:35px;margin-right:10px}.print_time_select>div>div{float:left}.print_time_select>div>div:first-child{width:70px}.print_time_select>div>div>button{margin-top:5px}.key_left,.key_right{width:50%;height:470px;float:left;border:1px solid #666}.key_left>div.key_top,.key_right>div.key_top{width:100%;height:40px;margin-top:50px;margin-bottom:20px}.key_left>div.key_top>div:first-child,.key_right>div.key_top>div:first-child{width:30%;float:left;line-height:33px;text-align:right;padding-right:15px}.key_left>div.key_top>div:last-child,.key_right>div.key_top>div:last-child{width:30%;float:left}.key_left>div.key_body,.key_right>div.key_body{width:50%;margin:0 auto}.key_left>div.key_body>table>tbody>tr,.key_right>div.key_body>table>tbody>tr{height:45px}.role_left_ul{width:300px!important;height:200px!important;float:left}.role_right_tree{border:1px solid #000;width:300px;height:260px;float:left;margin-bottom:20px;overflow:auto}.wms-icon i{font-size:24px;position:relative;top:3px;left:-2px}.wms-bd-none-main td{border:1px solid #fff!important;padding:0 5px}.wms-bd-none td{border:1px solid #f0f0f0!important;padding:0 5px}.wms-bd-none-main tbody tr:hover{background-color:#fff!important}.wms-layer .layui-input{margin:5px 0;height:24px}.wms-layer-heard th{height:24px}.wms-layer-add-tr td{padding:0 5px}.wms-layer-btn{margin:5px 0 0;height:20px}.trSelect{background-color:#e9f0d8!important}.upload_btn{width:30px}.upload_btn input[type=file]{float:left;position:relative;right:0;width:120%;opacity:0;filter:alpha(opacity=0);outline:0;cursor:pointer!important;top:-23px;left:-5px}.print_outbound_receipt_top .wbph1{box-sizing:border-box;text-align:center}.print_outbound_receipt_top .wbph2{font-size:16px;text-align:center}.print_outbound_receipt_top .imgB{width:145px;margin:10px 30px;float:left}.print_outbound_receipt_top .wbph4{text-align:center;margin:13px 0}.wbph5{padding-left:634px}.print_outbound_receipt_top .w80{width:80px!important}.print_outbound_receipt_top .w120{width:120px!important}.print_outbound_receipt_top .w306{width:306px!important}.print_outbound_receipt_top .w174{width:174px!important}@media print{.print_outbound_receipt{margin-left:10px}}.print_outbound_receipt_top table td{padding:3px 5px!important}.print_outbound_receipt .layui-table,.print_outbound_receipt .layui-table td,.print_outbound_receipt .layui-table th,.print_outbound_receipt .layui-table>tr{border:1px solid #000!important}.print_outbound_receipt .layui-table th{background-color:transparent!important}.print_outbound_receipt_title{width:100%;height:100px}.print_outbound_receipt_title .receipt_title_left{width:160px;height:100%;float:left;padding-top:20px;margin-left:7%}.print_outbound_receipt_title .receipt_title_center{width:300px;height:100%;float:left;font-size:24px;text-align:center;font-weight:700;line-height:80px}.print_outbound_receipt_title .receipt_title_right{width:120px;height:100%;float:left}.print_outbound_receipt_top{width:100%;height:auto;margin-bottom:10px}.print_outbound_receipt_top .receipt_top_title{width:28%;height:20px;line-height:20px;font-size:16px;margin:0 auto}.brcPrintMain table{margin-bottom:10px!important}.print_outbound_receipt_top .receipt_top_bar_code{width:253px;height:100px;text-align:center;margin:10px auto 0}.print_outbound_receipt_top .receipt_top_bar_code>img{height:100px}.print_outbound_receipt_top .receipt_top_table{margin-top:10px;width:100%;height:auto}.receipt_top_table .print_table_min th{padding:0 3px}.receipt_top_table tr td.black_td{color:#000;font-weight:700}.layui-table tr td.tr_td{word-wrap:break-word;word-break:break-all;white-space:normal}.print_outbound_receipt_body{width:100%;height:auto}.print_outbound_receipt_down{margin-top:15px;width:100%;height:160px;border:1px solid #000}.print_outbound_receipt_down .print_outbound_receipt_down_left{width:49%;height:100%;float:left;border-right:1px solid #000}.print_outbound_receipt_down .print_outbound_receipt_down_right{width:50%;height:100%;float:left}.print_outbound_receipt_down .print_outbound_receipt_down_left>div,.print_outbound_receipt_down .print_outbound_receipt_down_right>div{width:100%;height:40px;color:#000}.print_outbound_receipt_down .print_outbound_receipt_down_left>div:last-child,.print_outbound_receipt_down .print_outbound_receipt_down_right>div:last-child{border-top:1px solid #000}.print_outbound_receipt_down .print_outbound_receipt_down_left>div:last-child>div:first-child,.print_outbound_receipt_down .print_outbound_receipt_down_right>div:last-child>div:first-child{border-right:1px solid #000}.print_outbound_receipt_down .print_outbound_receipt_down_left>div:last-child>div,.print_outbound_receipt_down .print_outbound_receipt_down_right>div:last-child>div{width:49%;height:100%;float:left}.print_outbound_receipt_footer{width:100%;height:20px;line-height:20px;margin-top:10px;margin-bottom:10px}.print_outbound_receipt_footer>div{width:25%;float:left}.out_confirm_left,.out_confirm_right{width:50%;height:350px;float:left}.out_confirm_left>div:first-child,.out_confirm_right>div:first-child{width:100%;height:35px}.out_confirm_left>div:first-child>div:first-child,.out_confirm_right>div:first-child>div:first-child{width:20%;height:100%;float:left;line-height:35px}.out_confirm_left>div:first-child>div:last-child,.out_confirm_right>div:first-child>div:last-child{width:70%;height:100%;float:left}.out_confirm_left>div:last-child,.out_confirm_right>div:last-child{margin-top:10px;width:90%;height:100%;float:left}#bs_pc_main canvas{width:100%}#bs_pc_main{width:100%;height:100%}.bs_pc_rootBox{display:-webkit-box;display:-moz-box;display:-ms-flexbox;display:-webkit-flex;display:flex;display:-webkit-box;height:50%;width:100%}.bs_pc_part{-webkit-box-flex:1;-moz-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1;border:1px solid #000;margin:5px;overflow:hidden;background-image:-webkit-radial-gradient(#737373,#2b2b2b);background-image:radial-gradient(#737373,#2b2b2b)}.abm_image,.abm_p1{margin-bottom:10px}#bs_ow_heard{padding:10px 0 20px;text-align:center;font-size:30px}#bs_db_main table,#bs_ow_main table,#bs_td1_main table,#bs_td2_main table{width:100%;border-collapse:collapse}#bs_db_main th,#bs_ow_main th,#bs_td1_main th,#bs_td2_main th{background-color:#bdd7ee}#bs_ow_main td,#bs_ow_main th{border-bottom:1px solid #000;border-top:1px solid #000;border-left:0 solid #000;border-right:0 solid #000;text-align:center;padding:10px 0}#bs_db_main,#bs_td1_main,#bs_td2_main{display:-webkit-flex;flex-direction:column;-webkit-flex-direction:column;height:100%;width:100%}#bs_db_box,#bs_td1_box,#bs_td2_box{-webkit-box-flex:1;-moz-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1;background-image:-webkit-radial-gradient(#737373,#2b2b2b);background-image:radial-gradient(#737373,#2b2b2b)}#bs_db_table,#bs_td1_table,#bs_td2_table{-webkit-box-flex:1;-moz-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1;margin-top:15px}#bs_db_main td,#bs_db_main th,#bs_td1_main td,#bs_td1_main th,#bs_td2_main td,#bs_td2_main th{border:1px solid #000;text-align:center;padding:10px 0}#bs_ow_cp_pt_main{width:100%;background-color:#bfbfbf;height:20px;overflow:hidden}#bs_ow_cp_pt_percentage,.bs_ow_cp_pt_temp{height:100%;display:inline-block;float:left}#bs_ow_cp_pt_main table td{border-left:0 solid #000!important;border-right:0 solid #000!important}#bs_ow_cp_pt_percentage{background-color:#5b9bd5;width:0}.bs_ow_cp_pt_temp{width:10px;background-color:#ed7d31}.bs_ow_cp_pt_temp1{float:left;color:#fff;display:inline-block;line-height:22px;margin-left:5px}.bs_fullScreen{width:89px;position:absolute;z-index:9999;border:1px solid transparent;height:48px;padding:15px 0 0 15px}#bs_sws_exportExcel{color:#fff!important;text-decoration:none}.abm_image{width:100%;height:600px}.abm_image_desc{padding:8px 0;font-weight:700}.abm_image_icon{position:absolute;bottom:22px;right:10px;cursor:pointer;font-size:30px;color:#de531a}.abm_desc_div,.abm_table_icon{font-size:12px;display:inline-block}.abm_desc_div{width:180px;height:20px;line-height:20px;overflow:hidden;-ms-text-overflow:ellipsis;text-overflow:ellipsis;white-space:nowrap;color:#de531a}.abm_p1,.abm_p3{text-align:center;color:#292929}.abm_desc_div:hover{height:auto;white-space:normal}.abm_table_icon{float:left;margin-right:12px}.abm_p1{font-family:"Trebuchet MS",Lucida,Verdana,sans-serif;font-size:25px}.abm_p3{font-size:16px}.abm_weight td{font-weight:700!important} \ No newline at end of file diff --git a/public/js/build/ils-wms-web.min.js b/public/js/build/ils-wms-web.min.js index 5fa31a72..d2ecfc3d 100644 --- a/public/js/build/ils-wms-web.min.js +++ b/public/js/build/ils-wms-web.min.js @@ -1,7 +1,8 @@ -/*! ils-wms-web 2017-11-16 */ -"use strict";var adminCtrl = angular.module("admin.controllers", []);angular.module("wmsApp",["ui.router","wms.controllers","wms.services","wms.filter","ngDialog","restangular","ui.select","wms.constant","wms.directives","ngCookies","angularFileUpload"]).constant("Settings",{Context:{path:contextPath}}).run(["$rootScope","$location","$state","Settings","Tools","constant","dropDownService","$cookies","permissionsService","Restangular","FileUploader","$timeout","ngDialog",function(a,b,c,d,e,f,g,h,i,j,k,l,m){function n(b,d,e,f){var g="";g+=''+d+"",g+='ဆ';a.elements.tabAdd("tab_kas",{title:g,id:b}),a.$(".layui-tab-content").children("div.layui-tab-item").eq(1).remove(),a.$("#index_content").addClass("layui-show"),a.elements.tabChange("tab_kas",b),a.$(".layui-tab").find("li").children("i.layui-tab-close[data-id="+b+"]").on("click",function(){a.elements.tabDelete("tab_kas",$(this).parent("li").attr("lay-id")).init();var b=$(".layui-tab").find("li.layui-this span").attr("data-url");b?c.go(b):c.go("index")}),a.$(".layui-tab").find("li[lay-id="+b+"]").bind("click",function(){var a=$(this).find("span").attr("data-url");c.go(a)}),c.go(f)}function o(b){var c=-1;return a.$(".layui-tab").find("li").each(function(a,d){$(this).children("span").text()===b&&(c=$(this).attr("lay-id"))}),c}function p(b){var c=-1;return a.$(".layui-tab").find("li").each(function(a,d){$(this).children("span").text()===b&&(c=a)}),c}function q(){i.getPermissListByUserId(a.userInfo.id).then(function(b){if(b.success){var c=new Array;if(!b.data)return void a.Tools.alert("用户暂无权限");for(var d=0;d-1){var g=o(d);a.elements.tabChange("tab_kas",g),a.$("#index_content").addClass("layui-show"),c.go(f)}else n(b,d,e,f)}},a.bs_intervalTime=10,a.bs_set_intervalTime=function(){m.open({template:"/templates/bigScreen/components/setIntervalTime.html",controller:"nullCtrl",title:"设置列表刷新时间",width:319,height:200})},a.getNowFormatDate=function(){var a=new Date,b="-",c=":",d=a.getMonth()+1,e=a.getDate();d>=1&&d<=9&&(d="0"+d),e>=0&&e<=9&&(e="0"+e);var f="";return f=a.getSeconds()>=0&&a.getSeconds()<=9?"0"+a.getSeconds():a.getSeconds(),a.getFullYear()+b+d+b+e+" "+a.getHours()+c+a.getMinutes()+c+f},a.totalPage=0,a.pageNo=1,a.rootNewClip=function(b,c){layui.use(["laypage"],function(){(0,layui.laypage)({cont:$(b),pages:a.totalPage,last:a.totalPage+" 页，共"+a.totalRecord+" 条记录",skip:!0,curr:a.curr,jump:function(b,d){d||(a.curr=b.curr,c(b.curr))}})})},a.logOut=function(){location.href="/"},a.Tools=e,a.constant=f,a.dropDownService=g,a.userInfo=h.getObject("user"),a.userInfo||(location.href="/"),j.addFullRequestInterceptor(function(b,c,d,e,f,g,h){return f?(f.whCode=a.userInfo.whCode,f.token=a.userInfo.token,f.userId=a.userInfo.id):f={whCode:a.userInfo.whCode,token:a.userInfo.token,userId:a.userInfo.id},{headers:f}}),a.uploader=new k({queueLimit:1,removeAfterUpload:!0}),a.setUploaderParam=function(b,c,e){a.uploader.url=d.Context.path+b,a.uploader.alias=c,a.uploader.headers.whCode=a.userInfo.whCode,a.uploader.headers.token=a.userInfo.token,a.uploader.onSuccessItem=e||function(b,c,d,e){layui.use("layer",function(){layui.layer.closeAll()}),200==d&&c.success,a.Tools.alert(c.message)}},a.uploader.onCompleteItem=function(b,c,d,e){a.uploader.clearQueue(),a.uploader.cancelAll()},a.uploadAll=function(){l(function(){a.uploader.uploadAll()},100)},q()}]).config(["$stateProvider","$urlRouterProvider","$httpProvider","$locationProvider","RestangularProvider","Settings",function(a,b,c,d,e,f){a.state("index",{url:"/index",templateUrl:"templates/index.html"}).state("asn",{controller:"asnCtrl",url:"/asn",templateUrl:"templates/inStorageManagement/asnManagement/asn-list.html"}).state("in-storage-bill",{controller:"inStorageBillCtrl",url:"/in-storage-bill",templateUrl:"templates/inStorageManagement/inStorageBill/in-storage-bill-list.html"}).state("input-work",{controller:"inputWorkCtrl",url:"/input-work",templateUrl:"templates/inStorageManagement/inputWork/input-work-list.html"}).state("input-work-receiving-quality",{controller:"inputWorkReceivingQualityCtrl",url:"/input-work-receiving-quality",templateUrl:"templates/inStorageManagement/inputWork/receiving-quality-testing-form.html"}).state("inventory-records-query",{controller:"inventoryRecordsQueryCtrl",url:"/inventory-records-query",templateUrl:"templates/inStorageManagement/inventoryRecordsQuery/inventory-records-query-list.html"}).state("shipment-plan",{url:"/shipment-plan",templateUrl:"templates/warehouseManagement/shipmentPlan/shipment-plan-list.html",controller:"shipmentPlanCtrl"}).state("shipment-plan-reject",{url:"/shipment-plan-reject",templateUrl:"templates/warehouseManagement/shipmentPlanReject/shipment-plan-reject-list.html",controller:"shipmentPlanRejectCtrl"}).state("outbound-order",{url:"/outbound-order",templateUrl:"templates/warehouseManagement/outboundOrder/outbound-order-list.html",controller:"outboundOrderCtrl"}).state("outbound-order-key",{url:"/outbound-order-key",templateUrl:"templates/warehouseManagement/outboundOrderKey/outbound-order-key.html",controller:"outboundOrderKeyCtrl"}).state("warehouse",{url:"/warehouse",templateUrl:"templates/warehouseManagement/warehouse/warehouse-list.html",controller:"warehouseCtrl"}).state("outbound-print-receipt",{url:"/outbound-print-receipt",templateUrl:"templates/warehouseManagement/outboundPrintReceipt/outbound-print-receipt-list.html",controller:"outboundPrintReceiptCtrl"}).state("warehouse-record",{url:"/warehouse-record",templateUrl:"templates/warehouseManagement/warehouseRecord/warehouse-record-list.html",controller:"warehouseRecordCtrl"}).state("scooter-off-registration",{url:"/scooter-off-registration",templateUrl:"templates/warehouseManagement/scooterOffRegistration/scooter-off-registration-list.html",controller:"scooterOffRegistrationCtrl"}).state("inventory-select",{url:"/inventory-select",templateUrl:"templates/inventoryManagement/inventorySelect/inventory-select-list.html",controller:"inventorySelectCtrl"}).state("inventory-overview",{url:"/inventory-overview",templateUrl:"templates/inventoryManagement/inventoryOverview/inventory-overview-list.html"}).state("repair-bill",{controller:"repairBillCtrl",url:"/repair-bill",templateUrl:"templates/maintenanceManagement/repairBill/repair-bill-list.html"}).state("warehouse-maintenance",{controller:"warehouseMaintenanceCtrl",url:"/warehouse-maintenance",templateUrl:"templates/locationManagement/warehouseMaintenance/warehouse-maintenance-list.html"}).state("reservoir",{controller:"reservoirCtrl",url:"/reservoir",templateUrl:"templates/locationManagement/reservoirManagement/reservoir-list.html"}).state("stock-unit",{controller:"stockUnitCtrl",url:"/stock-unit",templateUrl:"templates/locationManagement/stockUnitManagement/stock-unit-list.html"}).state("stock-unit-strategy",{controller:"stockUnitStrategyCtrl",url:"/stock-unit-strategy",templateUrl:"templates/strategyManagement/stockUnitStrategy/stock-unit-strategy-list.html"}).state("user",{controller:"userCtrl",url:"/user",templateUrl:"templates/systemManagement/userManagement/user-list.html"}).state("userForm",{controller:"userFormCtrl",url:"/userForm/:userId",templateUrl:"templates/systemManagement/userManagement/user-form.html"}).state("role",{controller:"roleCtrl",url:"/role",templateUrl:"templates/systemManagement/roleManagement/role-list.html"}).state("entrance-card",{controller:"entranceCardCtrl",url:"/entrance-card",templateUrl:"templates/systemManagement/entranceCardManagement/entrance-card-list.html"}).state("borrowCarRegistration",{controller:"borrowCarRegistrationCtrl",url:"/borrowCarRegistration",templateUrl:"templates/vehicleBorrowingManagement/borrowCarRegistration.html"}).state("returnCarRegistration",{controller:"returnCarRegistrationCtrl",url:"/returnCarRegistration",templateUrl:"templates/vehicleBorrowingManagement/returnCarRegistration.html"}).state("borrowAndReturnRecordSearch",{controller:"borrowAndReturnRecordSearchCtrl",url:"/borrowAndReturnRecordSearch",templateUrl:"templates/vehicleBorrowingManagement/borrowAndReturnRecordSearch.html"}).state("pickCar",{controller:"pickCarCtrl",url:"/pickCar",templateUrl:"templates/bigScreen/pickCar.html"}).state("onWay",{controller:"onWayCtrl",url:"/onWay",templateUrl:"templates/bigScreen/onWay.html"}).state("distribution",{controller:"distributionCtrl",url:"/distribution",templateUrl:"templates/bigScreen/distribution.html"}).state("transferDepot",{controller:"transferDepotCtrl",url:"/transferDepot",templateUrl:"templates/bigScreen/transferDepot.html"}).state("drayOutIn",{controller:"drayOutInCtrl",url:"/drayOutIn",templateUrl:"templates/bigScreen/drayOutIn.html"}),b.otherwise("index"),e.setDefaultHeaders({"Access-Control-Allow-Origin":"*"}),e.setDefaultHeaders({"Cache-Control":"max-age=1"}),e.setBaseUrl(f.Context.path)}]),angular.module("wms.constant",[]).constant("constant",{billsType:{systemSchedul:"1",manualEntry:"2",add:"3",exit:"7"},inspectionResults:{asnOrderPass:"10",asnOrderNotpassInRepair:"20"},orderStatus:{wmsInboundCreate:"10",wmsInboundWaitAllocation:"20",wmsInboundFinish:"30"},billsTypeName:{systemSchedul:"TMS推送",manualEntry:"WMS业务产生库内返工、委外返工",add:"WMS新增",exit:"备料退库"},inspectionResultsName:{asnOrderPass:"合格",asnOrderNotpassInRepair:"异常"},orderStatusName:{wmsInboundCreate:"未收货",wmsInboundWaitAllocation:"已收货",wmsInboundFinish:"已入库"},status:{enable:10,disable:20},statusName:{enable:"可用",disable:"禁用"},page:{pageSize:10,pageNo:1},moreText:{packUp:"收起",spread:"更多条件"},distributionType:{manual:10,auto:20},stockUnitStatus:{start:"Y",stop:"N"},stockUnitStatusName:{start:"启用",stop:"禁用"},repairType:{inner:10,outer:20},repairTypeName:{inner:"委内维修",outer:"委外维修"},repairStatus:{unprocessed:10,maintenance:20,finish:30},repairStatusName:{unprocessed:"未处理",maintenance:"维修中",finish:"已完成"},repairResult:{qualified:10,disqualification:20,cancellinStocks:30},repairResultName:{qualified:"合格",disqualification:"不合格",cancellinStocks:"退库"},warehouse:{unprocessed:10,execution:20,haveOutbound:30,finish:40,cancel:50},warehouseName:{unprocessed:"未领取",execution:"待开始",haveOutbound:"进行中",finish:"已完成",cancel:"已取消"},defaultDropDownNullData:{name:"",value:""},strategyConditionType:{shipper:10,vehicle:20},strategyConditionTypeName:{shipper:"货主",vehicle:"车型"},strategyOperator:{xd:10,bdy:20,xy:90,dy:100,xydy:80,dydy:70,bh:30,bbh:40,s:50,bs:60},strategyOperatorName:{xd:"等于",bdy:"不等于",xy:"小于",dy:"大于",xydy:"小于等于",dydy:"大于等于",bh:"包含",bbh:"不包含",s:"是",bs:"不是"},exceptionType:{injured:10,shortItem:20},exceptionTypeName:{injured:"带伤",shortItem:"缺件"},warehouseType:{commodityGarage:10,entrepotStorage:20,frontLibrary:30},warehouseTypeName:{commodityGarage:"商品车库",entrepotStorage:"中转库",frontLibrary:"前置库"},warehouseAttr:{standardLib:10,simpleLib:20},warehouseAttrName:{standardLib:"标准库",simpleLib:"简单库"},warehouseAuto:{yes:"Y",no:"N"},warehouseAutoName:{yes:"是",no:"否"},checkCarStatus:{noCheck:10,check:20,error:30,errorApp:70},checkCarStatusName:{noCheck:"待验车",check:"合格",error:"异常未登记",errorApp:"异常已登记"},checkCarResult:{qualified:10,unqualified:20},checkCarResultName:{qualified:"合格",unqualified:"不合格"},outboundStatus:{unStart:10,planned:20,confirmed:30,finish:40,cancel:50},outboundStatusName:{unStart:"未开始",planned:"已计划",confirmed:"已备料",finish:"已完成",cancel:"已取消"},outboundType:{dispatcherOutbound:10,sendOutbound:20,repairOutbound:30,borrowOutbound:40},outboundTypeName:{dispatcherOutbound:"调拨出库",sendOutbound:"发运出库",repairOutbound:"维修出库",borrowOutbound:"借用出库"},sex:{men:1,women:2},sexName:{men:"男",women:"女"},outboundOutStatus:{notOut:10,out:20,exit:30},outboundOutStatusName:{notOut:"未出库",out:"已出库",exit:"已退库"},shipmentPlanStatus:{untreated:"0",treated:"1"},shipmentPlanStatusName:{untreated:"未处理",treated:"已处理"},userType:{pc:1,app:0,driver:2},userTypeName:{pc:"PC",app:"APP",driver:"司机"},userWarehouseType:{JMC_NC_QS:"JMC_NC_QS",UNLCN_XN_:"UNLCN_XN_",JM_:"JM_"},shipmentPlanType:{normal:"A1",dispatcher:"A2"},shipmentPlanTypeName:{normal:"正常发运",dispatcher:"调度发运"},businessType:{Z1:"Z1",Z2:"Z2",Z3:"Z3",Z4:"Z4",Z5:"Z5",Z6:"Z6",Z7:"Z7",Z8:"Z8",Z9:"Z9"},businessTypeName:{Z1:"PDI合格入库",Z2:"调拨入库",Z3:"维修出库",Z4:"维修后入库",Z5:"其他入库",Z6:"其他出库",Z7:"借用出库",Z8:"借用入库",Z9:"退货入库"},shipmentRejectStatus:{yes:"10",no:"20"},shipmentRejectStatusName:{yes:"否",no:"是"},entranceCardStatus:{start:1,stop:0},entranceCardStatusName:{start:"启用",stop:"禁用"},locSize:{minSize:"小车型",maxSize:"大车型"},locSizeName:{minSize:"小车型",maxSize:"大车型"},locType:{normal:10,standby:20},locTypeName:{normal:"正常",standby:"备用"},outboundPrintStatus:{notPrint:0,print:1},outboundPrintStatusName:{notPrint:"未打印",print:"已打印"},changeCharStatus:{noChang:10,change:20,notChange:30},changeCharStatusName:{noChang:"未换车",change:"已换车",notChange:"无车可换"},inventoryStatus:{normal:10,shipLock:20,borrowLock:30,maintenanceLock:40,outbound:50},inventoryStatusName:{normal:"正常在库",shipLock:"发运锁定",borrowLock:"借用锁定",maintenanceLock:"维修锁定",outbound:"已出库"},openGateStatus:{notOpen:10,open:20},openGateStatusName:{notOpen:"未开闸",open:"已开闸"},departureType:{normalDeparture:10,errorDeparture:20},departureTypeName:{normalDeparture:"正常离场",errorDeparture:"异常离场"}});var wmsCtrl=angular.module("wms.controllers",[]),directive=angular.module("wms.directives",[]).directive("refresh",["$timeout",function(a){return{restrict:"A",replace:!1,scope:!0,controller:!1,transclude:!1,link:function(b,c,d,e){$(c).bind("click",function(){$(c).css("display","inline-block"),a(function(){$(c).css("display","")},1e3)})}}}]).directive("setFocus",[function(){return{restrict:"A",replace:!1,scope:!1,controller:!1,transclude:!1,link:function(a,b,c,d){b[0].focus()}}}]).directive("keyListener",["$timeout",function(a){return{restrict:"A",replace:!1,scope:!0,controller:!1,transclude:!1,link:function(a,b,c,d){angular.element(b).keydown(function(b){var d=window.event?b.keyCode:b.which;if(8==d)a.$apply(function(){a[c.ngModel]=""});else{if(d>=48&&d<=107)return!1;if(d>=109&&d<=111)return!1;if(d>=186&&d<=222)return!1}})}}}]).directive("repeatFinish",["$timeout",function(a){return{link:function(b,c,d){1==b.$last&&($(c[0]).tagName="TR")&&a(function(){layui.use("form",function(){layui.jquery;layui.form().render()})},20)}}}]).directive("trSelect",["$document",function(a){return{restrict:"AEC",scope:{copyText:"="},link:function(a,b,c){b.bind("click",function(){var a=$(b[0]).parent(),c=a.first().find("div i"),d=a.first().find("div"),e=a.parent().find("div"),f=a,g=a.find("input"),h=a.parent().find("input");d.hasClass("layui-form-checkbox")&&(d.hasClass("layui-form-checked")?(g.prop("checked",!1),d.removeClass("layui-form-checked"),f.removeClass("trSelect")):(h.prop("checked",!1),e.removeClass("layui-form-checked"),d.addClass("layui-form-checked"),g.prop("checked",!0),f.addClass("trSelect").siblings().removeClass("trSelect"))),d.hasClass("layui-form-radio")&&(h.prop("checked",!1),g.prop("checked",!0),c.html(""),e.removeClass("layui-form-radioed"),d.addClass("layui-form-radioed"),f.addClass("trSelect").siblings().removeClass("trSelect"))})}}}]).directive("percentage",["$timeout",function(a){return{restrict:"AE",replace:!0,transclude:!0,scope:{pt:"="},templateUrl:"/templates/bigScreen/components/percentage.html",link:function(a,b,c,d,e){}}}]).directive("status",["$timeout",function(a){return{restrict:"AE",replace:!0,transclude:!0,scope:{st:"="},templateUrl:"./templates/bigScreen/components/status.html",link:function(a,b,c,d){a.statusArr=[{code:"NORMAL",text:"正常",color:"#00c261"},{code:"WARNING",text:"预警",color:"#f29100"},{code:"OVERDUE-WARNING",text:"超期",color:"#f30"}],a.currStatus={code:1,text:"正常",color:"#00c261"};for(var e=0;e",b.skip=!0,b.layout=["prev","page","next","count","limit","skip"],layui.use(["laypage"],function(){layui.laypage.render(b)})},initCheckBox:function(){if(layui.form){var a=layui.form();c(function(){a.render(),a.on("checkbox(allChoose)",function(b){$(b.elem).parents("table").find('tbody input[type="checkbox"]').each(function(a,c){c.checked=b.elem.checked}),a.render("checkbox")})},100)}else layui.use(["form"],function(){var a=layui.form();c(function(){a.render(),a.on("checkbox(allChoose)",function(b){$(b.elem).parents("table").find('tbody input[type="checkbox"]').each(function(a,c){c.checked=b.elem.checked}),a.render("checkbox")})},100)})},initTableClick:function(a){$(a.currentTarget).parent().children().removeClass("checkStatus"),$(a.currentTarget).addClass("checkStatus"),angular.forEach($(a.currentTarget).parent().children(),function(a,b){0!=b&&$(a).children().first().find("div.layui-form-checked").length>0&&$(a).children().first().find("div.layui-form-checked").trigger("click")}),$(a.currentTarget).children().first().find("div.layui-form-checkbox").length>0&&c(function(){$(a.currentTarget).children().first().children("div.layui-form-checkbox").trigger("click")},100)},getTableSelectItemIndex:function(a){var b=$(a).find('tbody input[type="checkbox"][name=ckValue]'),c=new Array;return b.each(function(a,b){b.checked&&c.push(b.value|a)}),c},getDataTOIndex:function(a,b){for(var c=new Array,d=0;d'),b.document.write(a),b.document.write('