diff --git a/app.js b/app.js
index f55a6b59c23526e9e4be5504ace1484513652f24..8fabd525fd46186d1b26b67faf1cfff6d8fe50f7 100644
--- a/app.js
+++ b/app.js
@@ -7,31 +7,8 @@ var bodyParser = require('body-parser');
var index = require('./routes/index');
var distribution = require('./routes/distribution');
-// var users = require('./routes/users');
var app = express();
-// function(req,res) {
-// var parms = urlLib.parse(req.url, true);
-// var str = parms.query.name + '(' + JSON.stringify(data) + ')';
-// }
-
-// //新增
-// app.use(function(req, res, next) {
-// // var parms = urlLib.parse(req.url,true);
-// // var str = parms.query.name;
-// // console.log(str);
-//
-// // res.send('123');
-// // var name = req.query.name;
-// // var name = req.query.name;
-// // res.send("你获取的get数据为:" + name);
-// console.log('1122');
-// res.setHeader('Access-Control-Allow-Origin', '*');
-// res.setHeader('Access-Control-Allow-Credentials', true);
-// res.setHeader('Access-Control-Allow-Methods', 'POST, GET, PUT, DELETE, OPTIONS');
-//
-// next();
-// });
// view engine setup
app.set('views', path.join(__dirname, 'views'));
@@ -45,16 +22,6 @@ app.use(bodyParser.urlencoded({ extended: false }));
app.use(cookieParser());
app.use(express.static(path.join(__dirname, 'public')));
-
-// app.get('/tms',function(req,res){
-// res.send('jinlaile');
-// // })
-// app.use('/',function(req,res){
-// var parms = urlLib.parse(req.url, true);
-// var str = parms.query.name;
-// console.log('jinlaile');
-// console.log(str);
-// });
app.use('/', index);
app.use('/distribution',distribution);
diff --git a/config/pom.json b/config/pom.json
index 65bc6b6192e69b75293ecb8c95d2a573d59c91ab..2113a521ee895453c4685b910013e2cc5b1935d5 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 0000000000000000000000000000000000000000..a6479ba21ed519444b23c87727929cd45832e1e5
--- /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;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
diff --git a/public/css/wms.css b/public/css/wms.css
index 1b54ccab56a10b4200bb4c9e17d06e969162c02f..d07bc62f1216e8d0df011b7641017b20a5a40315 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;
@@ -24,6 +31,14 @@
font-size: 12px;
min-width: 62px;
}
+.bcrLayer table{
+ /*width: 90% !important;*/
+ margin: 10px auto;
+ /*margin: 0 0 10px 25px;*/
+}
+.bcrLayer table td{
+ border: 1px solid #000 !important;
+}
.wms-main-page-function{
position: relative;
@@ -32,6 +47,11 @@
height: 100%;
padding-right: 10px;
}
+html,body{
+ box-sizing: content-box;
+ height: 100%;
+ width: 100%;
+}
.page-function{
height: 37px;
@@ -40,6 +60,34 @@
.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;
@@ -545,6 +593,28 @@ table tr.checkStatus{
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{
@@ -723,7 +793,8 @@ table tr.checkStatus{
.print_outbound_receipt_top{
width: 100%;
- height: 316px;
+ height: auto;
+ margin-bottom: 10px;
}
.print_outbound_receipt_top .receipt_top_title{
@@ -752,7 +823,22 @@ table tr.checkStatus{
.print_outbound_receipt_top .receipt_top_table{
margin-top: 10px;
width: 100%;
- height: 110px;
+ height: auto;
+}
+
+.receipt_top_table .print_table_min th{
+ padding: 0 3px;
+}
+
+.receipt_top_table tr td.black_td{
+ color: black;
+ font-weight: bold;
+}
+
+.layui-table tr td.tr_td{
+ word-wrap:break-word;
+ word-break:break-all;
+ white-space:normal;
}
.print_outbound_receipt_body{
@@ -843,4 +929,224 @@ table tr.checkStatus{
width: 90%;
height: 100%;
float: left;
+}
+/*big Screen*/
+
+#bs_pc_main canvas{
+ width: 100%;
+}
+#bs_pc_main{
+ width: 100%;
+ height: 100%;
+}
+.bs_pc_rootBox{
+ display: -webkit-box; /* 老版本语法: Safari, iOS, Android browser, older WebKit browsers. */
+ display: -moz-box; /* 老版本语法: Firefox (buggy) */
+ display: -ms-flexbox; /* 混合版本语法: IE 10 */
+ display: -webkit-flex; /* 新版本语法: Chrome 21+ */
+ display: flex; /* 新版本语法: Opera 12.1, Firefox 22+ */
+ display: -webkit-box;
+ height: 50%;
+ width: 100%;
+}
+.bs_pc_part{
+ -webkit-box-flex: 1 ; /* OLD - iOS 6-, Safari 3.1-6 */
+ -moz-box-flex: 1; /* OLD - Firefox 19- */
+ -webkit-flex: 1; /* Chrome */
+ -ms-flex: 1 ; /* IE 10 */
+ flex: 1; /* NEW, Spec - Opera 12.1, Firefox 20+ */
+ border: 1px solid #000;
+ margin: 5px;
+ overflow: hidden;
+ box-sizing: border-box;
+ /*background-image: -webkit-radial-gradient(hsla(120,70%,60%,.9),hsla(360,60%,60%,.9));*/
+ /*background-image: radial-gradient(hsla(120,70%,60%,.9),hsla(360,60%,60%,.9));*/
+ background-image: -webkit-radial-gradient(#737373,#2b2b2b);
+ background-image: radial-gradient(#737373,#2b2b2b);
+}
+/***********************************************************/
+#bs_ow_heard{
+ padding: 10px 0 20px 0;text-align: center;font-size: 30px;
+}
+#bs_ow_main table{
+ width: 100%;
+ border-collapse:collapse;
+
+}
+#bs_ow_main th{
+ background-color: #bdd7ee;
+ border-left: 0 solid #bdd7ee;
+ border-right: 0 solid #bdd7ee;
+}
+#bs_ow_main th,#bs_ow_main td{
+ 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_td1_main {
+ display: -webkit-flex;
+ flex-direction: column;
+ -webkit-flex-direction: column;
+ height: 100%;
+ width: 100%;
+}
+#bs_td1_box{
+ -webkit-box-flex: 1 ; /* OLD - iOS 6-, Safari 3.1-6 */
+ -moz-box-flex: 1; /* OLD - Firefox 19- */
+ -webkit-flex: 1; /* Chrome */
+ -ms-flex: 1 ; /* IE 10 */
+ flex: 1;
+ background-image: -webkit-radial-gradient(#737373,#2b2b2b);
+ background-image: radial-gradient(#737373,#2b2b2b);
+}
+#bs_td1_table{
+ -webkit-box-flex: 1 ; /* OLD - iOS 6-, Safari 3.1-6 */
+ -moz-box-flex: 1; /* OLD - Firefox 19- */
+ -webkit-flex: 1; /* Chrome */
+ -ms-flex: 1 ; /* IE 10 */
+ flex: 1;
+ margin-top: 15px;
+}
+#bs_td1_main table{
+ width: 100%;
+ border-collapse:collapse;
+}
+#bs_td1_main th{
+ background-color: #bdd7ee;
+ border-left: 1px solid #bdd7ee;
+ border-right: 1px solid #bdd7ee;
+}
+#bs_td1_main th, #bs_td1_main td{
+ border: 1px solid #000;
+ text-align: center;
+ padding: 10px 0;
+}
+/************************************************************/
+#bs_td2_main {
+ display: -webkit-flex;
+ flex-direction: column;
+ -webkit-flex-direction: column;
+ height: 100%;
+ width: 100%;
+}
+#bs_td2_box{
+ -webkit-box-flex: 1 ; /* OLD - iOS 6-, Safari 3.1-6 */
+ -moz-box-flex: 1; /* OLD - Firefox 19- */
+ -webkit-flex: 1; /* Chrome */
+ -ms-flex: 1 ; /* IE 10 */
+ flex: 1;
+ background-image: -webkit-radial-gradient(#737373,#2b2b2b);
+ background-image: radial-gradient(#737373,#2b2b2b);
+}
+#bs_td2_table{
+ -webkit-box-flex: 1 ; /* OLD - iOS 6-, Safari 3.1-6 */
+ -moz-box-flex: 1; /* OLD - Firefox 19- */
+ -webkit-flex: 1; /* Chrome */
+ -ms-flex: 1 ; /* IE 10 */
+ flex: 1;
+ margin-top: 15px;
+}
+#bs_td2_main table{
+ width: 100%;
+ border-collapse:collapse;
+}
+#bs_td2_main th{
+ background-color: #bdd7ee;
+ border-left: 0 solid #bdd7ee;
+ border-right: 0 solid #bdd7ee;
+}
+#bs_td2_main th,#bs_td2_main td{
+ border: 1px solid #000;
+ text-align: center;
+ padding: 10px 0;
+}
+
+/****************************************************/
+
+#bs_db_main {
+ display: -webkit-flex;
+ flex-direction: column;
+ -webkit-flex-direction: column;
+ height: 100%;
+ width: 100%;
+}
+#bs_db_box{
+ -webkit-box-flex: 1 ; /* OLD - iOS 6-, Safari 3.1-6 */
+ -moz-box-flex: 1; /* OLD - Firefox 19- */
+ -webkit-flex: 1; /* Chrome */
+ -ms-flex: 1 ; /* IE 10 */
+ flex: 1;
+ background-image: -webkit-radial-gradient(#737373,#2b2b2b);
+ background-image: radial-gradient(#737373,#2b2b2b);
+}
+#bs_db_table{
+ -webkit-box-flex: 1 ; /* OLD - iOS 6-, Safari 3.1-6 */
+ -moz-box-flex: 1; /* OLD - Firefox 19- */
+ -webkit-flex: 1; /* Chrome */
+ -ms-flex: 1 ; /* IE 10 */
+ flex: 1;
+ margin-top: 15px;
+}
+#bs_db_main table{
+ width: 100%;
+ border-collapse:collapse;
+}
+#bs_db_main th{
+ background-color: #bdd7ee;
+ border-left: 0 solid #bdd7ee;
+ border-right: 0 solid #bdd7ee;
+}
+#bs_db_main th,#bs_db_main td{
+ 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_main table td{
+ border-left: 0 solid #000 !important;
+ border-right: 0 solid #000 !important;
+}
+#bs_ow_cp_pt_percentage{
+ background-color: #5b9bd5;
+ height: 100%;
+ width: 0;
+ display: inline-block;
+ float: left;
+}
+.bs_ow_cp_pt_temp{
+ display: inline-block;
+ width: 10px;
+ height: 100%;
+ background-color: #ed7d31;
+ float: left;
+}
+.bs_ow_cp_pt_temp1{
+ float:left;
+ color:#fff;
+ display: inline-block;
+ line-height: 22px;
+ margin-left: 5px;
+}
+
+/****************************big screen*******************************************/
+.bs_fullScreen{
+ width: 89px;
+ position: absolute;
+ z-index: 9999;
+ border: 1px solid rgba(0,0,0,0);
+ height: 48px;
+ box-sizing: border-box;
+ padding: 15px 0 0 15px;
}
\ No newline at end of file
diff --git a/public/images/cancel-fullScreen.png b/public/images/cancel-fullScreen.png
new file mode 100644
index 0000000000000000000000000000000000000000..da4cce047021bf6a02bdd327248b46cb7b3b6728
Binary files /dev/null and b/public/images/cancel-fullScreen.png differ
diff --git a/public/images/fullScreen.png b/public/images/fullScreen.png
new file mode 100644
index 0000000000000000000000000000000000000000..5deeba0be4519847134d64937c4103062c529f98
Binary files /dev/null and b/public/images/fullScreen.png differ
diff --git a/public/images/set3.png b/public/images/set3.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8d405eb08aaceae67caa40ab54efe7d52be80f3
Binary files /dev/null and b/public/images/set3.png differ
diff --git a/public/images/u8117.png b/public/images/u8117.png
new file mode 100644
index 0000000000000000000000000000000000000000..82d3952a24ee5877e2f4db93dda8d2266c71b9ff
Binary files /dev/null and b/public/images/u8117.png differ
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 0000000000000000000000000000000000000000..5fa31a72a2f3e25a998e230858c3b0cae3957e31
--- /dev/null
+++ b/public/js/build/ils-wms-web.min.js
@@ -0,0 +1,7 @@
+/*! 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('
-
-
+
+
+
<%if (compressed) { %>
diff --git a/views/login.ejs b/views/login.ejs
index 0b6a012d4faaee4d81ae1f4544b44d6d5c716743..ad20de9eba73ff713d5f9f0976d5f90967377360 100644
--- a/views/login.ejs
+++ b/views/login.ejs
@@ -110,6 +110,7 @@
var t = cookies.getObject('user');
location.href = 'index'
} else {
+ $('input').blur(); //清除焦点
layer.alert(data.message);
}
}