diff --git a/public/css/wms.css b/public/css/wms.css index d07bc62f1216e8d0df011b7641017b20a5a40315..2d2fd5bf31f22c50f5549640f269d5f723750d14 100644 --- a/public/css/wms.css +++ b/public/css/wms.css @@ -170,7 +170,7 @@ html,body{ .layui-table tr, td, th, select, option { text-align: center !important; - border: 1px solid #cedce2; + border: 1px solid #d2d2d2; cursor: pointer; } @@ -1149,4 +1149,44 @@ table tr.checkStatus{ height: 48px; box-sizing: border-box; padding: 15px 0 0 15px; +} +#bs_sws_exportExcel{ + color: #fff !important; +} +.abm_image{ + width: 100%; + margin-bottom: 10px; + height: 600px; +} +.abm_image_desc{ + padding: 8px 0; + font-weight: 700; +} +.abm_image_icon{ + position: absolute; + bottom:22px; + right:10px; + cursor:pointer; + font-size: 30px; + color: #de531a; +} +.abm_desc_div{ + display: inline-block; + *display: inline; + *zoom: 1; + width: 180px; + height: 20px; + line-height: 20px; + font-size: 12px; + overflow: hidden; + -ms-text-overflow: ellipsis; + text-overflow: ellipsis; + white-space: nowrap; + color:#de531a; +} +.abm_desc_div:hover{ + height: auto;white-space: normal; +} +.abm_table_icon{ + font-size:12px;float: left;display: inline-block;margin-right: 12px; } \ No newline at end of file diff --git a/public/images/dot.png b/public/images/dot.png new file mode 100644 index 0000000000000000000000000000000000000000..87c96a4340830db6a19de1365cf478a1aef6c8fa Binary files /dev/null and b/public/images/dot.png differ diff --git a/public/js/ctrl/a.ctrl.js b/public/js/ctrl/a.ctrl.js index 80e796d1efc6493ac880eacfe34968c1b5a49fb7..0afaea1ae950ccb1be86c18bc97bb9b4294231f0 100644 --- a/public/js/ctrl/a.ctrl.js +++ b/public/js/ctrl/a.ctrl.js @@ -377,4 +377,183 @@ wmsCtrl.controller('asnCtrl',['$scope','dropDownService','inStorageBillService', } }) } -}]); \ No newline at end of file +}]) +.controller('abnormalManagementCtrl',['$scope','$rootScope','$timeout','ngDialog','abnormalManagementService',function($scope,$rootScope,$timeout,ngDialog,abnormalManagementService){ + + layui.use('form', function(){ + var $ = layui.jquery, form = layui.form(); + + //全选 + form.on('checkbox(allChoose)', function(data){ + var child = $(data.elem).parents('table').find('tbody input[type="checkbox"]'); + child.each(function(index, item){ + item.checked = data.elem.checked; + }); + form.render('checkbox'); + }); + + }); + + // 显示更多条件 + $scope.moreClick = function(){ + $('.otherForm').slideToggle(500); + }; + +// 搜索对象 + $scope.search = { + excpStatus:'', + excpTypeCode:'', + excpType:'', + startGmtCreate:'', + endGmtCreate:'', + dealType:'', + startDealEndTime:'', + endDealEndTime:'' + }; + $scope.resetClick = function(){ + for(var k in $scope.search){ + $scope.search[k] = ''; + } + }; + +// 异常处理 + $scope.dealAbnomal = function(){ + + //判断是否有选择 + var orderidArr = []; + $rootScope.orderidArr =[]; + $rootScope.abm_indexArr = []; + //获取选中的list列表 + $('.wms_abm_table').find('td i').each(function (i, obj) { + if ($(obj).parent().hasClass('layui-form-checked')){ + orderidArr.push($(obj).parents('tr').attr('orderid')); + $rootScope.abm_indexArr.push($(obj).parents('tr').attr('key')); + } + }); + if(orderidArr.length==0) { + $scope.Tools.alert('未选择！'); + }else if( orderidArr.length !=1){ + $scope.Tools.alert('异常处理当前只支持单条操作'); + } else { + $rootScope.abm_imageList = $scope.tableList; + ngDialog.open({ + template: "templates/maintenanceManagement/abnormalManagement/dealAbnormal.html", + controller: "dealAbnormalCtrl", + title: '异常处理', + width:400, + height:400 + }); + } + }; + + //异常关闭 + $scope.updateToClosed = function(){ + //判断是否有选择 + var orderidArr = []; + $rootScope.orderidArr =[]; + $rootScope.abm_indexArr = []; + //获取选中的list列表 + $('.wms_abm_table').find('td i').each(function (i, obj) { + if ($(obj).parent().hasClass('layui-form-checked')){ + orderidArr.push($(obj).parents('tr').attr('orderid')); + $rootScope.abm_indexArr.push($(obj).parents('tr').attr('key')); + } + }); + if(orderidArr.length==0) { + $scope.Tools.alert('未选择！'); + }else if( orderidArr.length !=1){ + $scope.Tools.alert('异常关闭只能单选！'); + } else { + $rootScope.abm_imageList = $scope.tableList; + ngDialog.open({ + template: "templates/maintenanceManagement/abnormalManagement/closeAbnormal.html", + controller: "closeAbnormalCtrl", + title: '异常关闭', + width:380, + height:400 + }); + } + }; + + //查看照片 + $scope.getDetail = function(e){ + var abmImg = { + orderId:$(e.target).parents('tr').attr('orderid'), + excpType:$(e.target).parents('tr').attr('excptype') + }; + abnormalManagementService.getImageList(abmImg).then(function(res){ + if(res.success){ + $rootScope.abm_imageList = res.data; + ngDialog.open({ + template: "templates/maintenanceManagement/abnormalManagement/abm_imageList.html", + controller: "abm_imageListCtrl", + title: '异常图片显示', + width:600, + }); + $timeout(function(){ + $('.ngdialog-content').css('display','table') + },20) + } else { + $scope.Tools.alert(res.message); + } + }); + }; + + $scope.fristSelect = true; + + //刷新列表 + $scope.refreshClick = function(){ + $scope.getList(); + }; + + // 获取列表 + $scope.getList = function(){ + var params = { + pageNo:$scope.pageNo || 1, + pageSize:$scope.pageSize || 10, + }; + params = angular.extend(params,$scope.search); + var index = layer.load(2); + abnormalManagementService.queryExcepList(params) + .then(function(result){ + if(result.success){ + layer.close(index); + $scope.tableList = result.data.dataList; + $rootScope.abm_main_tableList = result.data.dataList; + if($scope.fristSelect){ + $scope.Tools.page(document.getElementById('pages'),{ + pages : result.data.page.totalPage, + curr : result.data.page.pageNo, + count : result.data.page.totalRecord + },function(obj, first){ + $scope.fristSelect = first; //设置状态 + + if(!first){ //判断不是第一次加载 + var param = {}; + param.pageNo = obj.curr; //当前页 + param.pageSize = obj.limit; //最大页 + $scope.pageSize = obj.limit; //设置最大页 + $scope.pageNo = obj.curr; //设置当前页 + $scope.getList(param); + } + }) + } + }else{ + layer.close(index); + $scope.Tools.alert(result.message); + $scope.tableList=[]; + } + }) + }; + $rootScope.abm_getList = $scope.getList; + + $scope.getList(); + +// 异常描述转义 + $scope.change = function(){ + + } +}]) + .controller('abm_imageListCtrl',['$scope','$rootScope',function($scope,$rootScope){ + + }]); \ No newline at end of file diff --git a/public/js/ctrl/b.ctrl.js b/public/js/ctrl/b.ctrl.js index 4c095e68182c1c1f1255611f7a3f8077dfbc96d2..e2bb6b5ea38a9250e18f24ebcbf3a0f845e073ed 100644 --- a/public/js/ctrl/b.ctrl.js +++ b/public/js/ctrl/b.ctrl.js @@ -589,11 +589,6 @@ wmsCtrl.controller('borrowCarRegistrationCtrl',['$scope','Tools','$rootScope','$ }; $scope.getList(); - // 显示更多条件 - $scope.moreClick = function(){ - $('.otherForm').slideToggle(500); - }; - //查询 $scope.rcSearch = function(){ diff --git a/public/js/ctrl/c.ctrl.js b/public/js/ctrl/c.ctrl.js index d50dc8d70c96cf45d36ce938c3ebaf64d6c46093..8ab4ff7bfc50afac8d1be6d31dd8b2214d48316f 100644 --- a/public/js/ctrl/c.ctrl.js +++ b/public/js/ctrl/c.ctrl.js @@ -1,4 +1,33 @@ /** * Created by houjianhui on 2017/7/19. */ -'use strict'; \ No newline at end of file +'use strict'; +wmsCtrl.controller('closeAbnormalCtrl',['$scope','$rootScope','$timeout','ngDialog','abnormalManagementService',function($scope,$rootScope,$timeout,ngDialog,abnormalManagementService,){ + + // 异常关闭 + $scope.abm_desc =''; + $scope.updateToClose = function(){ + var obj = $rootScope.abm_main_tableList[$rootScope.abm_indexArr[0]]; + var temp = { + orderId : obj.orderId, + excpType: obj.excpType, + dealResultDesc: $scope.abm_desc, + excpTypeCode: obj.excpTypeCode + }; + abnormalManagementService.updateToClosed(temp).then(function(res){ + if(res.success){ + $rootScope.abm_getList(); //成功后刷新列表 + ngDialog.closeAll(); + $timeout(function(){ + $scope.Tools.alert(res.message); + },20) + } else { + ngDialog.closeAll(); + layer.open({ + title: '提示' + ,content: res.message + }); + } + }) + } +}]) \ No newline at end of file diff --git a/public/js/ctrl/d.ctrl.js b/public/js/ctrl/d.ctrl.js index 87441894b3b3ca1f27a5666077138cb0cb589357..ed36504c52532b2ff8fd29e800e9f6de3dbbfabe 100644 --- a/public/js/ctrl/d.ctrl.js +++ b/public/js/ctrl/d.ctrl.js @@ -458,4 +458,34 @@ wmsCtrl.controller('distributionCtrl',['$scope','$rootScope','$timeout','$state' $state.go('distribution') },$rootScope.bs_intervalTime*60000) - }]); \ No newline at end of file + }]) + .controller('dealAbnormalCtrl',['$scope','$rootScope','abnormalManagementService','ngDialog',function($scope,$rootScope,abnormalManagementService,ngDialog){ + // 异常处理 + $scope.layer_dealType = ''; + $scope.updateToDeal = function(){ + var obj = $rootScope.abm_imageList[$rootScope.abm_indexArr[0]]; + var temp = { + orderId : obj.orderId, + excpType: obj.excpType, + excpDesc: obj.excpDesc, + dealType: $scope.layer_dealType, + vin: obj.vin, + excpTypeCode: obj.excpTypeCode + }; + abnormalManagementService.updateToDeal(temp).then(function(res){ + if(res.success){ + $rootScope.abm_getList(); //成功后刷新列表 + ngDialog.closeAll(); + setTimeout(function(){ + $scope.Tools.alert(res.message); + },20) + } else { + ngDialog.closeAll(); + layer.open({ + title: '提示' + ,content: res.message + }); + } + }) + } + }]) \ No newline at end of file diff --git a/public/js/ctrl/s.ctrl.js b/public/js/ctrl/s.ctrl.js index 07b44cdb6cae92b8076c43103ff8dc1bef1e2847..b115aa9ed43ccc0c8dd6c661cb869ee45a7c586a 100644 --- a/public/js/ctrl/s.ctrl.js +++ b/public/js/ctrl/s.ctrl.js @@ -1791,4 +1791,155 @@ wmsCtrl.controller('stockUnitCtrl',['$scope','stockUnitService','dropDownService }) } } - }]) \ No newline at end of file + }]) + .controller('searchWaybillStatusCtrl',['$scope','$rootScope','$timeout','searchWaybillStatusService',function($scope,$rootScope,$timeout,searchWaybillStatusService){ + + $scope.moreClick = function(){ // 显示更多条件 + $('.otherForm').slideToggle(500); + }; + // $scope.excelUrl = 'http://10.2.4.76:8090/wms-extra-web/vehicleTracking/importOutExcel?&pageNo=1&pageSize=10&orderno=0171344810&vin=&orderBegin=&orderEnd=&inboundBegin=&inboundEnd=&whCode=UNLCN_XN_CQ&userId=16'; + + + $scope.tableList =[]; + + // 显示更多条件 + $scope.moreClick = function(){ + $('.otherForm').slideToggle(500); + }; + + //搜索对象 + $scope.search ={ + orderno:'', + vin:'', + orderBegin:'', + orderEnd:'', + inboundBegin:'', + inboundEnd:'', + whCode:$scope.userInfo.whCode, + userId:$scope.userInfo.id + }; + $scope.isNull = function(obj){ + for(var k in obj){ + if(obj[k]){ + return true; + } + } + return false; + }; + $scope.fristSelect = true; + + $scope.formatData = function(obj){ + var str ='?'; + for(var k in obj){ + str+='&'+k+'='+obj[k]; + } + return str; + }; + $scope.excelUrl = '#'; + $scope.getData = function(e){ + if($scope.tableList.length >0){ + $scope.excelUrl = contextPath + '/vehicleTracking/importOutExcel'+ $scope.formatData($scope.search); + } else { + e.preventDefault(); + $scope.Tools.alert('没有数据，不能导出表格！'); + } + + }; + + //导出表格 + $scope.importOutExcel = function(){ + var params = { + pageNo:$scope.pageNo || 1, + pageSize:$scope.pageSize || 10 + }; + params =$scope.formatData( angular.extend(params,$scope.search) ); + searchWaybillStatusService.importOutExcel(params).then(function(res){ + + }) + }; + + // 获取列表 + $scope.getList = function(){ + var params = { + pageNo:$scope.pageNo || 1, + pageSize:$scope.pageSize || 10, + }; + params = angular.extend(params,$scope.search); + var index = layer.load(2); + searchWaybillStatusService.getTrackList(params) + .then(function(result){ + if(result.success){ + layer.close(index); + $scope.tableList = result.data; + if($scope.fristSelect){ + $scope.Tools.page(document.getElementById('pages'),{ + pages : result.pageVo.totalPage, + curr : result.pageVo.pageNo, + count : result.pageVo.totalRecord + },function(obj, first){ + $scope.fristSelect = first; //设置状态 + + if(!first){ //判断不是第一次加载 + var param = {}; + param.pageNo = obj.curr; //当前页 + param.pageSize = obj.limit; //最大页 + $scope.pageSize = obj.limit; //设置最大页 + $scope.pageNo = obj.curr; //设置当前页 + $scope.getList(param); + } + }) + } + }else{ + layer.close(index); + $scope.Tools.alert(result.message); + $scope.tableList=[]; + } + }) + }; + + //刷新 + $scope.refreshClick = function(){ + $scope.getList() + }; + + $scope.searchClick = function(){ + if($scope.isNull($scope.search)){ + if($scope.Tools.isRange($scope.search.orderBegin,$scope.search.orderEnd)){ + if($scope.Tools.isRange($scope.search.inboundBegin,$scope.search.inboundEnd)){ + $scope.getList(); + // searchWaybillStatusService.getTrackList($scope.search).then(function (res) { + // if (res.success) { + // $scope.tableList = res.data; + // } + // }) + + } else { + $scope.Tools.alert('入库起始时间必须小于等于入库结束时间！'); + } + } else { + $scope.Tools.alert('下单起始时间必须小于等于下单结束时间！'); + } + + } else { + $scope.Tools.alert('至少输入一个查询条件'); + } + }; + $scope.resetClick = function(){ + $scope.search ={ + orderno:'', + vin:'', + orderBegin:'', + orderEnd:'', + inboundBegin:'', + inboundEnd:'', + whCode:$scope.userInfo.whCode, + userId:$scope.userInfo.id + }; + }; + + // $timeout(function(){ + // $('#bs_sws_exportExcel').ExportExcel('bs_sws_mainTable'); + // },20); + + + }]); \ No newline at end of file diff --git a/public/js/lib/exportExcel/exportExcel.js b/public/js/lib/exportExcel/exportExcel.js new file mode 100644 index 0000000000000000000000000000000000000000..f4b852c9b39b616d7c18d1250db009b61d8227f3 --- /dev/null +++ b/public/js/lib/exportExcel/exportExcel.js @@ -0,0 +1,67 @@ +/** + * 将表格数据导出表格 + */ +(function ($) { + Date.prototype.Format = function (fmt) { + var o = { + "M+": this.getMonth() + 1, //月份 + "d+": this.getDate(), //日 + "h+": this.getHours(), //小时 + "m+": this.getMinutes(), //分 + "s+": this.getSeconds(), //秒 + "q+": Math.floor((this.getMonth() + 3) / 3), //季度 + "S": this.getMilliseconds() //毫秒 + }; + if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length)); + for (var k in o) + if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length))); + return fmt; + } + + $.fn.ExportExcel = function (tab_id, options) { + var defaults = { + // height: '24px', + // 'line-height': '24px', + // margin: '0 5px', + // padding: '0 11px', + // color: '#000', + // background: '#02bafa', + // border: '1px #26bbdb solid', + // 'border-radius': '3px', + // /*color: #fff;*/ + // display: 'inline-block', + // 'text-decoration': 'none', + // 'font-size': '12px', + // outline: 'none', + // cursor: 'pointer' + } + var options = $.extend(defaults, options); + return this.each(function () { + var currentObject = $(this); //获取当前对象 + currentObject.css(defaults); + currentObject.onmouseover = function () { + $(this).css('cursor', 'hand'); + }; + + currentObject.click(function () { + //From:jsfiddle.net/h42y4ke2/16/ + var tab_text = ''; + tab_text = tab_text + ''; + + tab_text = tab_text + 'Test Sheet'; + + tab_text = tab_text + ''; + tab_text = tab_text + ''; + + tab_text = tab_text + ""; + tab_text = tab_text + $('#' + tab_id).html(); + tab_text = tab_text + '
'; + + var data_type = 'data:application/vnd.ms-excel'; + var timeStr = new Date().Format('yyyyMMddhhmmss'); + $(this).attr('href', data_type + ', ' + encodeURIComponent(tab_text)); + $(this).attr('download', '运单状态' + timeStr + '.xls'); + }); + }) + } +})(jQuery); \ No newline at end of file diff --git a/public/js/wms-config.js b/public/js/wms-config.js index e5ce0ce4d1899bac1f8a4c668697ca9dda5fb29f..5c618201dda4e25838b52689909dc13bc130d66c 100644 --- a/public/js/wms-config.js +++ b/public/js/wms-config.js @@ -244,6 +244,8 @@ angular.module('wmsApp', ['ui.router', 'wms.controllers', 'wms.services','wms.fi // 下拉service $rootScope.dropDownService = dropDownService; + $rootScope.contextPath = Settings.Context.path; + //用户信息 $rootScope.userInfo = cookies.getObject('user'); if(!$rootScope.userInfo){ //如果没有登陆信息 返回登陆 @@ -374,6 +376,10 @@ angular.module('wmsApp', ['ui.router', 'wms.controllers', 'wms.services','wms.fi controller : 'repairBillCtrl', url: '/repair-bill', templateUrl: 'templates/maintenanceManagement/repairBill/repair-bill-list.html' + }).state('abnormalManagement', { //异常管理 + controller:'abnormalManagementCtrl', + url :'/abnormalManagement', + templateUrl: 'templates/maintenanceManagement/abnormalManagement/abnormalManagement.html' }).state('warehouse-maintenance', { //仓库维护 controller : 'warehouseMaintenanceCtrl', url: '/warehouse-maintenance', @@ -452,6 +458,11 @@ angular.module('wmsApp', ['ui.router', 'wms.controllers', 'wms.services','wms.fi url: '/drayOutIn', templateUrl: 'templates/bigScreen/drayOutIn.html' }) + .state('searchWaybillStatus',{ //大屏 运单状态查询 + controller:'searchWaybillStatusCtrl', + url:'/searchWaybillStatus', + templateUrl:'templates/bigScreen/searchWaybillStatus.html' + }) $urlRouterProvider.otherwise('index'); diff --git a/public/js/wms-filter.js b/public/js/wms-filter.js index f09f1fadb2245dfbd95a7a7f5320574c104df8e0..0442ecda0b0db3cafd4a7e70d4440580be2da1a0 100644 --- a/public/js/wms-filter.js +++ b/public/js/wms-filter.js @@ -482,4 +482,78 @@ var wmsFilter = angular.module('wms.filter', []) } } }) + .filter('abnormal_excpStatus',function(){ + return function(str){ + if(str =='10'){ + return '未处理' + } else if(str == '20'){ + return '处理中' + } else if(str == '30'){ + return '已关闭' + } + } + }) + .filter('abnormal_excpType',function(){ + return function(str){ + if(str =='10'){ + return '入库异常' + } else if(str == '20'){ + return '出库异常' + } else if(str == '30'){ + return '备料异常' + } + } + }) + .filter('abnormal_dealType',function(){ + return function(str){ + if(str =='10'){ + return '缺件跟进' + } else if(str == '20'){ + return '出库维修' + } else if(str == '30'){ + return '库内维修' + } else if(str == '40'){ + return '缺件跟进，出库维修' + } else if(str == '50'){ + return '缺件跟进，库位修改' + } + } + }).filter('abnormal_excpTypeCode',function(){ + return function(str){ + if(str =='MISS'){ + return '缺件异常' + } else if(str == 'EXCP'){ + return '质损异常' + } else if(str == 'MISS_AND_EXCP'){ + return '缺件，质损异常' + } else if(str == 'LOSS'){ + return '非质损异常' + } else if(str == 'LOSS_AND_EXCP'){ + return '非质损，质损异常' + } else if(str == 'LOSS_AND_MISS'){ + return '非质损，缺件异常' + } else if(str == 'LOSS_EXCP_EXCP'){ + return '非质损，质损，缺件异常' + } + } + }) + .filter('abnormal_excpDesc',function($sce){ + return function(str){ + var temp = ''; + var arr = str.split(','); + for(var i=0;i"; + } + return $sce.trustAsHtml(temp); + } + }) + .filter('isHasIcon',function(){ + return function(str){ + if(str.indexOf(',')==-1){ + return false; + } else { + return true; + } + } + }) diff --git a/public/js/wms-service.js b/public/js/wms-service.js index a9f8b3a0257ab338a7ad90e13b1ca236d13dbb11..85c9405ba89fcdbf639d391d861f678432169b69 100644 --- a/public/js/wms-service.js +++ b/public/js/wms-service.js @@ -4,6 +4,11 @@ 'use strict'; var wmsService = angular.module('wms.services', []) + .constant('Settings', { + Context: { + path: contextPath + } + }) .service('HttpService', ['Restangular','$rootScope', function (restangular,rootScope) { return { @@ -622,3 +627,30 @@ var wmsService = angular.module('wms.services', []) } } }]) + .service('searchWaybillStatusService',['HttpService',function(HttpService){ + return { + getTrackList : function(data){ + return HttpService.customPOST('/vehicleTracking/getTrackList',data) + }, + importOutExcel: function(data){ + // $.get(contextPath+'/vehicleTracking/importOutExcel'+data,function(){}); + return HttpService.customGET('/vehicleTracking/importOutExcel'+data) + } + } + }]) + .service('abnormalManagementService',['HttpService',function(HttpService){ + return{ + queryExcepList : function(data){ + return HttpService.customPOST('/excpManage/queryExcepList',data) + }, + getImageList : function(data){ + return HttpService.customPOST(' /excpManage/getImageList',data) + }, + updateToDeal : function(data){ // 异常处理 + return HttpService.customPOST('/excpManage/updateToDeal',data) + }, + updateToClosed : function(data){ // 异常关闭 + return HttpService.customPOST('/excpManage/updateToClosed',data) + }, + } + }]); diff --git a/public/templates/bigScreen/searchWaybillStatus.html b/public/templates/bigScreen/searchWaybillStatus.html new file mode 100644 index 0000000000000000000000000000000000000000..4c3af563b48c50d99cf66ac67bb3ada531025454 --- /dev/null +++ b/public/templates/bigScreen/searchWaybillStatus.html @@ -0,0 +1,140 @@ +
+
+
+ +
+ + + +
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
底盘号入前置库时间下单时间(SAP备料)调度时间备料出库时间SAP发运时间装车确认时间发运时间承运商司机联系方式运抵时间SAP收车时间经销商
+
+
+
+
+
+ +
+
\ No newline at end of file diff --git a/public/templates/maintenanceManagement/abnormalManagement/abm_imageList.html b/public/templates/maintenanceManagement/abnormalManagement/abm_imageList.html new file mode 100644 index 0000000000000000000000000000000000000000..faeac5ebe8ce1e3002c570de6adce246bad89a35 --- /dev/null +++ b/public/templates/maintenanceManagement/abnormalManagement/abm_imageList.html @@ -0,0 +1,11 @@ +
+ +
\ No newline at end of file diff --git a/public/templates/maintenanceManagement/abnormalManagement/abnormalManagement.html b/public/templates/maintenanceManagement/abnormalManagement/abnormalManagement.html new file mode 100644 index 0000000000000000000000000000000000000000..443a05408e875e204053f7716544966af1e84f86 --- /dev/null +++ b/public/templates/maintenanceManagement/abnormalManagement/abnormalManagement.html @@ -0,0 +1,156 @@ +
+
+
+
    + + +
+
+ + +
+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + 车架号异常分类异常类型异常状态异常描述责任方异常图片异常发生时间处理方式处理结果描述处理完成时间
+ + +
+ + + +    + +
+ 		查看
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/public/templates/maintenanceManagement/abnormalManagement/closeAbnormal.html b/public/templates/maintenanceManagement/abnormalManagement/closeAbnormal.html new file mode 100644 index 0000000000000000000000000000000000000000..4a9586c0f222a260324a5fe1105b0813a7454f92 --- /dev/null +++ b/public/templates/maintenanceManagement/abnormalManagement/closeAbnormal.html @@ -0,0 +1,8 @@ +
+
处理异常描述:  
+ +
+ +
+
+
\ No newline at end of file diff --git a/public/templates/maintenanceManagement/abnormalManagement/dealAbnormal.html b/public/templates/maintenanceManagement/abnormalManagement/dealAbnormal.html new file mode 100644 index 0000000000000000000000000000000000000000..485d770f2cc27eafb8fa576c533f838993373816 --- /dev/null +++ b/public/templates/maintenanceManagement/abnormalManagement/dealAbnormal.html @@ -0,0 +1,22 @@ +
+ +
\ No newline at end of file diff --git a/public/templates/vehicleBorrowingManagement/layer/printHTML.html b/public/templates/vehicleBorrowingManagement/layer/printHTML.html index b85acaf39328f87e57b15c65a17037fdaebd3a3a..649b7b7a280ce846d957aa7f45f1dfb1414e96f0 100644 --- a/public/templates/vehicleBorrowingManagement/layer/printHTML.html +++ b/public/templates/vehicleBorrowingManagement/layer/printHTML.html @@ -32,13 +32,13 @@
- - + + - - + + @@ -46,8 +46,8 @@ - - + +
序  号车架号(VIN码)序  号车架号(VIN码) 物料名称 车型 颜色库区库位
{{key+1}}
@@ -55,11 +55,11 @@
- - + + - +
制单人{{userInfo.name}}制单人{{userInfo.name}} 打印时间 {{currTime}}仓管员(签字)仓管员(签字)
diff --git a/routes/index.js b/routes/index.js index 4ec7d05d81a1357ccb8414742087abcb03310100..6c692748d53ebb4b8e1761199ff9792b3bb76559 100644 --- a/routes/index.js +++ b/routes/index.js @@ -2,11 +2,6 @@ var express = require('express'); var router = express.Router(); var baseConfig = require('./resource/base-config'); -var express = require('express'); -var router = express.Router(); - -var baseConfig = require('./resource/base-config'); -var distributionService = require('./service/distribution-sevice'); var request = require('request'); /* GET home page. */ diff --git a/routes/resource/base-config.js b/routes/resource/base-config.js index f63a2c3c771983e0ad62236d10925d352d33c501..102a92681e456ef8e2f21a2e82089a3e57b1f38c 100644 --- a/routes/resource/base-config.js +++ b/routes/resource/base-config.js @@ -1,3 +1,3 @@ -/**Created on 2017-11-20*/ +/**Created on 2017-11-27*/ 'use strict'; - module.exports = {"version":"1.0.2","compressed":false,"devView":true,"validate":false,"tmsMap":true,"host":"http://120.77.8.167/wms-extra-web/","ticketUser":{"phone":"11111111111","password":"123456a"}}; \ No newline at end of file + module.exports = {"version":"1.0.2","compressed":false,"devView":true,"validate":false,"tmsMap":true,"host":"http://10.2.4.80:8080/ils-wms-extra-web/","ticketUser":{"phone":"11111111111","password":"123456a"}}; \ No newline at end of file diff --git a/sh.exe.stackdump b/sh.exe.stackdump new file mode 100644 index 0000000000000000000000000000000000000000..0dbf1f8f865de45ec699454fdd2136cc9c820da3 --- /dev/null +++ b/sh.exe.stackdump @@ -0,0 +1,20 @@ +Exception: STATUS_ACCESS_VIOLATION at rip=7FF9083DEB78 +rax=00007FF9084EAA68 rbx=0000000000001C8C rcx=00007FF9084EAA68 +rdx=00000000028CCBA8 rsi=00007FF9084E4D90 rdi=00000000028CCBA8 +r8 =0000000000001C8C r9 =0000000000000000 r10=00007FF908439C5A +r11=000000000008B84E r12=0000000000000000 r13=0000000000000000 +r14=0000000000000000 r15=0000000000000000 +rbp=00000000028CCC69 rsp=00000000028CCB30 +program=D:\GIT\Git\usr\bin\sh.exe, pid 7308, thread unknown (0x27DC) +cs=0033 ds=002B es=002B fs=0053 gs=002B ss=002B +Stack trace: +Frame Function Args +000028CCC69 7FF9083DEB78 (7FF908335B80, 00000000000, 00000000000, FFFFFFFFFFFFFFFE) +000028CCC69 7FF9082CA7BB (00000000000, 00000000000, 001800C753E, 00000000000) +000028CCC69 7FF90828D704 (00000000000, 00000000000, 00000000384, 00000000000) +000028CCC69 7FF908335C12 (00000000000, 00000000000, 00000000000, 00000000000) +7FF9084E4D90 0018004590C (00000000000, 00000000000, 00000000000, 00000000000) +00000000000 001800459A4 (00000000000, 00000000000, 00000000000, 00000000000) +00000000000 7FF92BAE2774 (00000000000, 00000000000, 00000000000, 00000000000) +00000000000 7FF92D920D51 (00000000000, 00000000000, 00000000000, 00000000000) +End of stack trace diff --git a/views/index.ejs b/views/index.ejs index f64ca6fa5ca0c226ca3c1d7f901b1eff1ef0910d..f9dedb6455d1cab95e9036a3afc22bb07f9a1c4e 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -118,6 +118,7 @@ + <%if (compressed) { %>