From 2f3f99e664337bf982d93449275b116ba8821b8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= <1308369732@qq.com> Date: Mon, 30 Oct 2017 16:48:03 +0800 Subject: [PATCH 001/123] =?UTF-8?q?=E5=87=BA=E5=BA=93=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=B5=B0=E6=A0=B7=E4=BF=AE=E6=95=B4=EF=BC=8C?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=96=B0=E5=A2=9E=E6=A8=A1=E6=9D=BF=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=EF=BC=8C=E5=92=8C=E6=B7=BB=E5=8A=A0=E8=BF=9B=E5=BA=A6?= =?UTF-8?q?=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/wms.css | 7 +++ public/js/ctrl/a.ctrl.js | 61 +++++++++++++++++-- public/js/ctrl/b.ctrl.js | 2 +- public/js/ctrl/s.ctrl.js | 2 +- public/js/ctrl/w.ctrl.js | 1 + public/js/wms-config.js | 4 ++ public/js/wms-service.js | 7 +++ .../asnManagement/asn-list.html | 5 +- .../asnManagement/importData.html | 12 ++++ .../userManagement/user-assign-role.html | 11 ++-- routes/resource/base-config.js | 4 +- 11 files changed, 100 insertions(+), 16 deletions(-) create mode 100644 public/templates/inStorageManagement/asnManagement/importData.html diff --git a/public/css/wms.css b/public/css/wms.css index 1b54ccab..025b075b 100644 --- a/public/css/wms.css +++ b/public/css/wms.css @@ -14,6 +14,13 @@ .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; diff --git a/public/js/ctrl/a.ctrl.js b/public/js/ctrl/a.ctrl.js index ac952b9f..189be662 100644 --- a/public/js/ctrl/a.ctrl.js +++ b/public/js/ctrl/a.ctrl.js @@ -16,6 +16,20 @@ wmsCtrl.controller('asnCtrl',['$scope','dropDownService','inStorageBillService', } } + //导入弹框 + scope.importData = function(){ + scope.Tools.dialog({ + controller : 'asnCtrl.dialog', + template : 'templates/inStorageManagement/asnManagement/importData.html', + closeByDocument : false, + closeByEscape : false, + data : {}, + width : 550, + title : '导入', + scope : scope + }) + }; + //验车登记 click scope.checkRegClick = function(){ var indexArr = scope.Tools.getTableSelectItemIndex('.asnTable'); //获取table所选的下标 @@ -274,7 +288,7 @@ wmsCtrl.controller('asnCtrl',['$scope','dropDownService','inStorageBillService', scope.uploadAll(); } }]) -.controller('asnCtrl.dialog',['$scope',function(scope){ // asn controller dialog +.controller('asnCtrl.dialog',['$scope','inStorageBillService',function(scope,inStorageBillService){ // asn controller dialog //打印列表 scope.printListClick = function(){ if(!scope.Tools.checkPrintInstall()){ //打印插件检测 @@ -282,7 +296,19 @@ wmsCtrl.controller('asnCtrl',['$scope','dropDownService','inStorageBillService', return; } scope.Tools.printHTML($(".dialog-body")[0].outerHTML,750,1); - } + }; + + scope.asnDialogHref = function($event){ + $event.stopPropagation(); + inStorageBillService.downloadTemplate().then(function(data){ + if(data.success){ + + } + }); + }; + + + //打印所有的二维码 scope.printAllQrClick = function(){ @@ -294,7 +320,7 @@ wmsCtrl.controller('asnCtrl',['$scope','dropDownService','inStorageBillService', angular.forEach(scope.ngDialogData.printList,function(v,k){ scope.Tools.printQr(v.barcode,null,null,v.vin,1); }) - } + }; //验车结果 change scope.checkCarChange = function(item){ @@ -305,5 +331,32 @@ wmsCtrl.controller('asnCtrl',['$scope','dropDownService','inStorageBillService', }else{ //空 scope.ngDialogData.checkCar.asnCheckDesc = ''; } + }; + + scope.asnImport = contextPath+ '/jminbound/downloadTemplate'; + + +// 导入excel + scope.stopP = function(e){ + e.preventDefault(); + }; + + scope.fileNameASN = ''; + scope.thatASN =''; + window.chooseFile = function(that){ + scope.thatASN = that; + scope.fileNameASN = that.files[0].name; + layui.use('layer',function(){ + var layer = layui.layer; + layer.load(); + }); + console.log('上传中....'); + + angular.element(that).scope().fileChange(that); + + }; + + scope.resureUpload = function(){ + window.asd.asdfgg(); } -}]) \ No newline at end of file +}]); \ No newline at end of file diff --git a/public/js/ctrl/b.ctrl.js b/public/js/ctrl/b.ctrl.js index 6e17db43..0c0876f4 100644 --- a/public/js/ctrl/b.ctrl.js +++ b/public/js/ctrl/b.ctrl.js @@ -322,7 +322,7 @@ wmsCtrl.controller('borrowCarRegistrationCtrl',['$scope','Tools','$rootScope','$ }) } }else{ - scope.Tools.alert(result.message); + $scope.Tools.alert(result.message); } }) }; diff --git a/public/js/ctrl/s.ctrl.js b/public/js/ctrl/s.ctrl.js index 7e0fdfc5..901993cd 100644 --- a/public/js/ctrl/s.ctrl.js +++ b/public/js/ctrl/s.ctrl.js @@ -1446,7 +1446,7 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService scope.Tools.alert('取消任务只能单选！'); } - } + }; //备料更换 click scope.outBoundChangeClick = function(){ diff --git a/public/js/ctrl/w.ctrl.js b/public/js/ctrl/w.ctrl.js index 5d5d9912..043dc7e3 100644 --- a/public/js/ctrl/w.ctrl.js +++ b/public/js/ctrl/w.ctrl.js @@ -55,6 +55,7 @@ wmsCtrl.controller('warehouseCtrl',['$scope','warehouseService','dropDownService scope.Tools.alert(otEstimateLaneResult.message); } }) + //列表查询接口参数构造 scope.listParam = function(){ diff --git a/public/js/wms-config.js b/public/js/wms-config.js index e4986258..bf3fd72a 100644 --- a/public/js/wms-config.js +++ b/public/js/wms-config.js @@ -241,6 +241,10 @@ angular.module('wmsApp', ['ui.router', 'wms.controllers', 'wms.services','wms.fi $rootScope.uploader.onSuccessItem = callback; }else{ $rootScope.uploader.onSuccessItem = function(fileItem, response, status, headers){ + layui.use('layer',function(){ + var layer = layui.layer; + layer.closeAll(); + }); if(status == 200 && response.success){ $rootScope.Tools.alert(response.message); }else{ diff --git a/public/js/wms-service.js b/public/js/wms-service.js index a76bdcbd..e4bc2db1 100644 --- a/public/js/wms-service.js +++ b/public/js/wms-service.js @@ -95,7 +95,11 @@ var wmsService = angular.module('wms.services', []) }, printAsnQrCode : function(data){ return httpService.customPOST('jminbound/printAsnQrCode',data); + }, + downloadTemplate : function(){ + return httpService.customGET('/jminbound/downloadTemplate'); } + }; }]) .service('inventorySelectService',['HttpService',function(httpService){ //库存service @@ -201,6 +205,9 @@ var wmsService = angular.module('wms.services', []) addBLOrder : function(data){ //新增备料单 return httpService.customPOST('outOrder/addBLOrder',data); }, + getEstimateLaneByWhCode : function(whName){ //装车道列表 + return httpService.customPOST('estimateLane/getEstimateLaneByWhCode' ,whName,{'Content-Type':'text/plain;charset=UTF-8'}); + }, removeLocationConfirm : function(data){ //移库确认 return httpService.customPOST('outOrder/removeLocationConfirm',data); }, diff --git a/public/templates/inStorageManagement/asnManagement/asn-list.html b/public/templates/inStorageManagement/asnManagement/asn-list.html index 7343d082..38c05ee9 100644 --- a/public/templates/inStorageManagement/asnManagement/asn-list.html +++ b/public/templates/inStorageManagement/asnManagement/asn-list.html @@ -2,8 +2,9 @@
diff --git a/routes/resource/base-config.js b/routes/resource/base-config.js index e60c1474..e8b3a7f0 100644 --- a/routes/resource/base-config.js +++ b/routes/resource/base-config.js @@ -1,3 +1,3 @@ -/**Created on 2017-10-28*/ +/**Created on 2017-10-30*/ 'use strict'; - module.exports = {"version":"1.0.1","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.1","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 e100f62521ee4480973baa0a35b0c1ae7be83fe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= <1308369732@qq.com> Date: Mon, 30 Oct 2017 17:15:40 +0800 Subject: [PATCH 002/123] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7=EF=BC=8C=20=20=E4=B8=8B=E8=BD=BD=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/pom.json | 20 +- public/css/ils-wms-web.min.css | 1 + public/js/build/ils-wms-web.min.js | 6 + public/js/build/ils-wms-web.tmpl.js | 455 ++++++++++++++++++++++++++++ public/js/ctrl/a.ctrl.js | 3 +- 5 files changed, 473 insertions(+), 12 deletions(-) create mode 100644 public/css/ils-wms-web.min.css create mode 100644 public/js/build/ils-wms-web.min.js create mode 100644 public/js/build/ils-wms-web.tmpl.js diff --git a/config/pom.json b/config/pom.json index 97e56250..79347d17 100644 --- a/config/pom.json +++ b/config/pom.json @@ -1,6 +1,6 @@ { "dev":{ - "version": "1.0.1", + "version": "1.0.2", "compressed":false, "devView": true, "validate": false, @@ -12,7 +12,7 @@ } }, "uat": { - "version": "1.0.1", + "version": "1.0.2", "compressed": true, "devView": true, "validate": false, @@ -24,7 +24,7 @@ } }, "uatl": { - "version": "1.0.1", + "version": "1.0.2", "compressed": false, "devView": true, "validate": false, @@ -36,7 +36,7 @@ } }, "pro": { - "version": "1.0.1", + "version": "1.0.2", "compressed": true, "devView": true, "validate": false, @@ -48,7 +48,7 @@ } }, "local": { - "version": "1.0.1", + "version": "1.0.2", "compressed": false, "devView": true, "validate": false, @@ -60,7 +60,7 @@ } }, "yyLocal": { - "version": "1.0.1", + "version": "1.0.2", "compressed": false, "devView": true, "validate": false, @@ -72,7 +72,7 @@ } }, "hsLocal":{ - "version": "1.0.1", + "version": "1.0.2", "compressed": false, "devView": true, "validate": false, @@ -84,7 +84,7 @@ } }, "luoLocal": { - "version": "1.0.1", + "version": "1.0.2", "compressed": false, "devView": true, "validate": false, @@ -96,7 +96,7 @@ } }, "linLocal": { - "version": "1.0.1", + "version": "1.0.2", "compressed": false, "devView": true, "validate": false, @@ -108,7 +108,7 @@ } }, "laiLocal": { - "version": "1.0.1", + "version": "1.0.2", "compressed": false, "devView": true, "validate": false, diff --git a/public/css/ils-wms-web.min.css b/public/css/ils-wms-web.min.css new file mode 100644 index 00000000..811c2f45 --- /dev/null +++ b/public/css/ils-wms-web.min.css @@ -0,0 +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;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{float:left;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{float:left;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}.wms-main-page-function{position:relative;margin-left:10px;min-width:925px;height:100%;padding-right:10px}.main-content,.scrollTable{min-width:1000px}.page-function{height:37px}.wms-wbm-fun-left{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%}.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{box-sizing:border-box;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{box-sizing:border-box;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:316px}.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:110px}.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} \ 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 new file mode 100644 index 00000000..f6f341ab --- /dev/null +++ b/public/js/build/ils-wms-web.min.js @@ -0,0 +1,6 @@ +/*! ils-wms-web 2017-10-30 */ +"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",function(a,b,c,d,e,f,g,h,i,j,k,l){function m(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 n(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 o(b){var c=-1;return a.$(".layui-tab").find("li").each(function(a,d){$(this).children("span").text()===b&&(c=a)}),c}function p(){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=n(d);a.elements.tabChange("tab_kas",g),a.$("#index_content").addClass("layui-show"),c.go(f)}else m(b,d,e,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={whCode:a.userInfo.whCode,token:a.userInfo.token},{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)},p()}]).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("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("warehouse-record",{url:"/warehouse-record",templateUrl:"templates/warehouseManagement/warehouseRecord/warehouse-record-list.html",controller:"warehouseRecordCtrl"}).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("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"}),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"},inspectionResults:{asnOrderPass:"10",asnOrderNotpassInRepair:"20"},orderStatus:{wmsInboundCreate:"10",wmsInboundWaitAllocation:"20",wmsInboundFinish:"30"},billsTypeName:{systemSchedul:"TMS推送",manualEntry:"WMS业务产生库内返工、委外返工",add:"WMS新增"},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},warehouseName:{unprocessed:"未出库",execution:"已出库",haveOutbound:"进行中",finish:"已完成"},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},checkCarStatusName:{noCheck:"待验车",check:"合格",error:"异常"},checkCarResult:{qualified:10,unqualified:20},checkCarResultName:{qualified:"合格",unqualified:"不合格"},outboundStatus:{unStart:10,planned:20,confirmed:30,finish:40},outboundStatusName:{unStart:"未开始",planned:"已计划",confirmed:"已备料",finish:"已完成"},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},outboundOutStatusName:{notOut:"未出库",out:"已出库"},shipmentPlanStatus:{untreated:"0",treated:"1"},shipmentPlanStatusName:{untreated:"未处理",treated:"已处理"},userType:{pc:1,app:0},userTypeName:{pc:"PC",app:"APP"},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:"是"}});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"))})}}}]),wmsFilter=angular.module("wms.filter",[]).filter("billsTypeFilter",["constant",function(a){return function(b,c){return b==a.billsType.systemSchedul?a.billsTypeName.systemSchedul:b==a.billsType.manualEntry?a.billsTypeName.manualEntry:b}}]).filter("inspectionResultsFilter",["constant",function(a){return function(b,c){return b==a.inspectionResults.asnOrderPass?a.inspectionResultsName.asnOrderPass:b==a.inspectionResults.asnOrderNotpassInRepair?a.inspectionResultsName.asnOrderNotpassInRepair:b}}]).filter("orderStatusFilter",["constant",function(a){return function(b,c){return b==a.orderStatus.wmsInboundCreate?a.orderStatusName.wmsInboundCreate:b==a.orderStatus.wmsInboundWaitAllocation?a.orderStatusName.wmsInboundWaitAllocation:b==a.orderStatus.wmsInboundFinish?a.orderStatusName.wmsInboundFinish:b}}]).filter("stockUnitFilter",["constant",function(a){return function(b,c){return b==a.stockUnitStatus.start?a.stockUnitStatusName.start:b==a.stockUnitStatus.stop?a.stockUnitStatusName.stop:b}}]).filter("repairTypeFilter",["constant",function(a){return function(b,c){return b==a.repairType.inner?a.repairTypeName.inner:b==a.repairType.outer?a.repairTypeName.outer:b}}]).filter("repairStatusFilter",["constant",function(a){return function(b,c){return b==a.repairStatus.unprocessed?a.repairStatusName.unprocessed:b==a.repairStatus.maintenance?a.repairStatusName.maintenance:b==a.repairStatus.finish?a.repairStatusName.finish:b}}]).filter("repairResultFilter",["constant",function(a){return function(b,c){return b==a.repairResult.qualified?a.repairResultName.qualified:b==a.repairResult.disqualification?a.repairResultName.disqualification:b==a.repairResult.cancellinStocks?a.repairResultName.cancellinStocks:b}}]).filter("warehouseFilter",["constant",function(a){return function(b,c){return b==a.warehouse.unprocessed?a.warehouseName.unprocessed:b==a.warehouse.execution?a.warehouseName.execution:b==a.warehouse.haveOutbound?a.warehouseName.haveOutbound:b==a.warehouse.finish?a.warehouseName.finish:b}}]).filter("warehouseTypeFilter",["constant",function(a){return function(b,c){return b==a.warehouseType.commodityGarage?a.warehouseTypeName.commodityGarage:b==a.warehouseType.entrepotStorage?a.warehouseTypeName.entrepotStorage:b==a.warehouseType.frontLibrary?a.warehouseTypeName.frontLibrary:b}}]).filter("warehouseAttrFilter",["constant",function(a){return function(b,c){return b==a.warehouseAttr.standardLib?a.warehouseAttrName.standardLib:b==a.warehouseAttr.simpleLib?a.warehouseAttrName.simpleLib:b}}]).filter("warehouseAutoFilter",["constant",function(a){return function(b,c){return b==a.warehouseAuto.yes?a.warehouseAutoName.yes:b==a.warehouseAuto.no?a.warehouseAutoName.no:b}}]).filter("checkCarStatusFilter",["constant",function(a){return function(b,c){return b==a.checkCarStatus.noCheck?a.checkCarStatusName.noCheck:b==a.checkCarStatus.check?a.checkCarStatusName.check:b==a.checkCarStatus.error?a.checkCarStatusName.error:b}}]).filter("checkCarResultFilter",["constant",function(a){return function(b,c){return b==a.checkCarResult.qualified?a.checkCarResultName.qualified:b==a.checkCarResult.unqualified?a.checkCarResultName.unqualified:b}}]).filter("strategyConditionTypeFilter",["constant",function(a){return function(b,c){return b==a.strategyConditionType.shipper?a.strategyConditionTypeName.shipper:b==a.strategyConditionType.vehicle?a.strategyConditionTypeName.vehicle:b}}]).filter("strategyConditionFilter",["constant",function(a){return function(b,c){return b==a.strategyOperator.xd?a.strategyOperatorName.xd:b==a.strategyOperator.bdy?a.strategyOperatorName.bdy:b==a.strategyOperator.xy?a.strategyOperatorName.xy:b==a.strategyOperator.dy?a.strategyOperatorName.dy:b==a.strategyOperator.xydy?a.strategyOperatorName.xydy:b==a.strategyOperator.dydy?a.strategyOperatorName.dydy:b==a.strategyOperator.bh?a.strategyOperatorName.bh:b==a.strategyOperator.bbh?a.strategyOperatorName.bbh:b==a.strategyOperator.s?a.strategyOperatorName.s:b==a.strategyOperator.bs?a.strategyOperatorName.bs:b}}]).filter("outboundStatusFilter",["constant",function(a){return function(b,c){return b==a.outboundStatus.unStart?a.outboundStatusName.unStart:b==a.outboundStatus.planned?a.outboundStatusName.planned:b==a.outboundStatus.confirmed?a.outboundStatusName.confirmed:b==a.outboundStatus.finish?a.outboundStatusName.finish:b}}]).filter("outboundTypeFilter",["constant",function(a){return function(b,c){return b==a.outboundType.dispatcherOutbound?a.outboundTypeName.sendOutbound:b==a.outboundType.sendOutbound?a.outboundTypeName.sendOutbound:b==a.outboundType.repairOutbound?a.outboundTypeName.repairOutbound:b==a.outboundType.borrowOutbound?a.outboundTypeName.borrowOutbound:b}}]).filter("statusFilter",["constant",function(a){return function(b,c){return b==a.status.enable?a.statusName.enable:b==a.status.disable?a.statusName.disable:b}}]).filter("outboundOutStatusFilter",["constant",function(a){return function(b,c){return b==a.outboundOutStatus.notOut?a.outboundOutStatusName.notOut:b==a.outboundOutStatus.out?a.outboundOutStatusName.out:b}}]).filter("shipmentPlanStatusFilter",["constant",function(a){return function(b,c){return b==a.shipmentPlanStatus.untreated?a.shipmentPlanStatusName.untreated:b==a.shipmentPlanStatus.treated?a.shipmentPlanStatusName.treated:b}}]).filter("shipmentPlanTypeFilter",["constant",function(a){return function(b,c){return b==a.shipmentPlanType.normal?a.shipmentPlanTypeName.normal:b==a.shipmentPlanType.dispatcher?a.shipmentPlanTypeName.dispatcher:b}}]).filter("timeformat",function(){return function(a){return new Date(a).getTime()}}).filter("businessTypeFilter",["constant",function(a){return function(b,c){return b==a.businessType.Z1?a.businessTypeName.Z1:b==a.businessType.Z2?a.businessTypeName.Z2:b==a.businessType.Z3?a.businessTypeName.Z3:b==a.businessType.Z4?a.businessTypeName.Z4:b==a.businessType.Z5?a.businessTypeName.Z5:b==a.businessType.Z6?a.businessTypeName.Z6:b==a.businessType.Z7?a.businessTypeName.Z7:b==a.businessType.Z8?a.businessTypeName.Z8:b==a.businessType.Z9?a.businessTypeName.Z9:b}}]).filter("aFilter",function(){return function(a){return"0"==a?"未处理":"1"==a?"已处理":""}}).filter("bFilter",function(){return function(a){return"10"==a?"否":"20"==a?"是":""}}).filter("cFilter",function(){return function(a){return"A1"==a?"正常发运":"A2"==a?"调拨发运":""}}).filter("dFilter",function(){return function(a){return"10"==a?"未领取":"20"==a?"待开始":"30"==a?"进行中":"40"==a?"已完成":"50"==a?"已取消":void 0}}).filter("eFilter",function(){return function(a){return"10"==a?"合格":"20"==a?"异常":void 0}}).filter("fFilter",function(){return function(a){return"10"==a?"否":"20"==a?"是":void 0}}),wmsService=angular.module("wms.services",[]).service("HttpService",["Restangular","$rootScope",function(a,b){return{customPOST:function(b,c,d){return d?a.one(b).customPOST(c,void 0,void 0,d):a.one(b).customPOST(c)},post:function(b,c){return a.one(b).post(c)},get:function(b,c){return a.one(b).get("/",c)},customGET:function(b,c){return a.one(b).customGET("/",c)},put:function(a,b){},del:function(a,b){}}}]).service("inStorageBillService",["HttpService",function(a){return{addReceipt:function(b){return a.customPOST("asnOrder/addAsnOrder",b)},inStorageList:function(b){return a.customPOST("asnOrder/getAsnOrderList",b)},deliverToConfirm:function(b){return a.customPOST("asnOrder/deliverToConfirm",b)},reservoirList:function(b){return a.customGET("baseData/getEmptyZone/"+b)},storageLocationList:function(b,c){return a.customGET("baseData/getEmptyLocation/"+b+"/"+c)},createAlloc:function(b,c){return a.customPOST("wmsAlloc/createAlloc/"+b,c)},confirmAllocation:function(b){return a.customPOST("wmsAlloc/confirmAllocation",b)},confirmInbound:function(b,c){return a.customPOST("asnOrder/confirmInbound/"+c,b)},printBarcode:function(b){return a.customPOST("asnOrder/printBarcode",b)},getReceiptById:function(b){return a.customGET("asnOrder/getAsnOrderById/"+b)},updateAsnOrder:function(b){return a.customPOST("asnOrder/updateAsnOrder",b)},deleteAsnOrder:function(b){return a.customPOST("asnOrder/deleteAsnOrder",b)},autoAssign:function(b,c){return a.customPOST("wmsAlloc/autoAllcation/"+b,c)},getInBoundInfoByVin:function(b){return a.customGET("asnOrder/getInBoundInfoByVin/"+b)},cancelInbound:function(b){return a.customPOST("asnOrder/cancelInbound",b)},queryByVin:function(b){return a.customGET("asnOrder/queryByVin/"+b)},locationAdjust:function(b){return a.customPOST("asnOrder/locationAdjust",b)},inboundRecord:function(b){return a.customPOST("asnOrder/inboundRecord",b,{"Content-Type":"text/plain;charset=UTF-8"})},getAsnList:function(b){return a.customPOST("asn/getAsnList",b,{"Content-Type":"text/plain;charset=UTF-8"})},barcodePrint:function(b,c){return a.customPOST("extraInbound/barcodePrint/"+c,b,{"Content-Type":"text/plain;charset=UTF-8"})},printAsnQrCode:function(b){return a.customPOST("jminbound/printAsnQrCode",b)},downloadTemplate:function(){return a.customGET("/jminbound/downloadTemplate")}}}]).service("inventorySelectService",["HttpService",function(a){return{list:function(b){return a.customPOST("wmsInventory/list",b)},detail:function(b){return a.customGET("wmsInventory/listInventoryLocation/"+b)}}}]).service("warehouseMaintenanceService",["HttpService",function(a){return{list:function(b){return a.customPOST("wh/getWarehouseList",b)},addWarehouse:function(b){return a.customPOST("wh/addWarehouse",b)},updateWarehouse:function(b){return a.customPOST("wh/updateWarehouse",b)},deleteWarehouse:function(b){return a.customPOST("wh/deleteWarehouse",b)},getEstimateLaneByWhCode:function(b){return a.customPOST("estimateLane/getEstimateLaneByWhCode",b,{"Content-Type":"text/plain;charset=UTF-8"})},addEstimateLane:function(b){return a.customPOST("estimateLane/addEstimateLane",b)},deleteEstimateLane:function(b){return a.customPOST("estimateLane/deleteEstimateLane",b)}}}]).service("reservoirService",["HttpService",function(a){return{list:function(b){return a.customPOST("wmsZone/list",b)},add:function(b){return a.customPOST("wmsZone/addZone",b)},update:function(b){return a.customPOST("wmsZone/updateZone",b)},getById:function(b){return a.customGET("wmsZone/getZoneById/"+b)}}}]).service("stockUnitService",["HttpService",function(a){return{list:function(b){return a.customPOST("wmsLocation/list",b)},add:function(b){return a.customPOST("wmsLocation/addLocation",b)},getById:function(b){return a.customGET("wmsLocation/getLocationById/"+b)},update:function(b){return a.customPOST("wmsLocation/updateLocation",b)},enableLocation:function(b,c){return a.customPOST("wmsLocation/enableLocation/"+c,b)}}}]).service("repairBillService",["HttpService",function(a){return{list:function(b){return a.customPOST("wmsRepair/list",b)},submitRepair:function(b){return a.customPOST("wmsRepair/submitRepair",b)},addWmsRepair:function(b){return a.customPOST("wmsRepair/addWmsRepair",b)},updateWmsRepair:function(b){return a.customPOST("wmsRepair/updateWmsRepair",b)},getById:function(b){return a.customGET("wmsRepair/getRepairById/"+b)},submitAfterCheckAdd:function(b){return a.customPOST("wmsRepair/submitAfterCheckAdd",b)},submitAfterCheckCopyAndAdd:function(b){return a.customPOST("wmsRepair/submitAfterCheckCopyAndAdd",b)}}}]).service("warehouseService",["HttpService",function(a){return{list:function(b){return a.customPOST("outboundTask/getOutboundTaskList",b)},addBLOrder:function(b){return a.customPOST("outOrder/addBLOrder",b)},getEstimateLaneByWhCode:function(b){return a.customPOST("estimateLane/getEstimateLaneByWhCode",b,{"Content-Type":"text/plain;charset=UTF-8"})},removeLocationConfirm:function(b){return a.customPOST("outOrder/removeLocationConfirm",b)},outboundCheck:function(b){return a.customPOST("outOrder/outboundCheck",b)},outboundConfirm:function(b){return a.customPOST("outOrder/outboundConfirm",b)},exceptionRecord:function(b){return a.customPOST("outOrder/exceptionRecord",b)},outboundPlanList:function(b){return a.customPOST("wmsPreparationPlan/list",b,{"Content-Type":"text/plain;charset=UTF-8"})},getVehicleDetail:function(b){return a.customGET("wmsPreparationPlan/getVehicleDetail/"+b)},createPlan:function(b,c){return a.customPOST("wmsPreparationPlan/createPlan/"+b,c)},getPreparateInfoByVin:function(b){return a.customGET("outboundTask/getPreparateInfoByVin/"+b)},getPreparateInfoByMaterialNo:function(b){return a.customGET("outboundTask/getPreparateInfoByMaterialNo/"+b)},updateTaskToOutbound:function(b){return a.customPOST("outboundTask/updateTaskToOutbound",b)},updateTaskToConfirm:function(b){return a.customPOST("outboundTask/updateTaskToConfirm",b)},contrastInfo:function(b){return a.customGET("extraOutbound/contrastInfo/"+b)},getOutboundRecordList:function(b){return a.customPOST("outboundTask/getOutboundRecordList",b)},updateStatus:function(b){return a.customGET("extraOutbound/updateStatus/"+b)},getPrintInfo:function(b){return a.customGET("outboundTask/getPrintInfo/"+b)},getVinList:function(b){return a.customGET("outboundTask/getVinList/"+b)},outConfirm:function(b){return a.customPOST("outboundTask/outConfirm",b)}}}]).service("stockUnitStrategyService",["HttpService",function(a){return{list:function(b){return a.customGET("inboundPloy/getPloyList/"+b)},getPloyConditionList:function(b){return a.customGET("inboundPloy/getPloyConditionList/"+b)},getPloyFlowtoList:function(b){return a.customGET("inboundPloy/getPloyFlowtoList/"+b)},getPloyLocationList:function(b){return a.customGET("inboundPloy/getPloyLocationList/"+b)},addPloy:function(b){return a.customPOST("inboundPloy/addPloy",b)},updatePloy:function(b){return a.customPOST("inboundPloy/updatePloy",b)},addPloyCondition:function(b){return a.customPOST("inboundPloy/addPloyCondition",b)},addPloyFlowto:function(b){return a.customPOST("inboundPloy/addPloyFlowto",b)},addPloyLocation:function(b){return a.customPOST("inboundPloy/addPloyLocation",b)},deletePloy:function(b){return a.customPOST("inboundPloy/deletePloy",b)},deletePloyCondition:function(b){return a.customPOST("inboundPloy/deletePloyCondition",b)},deletePloyFlowto:function(b){return a.customPOST("inboundPloy/deletePloyFlowto",b)},deletePloyLocation:function(b){return a.customPOST("inboundPloy/deletePloyLocation",b)},genPloyContent:function(b){return a.customGET("inboundPloy/genPloyContent/"+b)}}}]).service("shipmentPlanService",["HttpService",function(a){return{getShipmentPLanList:function(b){return a.customPOST("wmsShipmentPlan/getShipmentPLanList",b)},getShipmentPLanVehicleList:function(b){return a.customGET("/wmsShipmentPlan/getShipmentPLanVehicleList/"+b)},createPreparationPlan:function(b){return a.customPOST("wmsShipmentPlan/createPreparationPlan",b)}}}]).service("userService",["HttpService",function(a){return{listUser:function(b){return a.customPOST("sysUser/listUser",b)},addSysUser:function(b){return a.customPOST("sysUser/addSysUser",b)},deleteSysUser:function(b){return a.customPOST("sysUser/deleteSysUser",b)},findSysUserById:function(b){return a.customGET("sysUser/findSysUserById/"+b)},updateSysUser:function(b){return a.customPOST("sysUser/updateSysUser",b)}}}]).service("roleService",["HttpService",function(a){return{listRole:function(b){return a.customPOST("sysRole/listRole",b)},addRole:function(b){return a.customPOST("sysRole/addRole",b)},deleteRole:function(b){return a.customPOST("sysRole/deleteRole",b)},listPermiss:function(b){return a.customPOST("sysRole/listPermiss",b)},updateRole:function(b){return a.customPOST("sysRole/updateRole",b)}}}]).service("permissionsService",["HttpService",function(a){return{list:function(b){return a.customPOST("permissions/list",b)},getPermissListByUserId:function(b){return a.customGET("permissions/getPermissListByUserId/"+b)}}}]).service("dropDownService",["HttpService",function(a){return{getZoneList:function(b){return a.customGET("baseData/getZone/"+b)},getCustomerInfo:function(){return a.customGET("baseData/getCustomerInfo")},getVehicleSpec:function(){return a.customGET("baseData/getVehicleSpec")},getArea:function(b){return a.customGET("/baseData/getAreaTree/"+b)},getWarehouse:function(){return a.customGET("/wh/getWarehouse")}}}]).service("borrowCarRegistrationService",["HttpService",function(a){return{borrowLine:function(b){return a.customPOST("/borrow/borrowLine",b)},findBorrowDetail:function(b){return a.customGET("/borrow/findBorrowDetail/"+b)},add:function(b){return a.customPOST("/borrow/add",b)},modify:function(b){return a.customPOST("/borrow/modify",b)},del:function(b){return a.customPOST("/borrow/del",b)},queryModifyDetail:function(b){return a.customGET("/borrow/queryModifyDetail/"+b)},printInfo:function(b){return a.customGET("/borrow/printInfo/"+b)}}}]).service("returnCarRegistrationService",["HttpService",function(a){return{returnLine:function(b){return a.customPOST("/return/returnLine",b)},findReturnDetail:function(b){return a.customGET("/return/findReturnDetail/"+b)},add:function(b){return a.customPOST("/return/add",b)},queryModifyDetail:function(b){return a.customGET("/return/queryModifyDetail/"+b)},del:function(b){return a.customPOST("/return/del",b)},modify:function(b){return a.customPOST("/return/modify",b)}}}]).service("borrowAndReturnRecordSearchService",["HttpService",function(a){return{borrowHistoryLine:function(b){return a.customPOST("/borrow/borrowHistoryLine",b)}}}]).service("shipmentPlanRejectService",["HttpService",function(a){return{queryShipmentList:function(b){return a.customPOST("/shipmentReject/queryShipmentList",b)},shipmentReject:function(b){return a.customGET("/shipmentReject/shipmentReject/"+b)},queryDetailList:function(b){return a.customGET("/shipmentReject/queryDetailList/"+b)},cancleTask:function(b){return a.customPOST("/shipmentReject/cancleTask",b)},changePrepare:function(b){return a.customPOST("/shipmentReject/changePrepare",b)}}}]);wmsService.service("Tools",["ngDialog","constant","$timeout",function(a,b,c){return{dialog:function(b){return a.open(b)},dialogConfirm:function(b){return a.openConfirm({closeByDocument:!1,closeByEscape:!1,template:"templates/dialog/dialog-confirm.html",width:500,title:"确认提示",data:{msg:b}})},dropDown:{billsTypeDropDown:[{name:b.billsTypeName.systemSchedul,value:b.billsType.systemSchedul},{name:b.billsTypeName.manualEntry,value:b.billsType.manualEntry},{name:b.billsTypeName.add,value:b.billsType.add}],orderStatusDropDown:[{name:b.orderStatusName.wmsInboundCreate,value:b.orderStatus.wmsInboundCreate},{name:b.orderStatusName.wmsInboundWaitAllocation,value:b.orderStatus.wmsInboundWaitAllocation},{name:b.orderStatusName.wmsInboundFinish,value:b.orderStatus.wmsInboundFinish}],inspectionResultsDropDown:[{name:b.inspectionResultsName.asnOrderPass,value:b.inspectionResults.asnOrderPass},{name:b.inspectionResultsName.asnOrderNotpassInRepair,value:b.inspectionResults.asnOrderNotpassInRepair}],statusDropDown:[{name:b.statusName.enable,value:b.status.enable},{name:b.statusName.disable,value:b.status.disable}],repairTypeDropDown:[{name:b.repairTypeName.inner,value:b.repairType.inner},{name:b.repairTypeName.outer,value:b.repairType.outer}],repairStatusDropDown:[{name:b.repairStatusName.unprocessed,value:b.repairStatus.unprocessed},{name:b.repairStatusName.maintenance,value:b.repairStatus.maintenance},{name:b.repairStatusName.finish,value:b.repairStatus.finish}],repairResultDropDown:[{name:b.repairResultName.qualified,value:b.repairResult.qualified},{name:b.repairResultName.disqualification,value:b.repairResult.disqualification +},{name:b.repairResultName.cancellinStocks,value:b.repairResult.cancellinStocks}],warehouseDropDown:[{name:b.warehouseName.unprocessed,value:b.warehouse.unprocessed},{name:b.warehouseName.execution,value:b.warehouse.execution},{name:b.warehouseName.haveOutbound,value:b.warehouse.haveOutbound},{name:b.warehouseName.finish,value:b.warehouse.finish}],stockUnitStatusDropDown:[{name:b.stockUnitStatusName.start,value:b.stockUnitStatus.start},{name:b.stockUnitStatusName.stop,value:b.stockUnitStatus.stop}],strategyConditionTypeDropDown:[{name:b.strategyConditionTypeName.shipper,value:b.strategyConditionType.shipper},{name:b.strategyConditionTypeName.vehicle,value:b.strategyConditionType.vehicle}],strategyOperatorDropDown:[{name:b.strategyOperatorName.xd,value:b.strategyOperator.xd},{name:b.strategyOperatorName.bdy,value:b.strategyOperator.bdy},{name:b.strategyOperatorName.xy,value:b.strategyOperator.xy},{name:b.strategyOperatorName.dy,value:b.strategyOperator.dy},{name:b.strategyOperatorName.xydy,value:b.strategyOperator.xydy},{name:b.strategyOperatorName.dydy,value:b.strategyOperator.dydy},{name:b.strategyOperatorName.bh,value:b.strategyOperator.bh},{name:b.strategyOperatorName.bbh,value:b.strategyOperator.bbh},{name:b.strategyOperatorName.s,value:b.strategyOperator.s},{name:b.strategyOperatorName.bs,value:b.strategyOperator.bs}],exceptionTypeDropDown:[{name:b.exceptionTypeName.injured,value:b.exceptionType.injured},{name:b.exceptionTypeName.shortItem,value:b.exceptionType.shortItem}],warehouseTypeDropDown:[{name:b.warehouseTypeName.commodityGarage,value:b.warehouseType.commodityGarage},{name:b.warehouseTypeName.entrepotStorage,value:b.warehouseType.entrepotStorage},{name:b.warehouseTypeName.frontLibrary,value:b.warehouseType.frontLibrary}],warehouseAttrDropDown:[{name:b.warehouseAttrName.standardLib,value:b.warehouseAttr.standardLib},{name:b.warehouseAttrName.simpleLib,value:b.warehouseAttr.simpleLib}],warehouseAutoDropDown:[{name:b.warehouseAutoName.yes,value:b.warehouseAuto.yes},{name:b.warehouseAutoName.no,value:b.warehouseAuto.no}],checkCarStatusDropDown:[{name:b.checkCarStatusName.noCheck,value:b.checkCarStatus.noCheck},{name:b.checkCarStatusName.check,value:b.checkCarStatus.check},{name:b.checkCarStatusName.error,value:b.checkCarStatus.error}],checkCarResultDropDown:[{name:b.checkCarResultName.qualified,value:b.checkCarResult.qualified},{name:b.checkCarResultName.unqualified,value:b.checkCarResult.unqualified}],outboundStatusDropDown:[{name:b.outboundStatusName.unStart,value:b.outboundStatus.unStart},{name:b.outboundStatusName.planned,value:b.outboundStatus.planned},{name:b.outboundStatusName.confirmed,value:b.outboundStatus.confirmed},{name:b.outboundStatusName.finish,value:b.outboundStatus.finish}],sexDropDown:[{name:b.sexName.men,value:b.sex.men},{name:b.sexName.women,value:b.sex.women}],outboundOutStatusDropDown:[{name:b.outboundOutStatusName.notOut,value:b.outboundOutStatus.notOut},{name:b.outboundOutStatusName.out,value:b.outboundOutStatus.out}],shipmentPlanStatusDropDown:[{name:b.shipmentPlanStatusName.untreated,value:b.shipmentPlanStatus.untreated},{name:b.shipmentPlanStatusName.treated,value:b.shipmentPlanStatus.treated}],userTypeDropDown:[{name:b.userTypeName.pc,value:b.userType.pc},{name:b.userTypeName.app,value:b.userType.app}],shipmentPlanTypeDropDown:[{name:b.shipmentPlanTypeName.normal,value:b.shipmentPlanType.normal},{name:b.shipmentPlanTypeName.dispatcher,value:b.shipmentPlanType.dispatcher}],businessTypeDropDown:[{name:b.businessTypeName.Z1,value:b.businessType.Z1},{name:b.businessTypeName.Z2,value:b.businessType.Z2},{name:b.businessTypeName.Z3,value:b.businessType.Z3},{name:b.businessTypeName.Z4,value:b.businessType.Z4},{name:b.businessTypeName.Z5,value:b.businessType.Z5},{name:b.businessTypeName.Z6,value:b.businessType.Z6},{name:b.businessTypeName.Z7,value:b.businessType.Z7},{name:b.businessTypeName.Z8,value:b.businessType.Z8},{name:b.businessTypeName.Z9,value:b.businessType.Z9}],shipmentRejectStatusDropDown:[{name:b.shipmentRejectStatusName.yes,value:b.shipmentRejectStatus.yes},{name:b.shipmentRejectStatusName.no,value:b.shipmentRejectStatus.no}]},modelAssignment:function(a,b){var c=null,d=a;if(a instanceof Object?(c=a.currentTarget.attributes["ng-model"].value,d=a.currentTarget.value):(d=a,c=this.elem.attributes["ng-model"].value,b=this.scope),c){var e=c.split(".");1==e.length?b[e[0]]=d:2==e.length?(b[e[0]]||(b[e[0]]={}),b[e[0]][e[1]]=d):3==e.length?b[e[0]][e[1]][e[2]]=d:4==e.length?b[e[0]][e[1]][e[2]][e[3]]=d:5==e.length&&(b[e[0]][e[1]][e[2]][e[3]][e[4]]=d)}},alert:function(a){a&&layer.msg(a)},page:function(a,b,c){b||(b={}),b.elem=a?$(a):$(b.elem),b.jump=b.jump?b.jump:c,b.theme="#de531a",b.last=b.last?b.last:10,b.curr=b.curr?b.curr:1,b.prev="<",b.next=">",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(' - - + + <%if (compressed) { %> -- Gitee From 1f4b1f6589bceca1b54939bd61082e18eedb693e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=96=E4=BB=95=E5=81=A5?= <564208006@qq.com> Date: Fri, 3 Nov 2017 18:44:40 +0800 Subject: [PATCH 049/123] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/w.ctrl.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/js/ctrl/w.ctrl.js b/public/js/ctrl/w.ctrl.js index d7eddef8..902eaa80 100644 --- a/public/js/ctrl/w.ctrl.js +++ b/public/js/ctrl/w.ctrl.js @@ -347,7 +347,8 @@ wmsCtrl.controller('warehouseCtrl',['$scope','warehouseService','dropDownService .then(function(result){ if(result.success){ scope.Tools.alert('出库确认成功'); - scope.confirmVinList = result.data; + scope.vinList = result.data; + scope.confirmVinList = new Array(scope.vin); scope.list(scope.listParam()); }else{ scope.Tools.alert(result.message); -- Gitee From 985bb26fad7ec59f12c36096da8b0c289ad96459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= <1308369732@qq.com> Date: Sat, 4 Nov 2017 18:45:33 +0800 Subject: [PATCH 050/123] =?UTF-8?q?=E5=80=9F=E8=BD=A6=E5=8D=95=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/wms.css | 9 ++ public/images/u8117.png | Bin 0 -> 1923 bytes public/js/ctrl/b.ctrl.js | 89 ++++++++++++++++-- public/js/wms-service.js | 8 ++ .../borrowCarRegistration.html | 2 +- .../layer/bcr-addNew.html | 9 +- routes/resource/base-config.js | 7 +- 7 files changed, 110 insertions(+), 14 deletions(-) create mode 100644 public/images/u8117.png diff --git a/public/css/wms.css b/public/css/wms.css index 892ffe1d..71202caa 100644 --- a/public/css/wms.css +++ b/public/css/wms.css @@ -55,6 +55,15 @@ .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: 250px; diff --git a/public/images/u8117.png b/public/images/u8117.png new file mode 100644 index 0000000000000000000000000000000000000000..82d3952a24ee5877e2f4db93dda8d2266c71b9ff GIT binary patch literal 1923 zcmd6oX*3%O7RO_aMyZxOo@(u-Jfv!S5=@kaT1uos5sf9aC#pr%P_eanMMED#LhPXt zJk;8vDX(^&mfCk(k5DZ|Xia9m&dm2Y=id7}|8xKMocraT`^d==Apw#H0RR9ATN^7R zpH=*f6BFgvh6!>T9|93bge8DIq_D;p!nffLZ~&k#L;MIU!q+DVHtrDsfF$Q%Dexzr z=?4G+e> zL71h2iT?wi`%uE)zI{`pJN7Rw7PG3WdxwV7Bih^BJ%fURO6%&J<>lpRzTutPEFXO9sP+0GvvYEeB`${G@z8~HXU}F)D5obTC-p6^oD6zcUS94O9qndhWHdm@($UfB zou6k63=ik4Zuc-!ge!Pd>dzB%!{5v2W@fyoxw(XFVECVm6hOsil$L+N3b3nyMjOzc z?|ulE5U?cw<)(>3p_WX1orF>b&y3|`uxnDcPX=|?*6%Gfyl82;xW2x=>V5=a3S8+t zI`c6SoG1^mFoq-Uv%@(I(T(>Pk6(5--vOifBU;+pgQ{CcM>i+=?q@YMdu3IwX!K>~ zP3{J_-y>f48t(qELft9L$?55k0x-L*tQ$twXoPznSq z8yj1#lrPpYHZ-K(-Y(T=)*PE}C4EKm2+h8+M7vFM3uV1yUXzP|Xkyjm+qc+)m5PQ2 z)a2CEVEsN4{9cwot?4iuXFMk1&ZF0Ri9*Y(1VnvzgyI=9<@f4%<6gYBse2xW@hfG#dg=O zl{PlsXl-kw!-J5Jg^aW_TAD@<2d#UnF~lEZu9Y>KhKP*>fuI2Zi_JC_dMBpA;}0|r zCB@Ss_gn1uJ{nHbT5H3c_1=#eAhIviqn%N;1*`K;ozRrvrEy^Ly79$S}TRCNk1q z*WQ1CLfE;^G8r}8u*d;PyF2APk6d|MQ@*?~tOv~~nRmStGEHJHFFUBgt*1`h*x{ar z=6xA&p4t7;Tu)JjCd;ExI;fgMbK2c1szYr8=c;6cuwUT_iLAs3DvFr^;nh4vIIymb z7+Bb0XA1I4{I5?LtrcU8Nyj)23_dsEd|=SxlP;qXqE=Vb{xR`{HjtPOGGLm#C^R=2 z44!5&{sG&!?W?RcI)#&6ocz6mqweMt>BXDdCkrhHn4puX&$hGb`$zL{ho8nU9m|zczbUWc~?U>zBRbOC#CFh zxpB!<{m|alZx4JH2eP3TV8BtXg%3kbcN&y@Ry=ejKslh<5Ll9lA*bp@*~=)PVpVH# zoIDLS`Yz#vKxF^8;neG`{BzqquM33otC_R8A|l`lLDpz3uHIil8XT)Pk{Y|90Ue77 zxKt!48h#l4#2cF5o=Darb+EoY&nlD}kv&C{_g{jss$@s2*N8yy`X4@l&;y;S9^&}A zjj+u690aOVVC-_&tSS6_&%TPF^vV!yKvFDGUMfmSfm@`clxwtOIwNVrHk-7(#1wcH zc$%x+VN5r|nDwnx<;e1{Tgs^^E!D0L)7%g8(7Rq}fS3o08mci3qE9;$K}FbCCqDPU zOsOlfqJ~z?hi?7YSjY$Ht?gGO;8HAZM>A?{w1$ciH582AhUC(@LUT@(5kX6B%{~d2 zqV%Di7&-#yq)PJea^#6Q5ZXk$30RTKFEAEvN$|AsG(DAU;QoWh5MC|z6-+D)p>;R< z5xnuip-M3^A%KOF5L?ytUO=b4kU;?9k9S1<~J8x14N6{{N7inUIjc zI$ny$<7^e_K|>R$K^^DBY;wKTd$H LwWAf=@)qfzDDZQ1 literal 0 HcmV?d00001 diff --git a/public/js/ctrl/b.ctrl.js b/public/js/ctrl/b.ctrl.js index 0c0876f4..c5dda481 100644 --- a/public/js/ctrl/b.ctrl.js +++ b/public/js/ctrl/b.ctrl.js @@ -2,7 +2,7 @@ * Created by lihao on 2017/10/20. borrowCarRegistration */ 'use strict'; -wmsCtrl.controller('borrowCarRegistrationCtrl',['$scope','Tools','$rootScope','$http','$timeout','ngDialog','borrowCarRegistrationService',function($scope,Tools,$rootScope,$http,$timeout,ngDialog,borrowCarRegistrationService){ +wmsCtrl.controller('borrowCarRegistrationCtrl',['$scope','Tools','$rootScope','$http','$timeout','ngDialog','borrowCarRegistrationService','FileUploader',function($scope,Tools,$rootScope,$http,$timeout,ngDialog,borrowCarRegistrationService,FileUploader){ //新增 if($rootScope.bcrAddFlag){ @@ -50,11 +50,13 @@ wmsCtrl.controller('borrowCarRegistrationCtrl',['$scope','Tools','$rootScope','$ bcBorrowDate:'', bcEstimatedReturnDate:'', bcBorrowReason:'', + uploadKey:'', wmsBorrowCarDetailList:[] }; $scope.wmsTemp = { bdId:null, + bdVin: '', bdCarSeries:'', bdCarSpecname:'', bdCarColorname:'', @@ -73,11 +75,12 @@ wmsCtrl.controller('borrowCarRegistrationCtrl',['$scope','Tools','$rootScope','$ //添加车辆 $scope.addObj.wmsBorrowCarDetailList = []; + $scope.count =1; $scope.addCar = function(){ - $scope.addbcrInfo = true; - if( !$scope.isNull($scope.wmsTemp)){ + if( $scope.wmsTemp.bdVin || ($scope.wmsTemp.bdCarSpecname && $scope.wmsTemp.bdCarColorname )){ + $scope.count++; $scope.addObj.wmsBorrowCarDetailList.push($scope.wmsTemp); //加载完页面后再渲染下页面 $timeout(function(){ @@ -90,13 +93,14 @@ wmsCtrl.controller('borrowCarRegistrationCtrl',['$scope','Tools','$rootScope','$ $scope.wmsTemp = { bdId:null, + bdVin : '', bdCarSeries:'', bdCarSpecname:'', bdCarColorname:'', num:'' }; - } else { - + } else if( $scope.count !=1){ + $scope.Tools.alert('车架号 或 （车型颜色） 至少填写一组'); } }; @@ -214,12 +218,68 @@ wmsCtrl.controller('borrowCarRegistrationCtrl',['$scope','Tools','$rootScope','$ }; + $rootScope.brcFlag = false; //新增借用单 $scope.addbcrBill = function(){ $rootScope.bcrAddFlag = false; - $scope.addNew() + $scope.addNew(); + + //获取七牛token + borrowCarRegistrationService.getUploadToken().then(function(result){ + if (result.success) { + $scope.brc_token = result.data; + var imgKey = null; + + var uploader = $rootScope.uploaderBRC = new FileUploader({ + url: 'http://upload.qiniu.com/', + formData: [{ + token: result.data + }], + queueLimit: 1, + autoUpload: true + }); + $rootScope.brcFlag = true; + uploader.filters.push({ + name: 'filterName', + fn: function (item /*{File|FileLikeObject}*/, options) { + $scope.imageUploadFlag = true; + var type = '|' + item.type.slice(item.type.lastIndexOf('/') + 1) + '|'; + return '|jpg|png|jpeg|bmp|gif|'.indexOf(type) !== -1; + } + }); + uploader.onSuccessItem = function (fileItem, response, status, headers) { + console.log("上传成功"); + $scope.addObj.uploadKey = response.key; + $rootScope.uploadKey = response.key; + console.log($scope.addObj); + + //获取图片url + borrowCarRegistrationService.getDownUrl(response.key).then(function (result) { + if (result.success) { + + $('.bcr-add-image').css("background","url("+result.data+")"); + $('.bcr-add-image').css("background-size","100%"); + $('.bcr-add-image').css("background-repeat","no-repeat"); + } + }).finally(function () { + layer.close(index); + }); + }; + uploader.onProgressAll = function(progress) { + $("#progress"+$scope.index).css('width',(progress-10)*1.32+'px'); + console.info('onProgressAll', progress); + }; + + uploader.onErrorItem = function (fileItem, response, status, headers) { + alert("文件" + fileItem.file.name + "上传失败！", "提示"); + uploader.removeFromQueue(fileItem); + console.info('上传失败的文件', fileItem, response, status, headers); + }; + + } + }); }; // 编辑 @@ -332,10 +392,12 @@ wmsCtrl.controller('borrowCarRegistrationCtrl',['$scope','Tools','$rootScope','$ //新增保存 $scope.addSave = function(){ - if ($scope.isNull($scope.addObj)){ + $scope.addObj.uploadKey = $rootScope.uploadKey; + if (!$scope.addObj.bcBorrowName || !$scope.addObj.bcBorrowDepartment || !$scope.addObj.bcBorrowTel || !$scope.addObj.bcBorrowDate || !$scope.addObj.bcEstimatedReturnDate || !$scope.addObj.bcBorrowReason || !$scope.addObj.uploadKey || $scope.addObj.wmsBorrowCarDetailList.length==0 ){ $scope.Tools.alert('请完整填写 借车人信息 和 车辆信息 ！'); } else { // bcBorrowDate:'', bcEstimatedReturnDate:'', + debugger; if($scope.Tools.isRange($scope.addObj.bcBorrowDate,$scope.addObj.bcEstimatedReturnDate)){ borrowCarRegistrationService.add($scope.addObj).then(function(data){ if(data.success){ @@ -390,7 +452,18 @@ wmsCtrl.controller('borrowCarRegistrationCtrl',['$scope','Tools','$rootScope','$ $scope.Tools.alert(result.message); } }) - } + }; + + +// 图片上传 + $scope.uploadImgs = function () { + + + }; + $scope.db = function(e){ + var src = $(e.target).attr('src'); + $rootScope.showImage(src); + }; }]) .controller('borrowAndReturnRecordSearchCtrl',['$scope','$rootScope','$http','$timeout','ngDialog','borrowAndReturnRecordSearchService',function($scope,$rootScope,$http,$timeout,ngDialog,borrowAndReturnRecordSearchService){ diff --git a/public/js/wms-service.js b/public/js/wms-service.js index bcd10740..de8b5b3b 100644 --- a/public/js/wms-service.js +++ b/public/js/wms-service.js @@ -423,6 +423,14 @@ var wmsService = angular.module('wms.services', []) // 获取打印列表信息 /borrow/printInfo printInfo : function(data){ return HttpService.customGET('/borrow/printInfo/'+ data); + }, + // 获取千牛token + getUploadToken : function(){ + return HttpService.customGET('/borrow/getUploadToken'); + }, + // 通过key 获取 url + getDownUrl : function(data){ + return HttpService.customGET('/borrow/getDownUrl/'+data) } } }]) diff --git a/public/templates/vehicleBorrowingManagement/borrowCarRegistration.html b/public/templates/vehicleBorrowingManagement/borrowCarRegistration.html index 63f6ee2c..9e856486 100644 --- a/public/templates/vehicleBorrowingManagement/borrowCarRegistration.html +++ b/public/templates/vehicleBorrowingManagement/borrowCarRegistration.html @@ -1,4 +1,4 @@ -
+`