diff --git a/public/css/wms.css b/public/css/wms.css index faf2250a67903f7bce57c8242fce7a8b9274c935..8ecd202d18febaf537db889204e74759599d9633 100644 --- a/public/css/wms.css +++ b/public/css/wms.css @@ -192,6 +192,10 @@ html,body{ height: 14px !important; } +.layui-table.layui-table-small td{ + padding: 0px !important; +} + .layui-form-checkbox .layui-icon { line-height: 14px !important; } @@ -1190,4 +1194,19 @@ table tr.checkStatus{ } .abm_table_icon{ font-size:12px;float: left;display: inline-block;margin-right: 12px; +} +.abm_p1{ + color: #292929; + font-family: "Trebuchet MS",Lucida,Verdana,sans-serif; + font-size: 25px; + text-align: center; + margin-bottom: 10px; +} +.abm_p3{ + text-align: center; + color: #292929; + font-size: 16px; +} +.abm_weight td{ + font-weight: 700 !important; } \ No newline at end of file diff --git a/public/js/ctrl/a.ctrl.js b/public/js/ctrl/a.ctrl.js index 3e3634ce74b2b41afd676ec93f4dfeb9f080a8b2..e44c02826cb39564fa4decc663beca2d444097d3 100644 --- a/public/js/ctrl/a.ctrl.js +++ b/public/js/ctrl/a.ctrl.js @@ -490,7 +490,7 @@ wmsCtrl.controller('asnCtrl',['$scope','dropDownService','inStorageBillService', template: "templates/maintenanceManagement/abnormalManagement/abm_imageList.html", controller: "abm_imageListCtrl", title: '异常图片显示', - width:600, + width:600 }); $timeout(function(){ $('.ngdialog-content').css('display','table') @@ -554,8 +554,39 @@ wmsCtrl.controller('asnCtrl',['$scope','dropDownService','inStorageBillService', // 异常描述转义 $scope.change = function(){ + }; + +// 打印 + $scope.printAbm = function(){ + $rootScope.abm_indexArr_pr = []; + //获取选中的list列表 + $('.wms_abm_table').find('td i').each(function (i, obj) { + if ($(obj).parent().hasClass('layui-form-checked')){ + $rootScope.abm_indexArr_pr.push($(obj).parents('tr').attr('key')); + } + }); + var l =$rootScope.abm_indexArr_pr.length; + if(l==0){ + $scope.Tools.alert('未选择'); + } else if(l>0){ + ngDialog.open({ + template: "templates/maintenanceManagement/abnormalManagement/printAbm.html", + controller: "printAbmCtrl", + title: '打印', + width:800 + }); + } + } }]) .controller('abm_imageListCtrl',['$scope','$rootScope',function($scope,$rootScope){ - }]); \ No newline at end of file + }]) + .controller('printAbmCtrl',['$scope','$rootScope','ngDialog','Tools',function($scope,$rootScope,ngDialog,Tools){ + $scope.abmPrint = function(){ + Tools.printHTML($('.abmPrintMain')[0].outerHTML,790,1); + }; + $scope.close = function() { + ngDialog.closeAll(); + } + }]) \ No newline at end of file diff --git a/public/js/ctrl/d.ctrl.js b/public/js/ctrl/d.ctrl.js index 502a743eb24b19c40c9ad7b89fe7f8bcb8ef0aa2..7e5c9b45d8b7ef93b990bb5fd630d61d0713f027 100644 --- a/public/js/ctrl/d.ctrl.js +++ b/public/js/ctrl/d.ctrl.js @@ -66,8 +66,8 @@ wmsCtrl.controller('distributionCtrl',['$scope','$rootScope','$timeout','$state' type: 'value', name: '数量', min: 0, - max: 60, - interval: 6, + max: 300, + interval: 30, axisLabel: { formatter: '{value} 次', textStyle: { @@ -108,7 +108,7 @@ wmsCtrl.controller('distributionCtrl',['$scope','$rootScope','$timeout','$state' itemStyle: { normal: { label: { - show: true, + show: true } } } @@ -121,7 +121,7 @@ wmsCtrl.controller('distributionCtrl',['$scope','$rootScope','$timeout','$state' itemStyle: { normal: { label: { - show: true, + show: true } } } @@ -134,7 +134,7 @@ wmsCtrl.controller('distributionCtrl',['$scope','$rootScope','$timeout','$state' itemStyle: { normal: { label: { - show: true, + show: true } } } @@ -200,7 +200,7 @@ wmsCtrl.controller('distributionCtrl',['$scope','$rootScope','$timeout','$state' $scope.pt1.legend.data = temp; // 加载条件注释 $scope.pt1.xAxis[0].data = r_d[0].date; // 加载x轴数据 - var update = '更新时间:'+ $rootScope.getNowFormatDate(); + var update = '更新时间: '+ $rootScope.getNowFormatDate(); $scope.pt1.title.subtext = update; $rootScope.db_load($scope.pt1); @@ -288,8 +288,8 @@ wmsCtrl.controller('distributionCtrl',['$scope','$rootScope','$timeout','$state' type: 'value', name: '数量', min: 0, - max: 10, - interval: 1, + max: 20, + interval: 2, axisLabel: { formatter: '{value} 台', textStyle: { @@ -326,12 +326,12 @@ wmsCtrl.controller('distributionCtrl',['$scope','$rootScope','$timeout','$state' { name: '进场板数', type: 'bar', - data: [3, 9, 4, 7, 9], + data: [0, 0, 0, 0, 0], barGap: 0, itemStyle: { normal: { label: { - show: true, + show: true } } } @@ -339,12 +339,12 @@ wmsCtrl.controller('distributionCtrl',['$scope','$rootScope','$timeout','$state' { name: '出场板数', type: 'bar', - data: [4, 6, 4, 9, 6], + data: [0, 0, 0, 0, 0], barGap: 0, itemStyle: { normal: { label: { - show: true, + show: true } } } @@ -353,7 +353,7 @@ wmsCtrl.controller('distributionCtrl',['$scope','$rootScope','$timeout','$state' name: '进场及时率', type: 'line', yAxisIndex: 1, - data: [80, 90, 95, 90, 93], + data: [0, 0, 0, 0, 0], barGap: 0, itemStyle: { normal: { @@ -371,7 +371,7 @@ wmsCtrl.controller('distributionCtrl',['$scope','$rootScope','$timeout','$state' name: '出场及时率', type: 'line', yAxisIndex: 1, - data: [80, 95, 80, 71, 90], + data: [0, 0, 0, 0, 0], barGap:0, itemStyle: { normal: { diff --git a/public/js/ctrl/p.ctrl.js b/public/js/ctrl/p.ctrl.js index 6e6675afbb2a662bf702d4860c23f6e4a121329f..3e7b478d8831009aeeb3a6db5158a1414a86d64c 100644 --- a/public/js/ctrl/p.ctrl.js +++ b/public/js/ctrl/p.ctrl.js @@ -265,7 +265,7 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic itemStyle: { normal: { label: { - show: true, + show: true } } } @@ -278,7 +278,7 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic itemStyle: { normal: { label: { - show: true, + show: true } } } @@ -291,7 +291,7 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic itemStyle: { normal: { label: { - show: true, + show: true } } } @@ -350,7 +350,7 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic data: [ { value: 0, - name: '质损', + name: '质损' // label: { // normal: { // formatter: [ @@ -541,7 +541,7 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic itemStyle: { normal: { label: { - show: true, + show: true } } } @@ -555,25 +555,25 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic itemStyle: { normal: { label: { - show: true, + show: true } } } }, - { - name: '', - type: 'bar', - // barWidth : 5, - stack: 'transport', - data: [0, 0, 0, 0, 0, 0, 0], - itemStyle: { - normal: { - label: { - show: true, - } - } - } - } + // { + // name: '', + // type: 'bar', + // // barWidth : 5, + // stack: 'transport', + // data: [0, 0, 0, 0, 0, 0, 0], + // itemStyle: { + // normal: { + // label: { + // show: true + // } + // } + // } + // } ] }; @@ -681,7 +681,7 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic $scope.pt2.legend.data = temp; // 加载条件注释 $scope.pt2.xAxis[0].data = r_d[0].date; // 加载x轴数据 - var update = '更新时间:' + $rootScope.getNowFormatDate(); + var update = '更新时间: ' + $rootScope.getNowFormatDate(); $scope.pt2.title.subtext = update; $rootScope.bs_load_1(null, $scope.pt2, null, null); } @@ -693,7 +693,7 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic $scope.pt3.series[0].data = data.data; - var update = '更新时间:' + $rootScope.getNowFormatDate(); + var update = '更新时间: ' + $rootScope.getNowFormatDate(); $scope.pt3.title.subtext = update; $rootScope.bs_load_1(null, null, $scope.pt3, null); @@ -714,7 +714,7 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic $scope.pt4.legend.data = temp; // 加载条件注释 $scope.pt4.xAxis[0].data = r_d[0].date; // 加载x轴数据 - var update = '更新时间:' + $rootScope.getNowFormatDate(); + var update = '更新时间: ' + $rootScope.getNowFormatDate(); $scope.pt4.title.subtext = update; $rootScope.bs_load_1(null, null, null, $scope.pt4); } diff --git a/public/js/ctrl/r.ctrl.js b/public/js/ctrl/r.ctrl.js index 0158d23886c9e151aff9c0ca3d903d8c9a228334..0b9ef3446c2dea2d4cffb0dd75d52cbe95d73262 100644 --- a/public/js/ctrl/r.ctrl.js +++ b/public/js/ctrl/r.ctrl.js @@ -211,7 +211,7 @@ wmsCtrl.controller('reservoirCtrl',['$scope','reservoirService','dropDownService } } }]) -.controller('repairBillCtrl',['$scope','repairBillService','dropDownService',function(scope,repairBillService,dropDownService){ //维修单管理 controller +.controller('repairBillCtrl',['$scope','$rootScope','repairBillService','dropDownService',function(scope,rootScope,repairBillService,dropDownService){ //维修单管理 controller /*状态数据*/ scope.dropDownList = { @@ -269,6 +269,7 @@ wmsCtrl.controller('reservoirCtrl',['$scope','reservoirService','dropDownService if(result.success){ scope.repairBillList = result.data.wmsRepairList; + rootScope.repairBillList = result.data.wmsRepairList; if(scope.fristSelect){ scope.Tools.page(document.getElementById('pages'),{ pages : result.data.wmsRepairQueryDTO.totalPage, @@ -300,6 +301,7 @@ wmsCtrl.controller('reservoirCtrl',['$scope','reservoirService','dropDownService //列表 scope.list(); + rootScope.repairBillRefrsh = scope.list; //查询 click scope.searchClick = function(){ @@ -345,53 +347,93 @@ wmsCtrl.controller('reservoirCtrl',['$scope','reservoirService','dropDownService scope.submitRepairBillClick = function(){ var indexArr = scope.Tools.getTableSelectItemIndex('.repairTable'); //获取table所选的下标 - - /*if(indexArr.length == 0){ - scope.Tools.alert('请选择需要提交维修的数据'); - return; + var lg = indexArr.length; + if(lg==0){ + scope.Tools.alert('未选择维修单!'); + } else if(lg>1){ + scope.Tools.alert('请单选！'); + } else if(lg==1) { + scope.Tools.dialog({ + controller : 'repairBillCtrl.dialog', + template : 'templates/maintenanceManagement/repairBill/repair-bill-form.html', + closeByDocument : false, + closeByEscape : false, + data : {}, + width : 350, + title : '提交维修单', + scope : scope + }) } - //获取选中的数据 - var repairBillList = scope.Tools.getDataTOIndex(indexArr,scope.repairBillList); - - for(var i = 0;i < repairBillList.length;i++){ - if(repairBillList[i].rpStatus != scope.constant.repairStatus.unprocessed){ - scope.Tools.alert('只能选择未处理的数据'); - return; + }; + // 打印维修单 + scope.printRepairBill = function(){ + var indexArr = scope.Tools.getTableSelectItemIndex('.repairTable'); //获取table所选的下标 + var id = rootScope.repairBillList[indexArr[0]].rpId; + repairBillService.printRepair({ + rpId:id + }).then(function(res){ + if(res.success){ + // 打开打印页面 + rootScope.rb_print_data = res.data; + scope.Tools.dialog({ + controller : 'printRepairBillCtrl', + template : 'templates/maintenanceManagement/repairBill/printRepairBill.html', + closeByDocument : false, + closeByEscape : false, + data : {}, + width : 350, + title : '打印维修单', + scope : scope + }) + } else { + scope.Tools.alert('获取数据失败！'); } - }*/ - - scope.Tools.dialog({ - controller : 'repairBillCtrl.dialog', - template : 'templates/maintenanceManagement/repairBill/repair-bill-form.html', - closeByDocument : false, - closeByEscape : false, - data : { - }, - width : 350, - title : '提交维修单', - scope : scope }) - - /*scope.Tools.dialogConfirm('确定要提交维修选中的数据吗？') - .then(function(res){ - if(res){ - repairBillService.submitRepair(repairBillList) - .then(function(result){ - if(result.success){ - scope.Tools.alert('提交维修成功'); - scope.list(scope.listParam()); - }else{ - scope.Tools.alert(result.message); - } - }) + } +}]) + .controller('repairBillCtrl.dialog',['$scope','$rootScope','repairBillService','ngDialog',function(scope,rootScope,repairBillService,ngDialog){ //维修单 controller dialog + var indexArr = scope.Tools.getTableSelectItemIndex('.repairTable'); //获取table所选的下标 + var id = rootScope.repairBillList[indexArr[0]].rpId; + scope.submitObj = { + rpId :id , + rpRepairParty:'', + rpEstimatedEndTime:'', + remark:'' + } + scope.isNull = function(obj){ + for(var k in obj){ + if(obj[k]==''){ + return true + } + } + return false + } + scope.saveOrUpdaterepairClick = function(){ + if(scope.isNull(scope.submitObj)){ + scope.Tools.alert('有未填项！') + } else{ + repairBillService.submitRepair(scope.submitObj).then(function(res){ + if(res.success){ + scope.Tools.alert(res.message); + setTimeout(function(){ + ngDialog.closeAll() + },30) + //刷新列表 + rootScope.repairBillRefrsh() + } else { + scope.Tools.alert(res.message); + setTimeout(function(){ + ngDialog.closeAll() + },30) } - })*/ + }) + } } }]) -.controller('repairBillCtrl.dialog',['$scope','repairBillService',function(scope,repairBillService){ //维修单 controller dialog + .controller('printRepairBillCtrl',['$scope','$rootScope','ngDialog',function(scope,rootScope,ngDialog){ -}]) -.controller('roleCtrl',['$scope','roleService','permissionsService',function(scope,roleService,permissionsService){ //角色 ctrl + }]) + .controller('roleCtrl',['$scope','roleService','permissionsService',function(scope,roleService,permissionsService){ //角色 ctrl //更多条件默认值 scope.moreText = scope.constant.moreText.spread; //更多条件 diff --git a/public/js/wms-service.js b/public/js/wms-service.js index dfcf22abb9f48b4d9cc1645daf3784656b0617f2..409574026437c33fdefd9958d6ac35f60ce2a33f 100644 --- a/public/js/wms-service.js +++ b/public/js/wms-service.js @@ -204,6 +204,10 @@ var wmsService = angular.module('wms.services', []) }, submitAfterCheckCopyAndAdd : function(data){ //维修单后检验复制并新增 return httpService.customPOST('wmsRepair/submitAfterCheckCopyAndAdd',data); + }, + printRepair : function(data){ // 打印维修单 + return httpService.customPOST('wmsRepair/printRepair',data) + } } }]) @@ -611,7 +615,7 @@ var wmsService = angular.module('wms.services', []) open : function(channel,open,led1,led2,sound){ //打开闸门 return http({ method : 'POST', - url : 'http://127.0.0.1:8080/Open', + url : 'http://192.168.5.210:8080/Open', headers:{'Content-Type': 'text/plain;charset=UTF-8'}, data : { cmd : 'lpr', diff --git a/public/templates/inStorageManagement/asnManagement/print-car-mentioned-receipt.html b/public/templates/inStorageManagement/asnManagement/print-car-mentioned-receipt.html index a2cd1ad2242ff2674c9eb2bc0be7f42550b69a73..8a893b545cacc754341015e7d2998a3106f4caa4 100644 --- a/public/templates/inStorageManagement/asnManagement/print-car-mentioned-receipt.html +++ b/public/templates/inStorageManagement/asnManagement/print-car-mentioned-receipt.html @@ -20,7 +20,7 @@
车辆入库交接单
- +
diff --git a/public/templates/maintenanceManagement/abnormalManagement/abnormalManagement.html b/public/templates/maintenanceManagement/abnormalManagement/abnormalManagement.html index 82a0db57d16b637a9ad34b28d4b4693573d33e61..d842dc34d1a772577bfb9fd310695131620e891d 100644 --- a/public/templates/maintenanceManagement/abnormalManagement/abnormalManagement.html +++ b/public/templates/maintenanceManagement/abnormalManagement/abnormalManagement.html @@ -4,6 +4,7 @@
@@ -59,7 +60,7 @@ - +
@@ -102,7 +103,7 @@
-
序号
+
- + - - + + diff --git a/public/templates/warehouseManagement/shipmentPlan/shipment-plan-list.html b/public/templates/warehouseManagement/shipmentPlan/shipment-plan-list.html index 93f81dc748c2aa89fcbdd640a0c9490583583e3b..d82996e2b5672bf7e9dfa348c17eb1a26ea5d46a 100644 --- a/public/templates/warehouseManagement/shipmentPlan/shipment-plan-list.html +++ b/public/templates/warehouseManagement/shipmentPlan/shipment-plan-list.html @@ -227,7 +227,7 @@ - + @@ -235,7 +235,7 @@ - +
diff --git a/public/templates/maintenanceManagement/abnormalManagement/dealAbnormal.html b/public/templates/maintenanceManagement/abnormalManagement/dealAbnormal.html index 485d770f2cc27eafb8fa576c533f838993373816..3c9a005b85b4e3c99ca3c4440e539666e71c8e43 100644 --- a/public/templates/maintenanceManagement/abnormalManagement/dealAbnormal.html +++ b/public/templates/maintenanceManagement/abnormalManagement/dealAbnormal.html @@ -9,7 +9,7 @@ - + diff --git a/public/templates/maintenanceManagement/abnormalManagement/printAbm.html b/public/templates/maintenanceManagement/abnormalManagement/printAbm.html new file mode 100644 index 0000000000000000000000000000000000000000..bcd3c5d73e7db1fd06b4f53a233c38ab377eb0d6 --- /dev/null +++ b/public/templates/maintenanceManagement/abnormalManagement/printAbm.html @@ -0,0 +1,32 @@ +
+
中联物流（中国）有限公司
+
异常信息登记表
+
+ + + + + + + + + + + + + + + + + + + +
序号车架号异常类型异常描述异常登记时间责任方签收
{{key+1}}{{abm_main_tableList[item].vin}}{{abm_main_tableList[item].excpType | abnormal_excpType}}{{abm_main_tableList[item].gmtCreate}}
+
+ +
+
+ + +
+
\ No newline at end of file diff --git a/public/templates/maintenanceManagement/repairBill/printRepairBill.html b/public/templates/maintenanceManagement/repairBill/printRepairBill.html new file mode 100644 index 0000000000000000000000000000000000000000..98831c1fc2e7d42acdf57e49b90361ca7a9fae43 --- /dev/null +++ b/public/templates/maintenanceManagement/repairBill/printRepairBill.html @@ -0,0 +1,7 @@ +
+ + + + +
这是将打印的数据
+
\ No newline at end of file diff --git a/public/templates/maintenanceManagement/repairBill/repair-bill-form.html b/public/templates/maintenanceManagement/repairBill/repair-bill-form.html index d26aa3f08ea3363c1fef428588273d252c1f5d96..673320ec952f1cd012db0b930f9d38e95ac9bfeb 100644 --- a/public/templates/maintenanceManagement/repairBill/repair-bill-form.html +++ b/public/templates/maintenanceManagement/repairBill/repair-bill-form.html @@ -4,7 +4,7 @@
维修单位
- +
@@ -12,7 +12,7 @@
维修完成时间
- +
@@ -20,7 +20,7 @@
备注说明
- +
diff --git a/public/templates/maintenanceManagement/repairBill/repair-bill-list.html b/public/templates/maintenanceManagement/repairBill/repair-bill-list.html index 9719263f772b72e94199404484241734b2a2fe70..164db6708ec96a0512392cad01b7a71628c7e080 100644 --- a/public/templates/maintenanceManagement/repairBill/repair-bill-list.html +++ b/public/templates/maintenanceManagement/repairBill/repair-bill-list.html @@ -145,10 +145,10 @@
车型描述 客户运单号 车辆状态完成时间
diff --git a/public/templates/warehouseManagement/warehouseRecord/warehouse-record-list.html b/public/templates/warehouseManagement/warehouseRecord/warehouse-record-list.html index ee2e93b75eb3a6b5c050008a085eade8af0dc840..f5dc00ccab8771b3d4e7b6e6f7ab3f1df37c28fd 100644 --- a/public/templates/warehouseManagement/warehouseRecord/warehouse-record-list.html +++ b/public/templates/warehouseManagement/warehouseRecord/warehouse-record-list.html @@ -97,8 +97,8 @@ - - + + diff --git a/routes/resource/base-config.js b/routes/resource/base-config.js index bafd2932e356fd0e80b47e78780de38b0beaf7ac..1222ca1f45bbc22a17492ad970bec6414c00fef6 100644 --- a/routes/resource/base-config.js +++ b/routes/resource/base-config.js @@ -1,3 +1,3 @@ -/**Created on 2017-11-30*/ +/**Created on 2017-12-07*/ 'use strict'; - module.exports = {"version":"1.0.2","compressed":false,"devView":true,"validate":false,"tmsMap":true,"host":"http://120.77.8.167/wms-extra-web/","ticketUser":{"phone":"11111111111","password":"123456a"}}; \ No newline at end of file + module.exports = {"version":"1.0.2","compressed":false,"devView":true,"validate":false,"tmsMap":true,"host":"http://10.2.7.91:8080/","ticketUser":{"phone":"11111111111","password":"123456a"}}; \ No newline at end of file diff --git a/views/login.ejs b/views/login.ejs index ad20de9eba73ff713d5f9f0976d5f90967377360..b6e675294a3a7d53a3c6f250e4766e15415ce4fd 100644 --- a/views/login.ejs +++ b/views/login.ejs @@ -54,6 +54,7 @@

忘记密码 | 账户申请

+