From 80822bc4607cbf89375a9f5886d77dde6bbcfafd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=96=E4=BB=95=E5=81=A5?= <564208006@qq.com> Date: Thu, 30 Nov 2017 10:50:57 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warehouseRecord/warehouse-record-list.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/templates/warehouseManagement/warehouseRecord/warehouse-record-list.html b/public/templates/warehouseManagement/warehouseRecord/warehouse-record-list.html index ee2e93b7..f5dc00cc 100644 --- a/public/templates/warehouseManagement/warehouseRecord/warehouse-record-list.html +++ b/public/templates/warehouseManagement/warehouseRecord/warehouse-record-list.html @@ -97,8 +97,8 @@ - - + + -- Gitee From 5911456b95c8a0bada119d29a2b48da7e7788a73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=96=E4=BB=95=E5=81=A5?= <564208006@qq.com> Date: Mon, 4 Dec 2017 11:53:47 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=AE=8C=E6=88=90=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warehouseManagement/shipmentPlan/shipment-plan-list.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/templates/warehouseManagement/shipmentPlan/shipment-plan-list.html b/public/templates/warehouseManagement/shipmentPlan/shipment-plan-list.html index 93f81dc7..d82996e2 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 @@ - + -- Gitee From 8dc142c50f8b66ba4ae8ab06acef4bdd5af65cc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=96=E4=BB=95=E5=81=A5?= <564208006@qq.com> Date: Wed, 6 Dec 2017 10:17:00 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E4=BC=98=E5=8C=96=20asn=E6=89=93?= =?UTF-8?q?=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/wms.css | 4 ++++ .../asnManagement/print-car-mentioned-receipt.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/public/css/wms.css b/public/css/wms.css index faf2250a..97d8162b 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; } diff --git a/public/templates/inStorageManagement/asnManagement/print-car-mentioned-receipt.html b/public/templates/inStorageManagement/asnManagement/print-car-mentioned-receipt.html index a2cd1ad2..8a893b54 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 @@
车辆入库交接单
- +
-- Gitee From e88dbdea7db9c3172b8bb513a8b2c5999ffe8b97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=96=E4=BB=95=E5=81=A5?= <564208006@qq.com> Date: Wed, 6 Dec 2017 17:55:53 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=81=93=E9=97=B8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3ip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/wms-service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/wms-service.js b/public/js/wms-service.js index dfcf22ab..2a050441 100644 --- a/public/js/wms-service.js +++ b/public/js/wms-service.js @@ -611,7 +611,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', -- Gitee From 5bb4bc87368f3fa75737a727354e7a86120f6662 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= <1308369732@qq.com> Date: Thu, 7 Dec 2017 09:12:53 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/r.ctrl.js | 121 ++++++++++++------ public/js/wms-service.js | 4 + .../repairBill/printRepairBill.html | 7 + .../repairBill/repair-bill-form.html | 6 +- routes/resource/base-config.js | 4 +- views/login.ejs | 1 + 6 files changed, 97 insertions(+), 46 deletions(-) create mode 100644 public/templates/maintenanceManagement/repairBill/printRepairBill.html diff --git a/public/js/ctrl/r.ctrl.js b/public/js/ctrl/r.ctrl.js index 0158d238..297f4684 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, @@ -345,53 +346,91 @@ 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) + } 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 dfcf22ab..eb3d7e53 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) + } } }]) diff --git a/public/templates/maintenanceManagement/repairBill/printRepairBill.html b/public/templates/maintenanceManagement/repairBill/printRepairBill.html new file mode 100644 index 00000000..98831c1f --- /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 d26aa3f0..0e5ad35b 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/routes/resource/base-config.js b/routes/resource/base-config.js index bafd2932..a5ca60c1 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-05*/ 'use strict'; - module.exports = {"version":"1.0.2","compressed":false,"devView":true,"validate":false,"tmsMap":true,"host":"http://120.77.8.167/wms-extra-web/","ticketUser":{"phone":"11111111111","password":"123456a"}}; \ No newline at end of file + module.exports = {"version":"1.0.2","compressed":false,"devView":true,"validate":false,"tmsMap":true,"host":"http://10.2.4.76:8080/wms-extra-web/","ticketUser":{"phone":"11111111111","password":"123456a"}}; \ No newline at end of file diff --git a/views/login.ejs b/views/login.ejs index ad20de9e..b6e67529 100644 --- a/views/login.ejs +++ b/views/login.ejs @@ -54,6 +54,7 @@

忘记密码 | 账户申请

+ -- Gitee From 36075a51d2c5714cc88a52228cdfdea93d4fe2d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= <1308369732@qq.com> Date: Thu, 7 Dec 2017 09:35:00 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E6=9C=80=E5=A4=A7=E5=8F=96=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/d.ctrl.js | 28 ++++++++++++++-------------- routes/resource/base-config.js | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/public/js/ctrl/d.ctrl.js b/public/js/ctrl/d.ctrl.js index 502a743e..7e5c9b45 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/routes/resource/base-config.js b/routes/resource/base-config.js index a5ca60c1..f894c2d9 100644 --- a/routes/resource/base-config.js +++ b/routes/resource/base-config.js @@ -1,3 +1,3 @@ -/**Created on 2017-12-05*/ +/**Created on 2017-12-07*/ 'use strict'; - module.exports = {"version":"1.0.2","compressed":false,"devView":true,"validate":false,"tmsMap":true,"host":"http://10.2.4.76:8080/wms-extra-web/","ticketUser":{"phone":"11111111111","password":"123456a"}}; \ No newline at end of file + module.exports = {"version":"1.0.2","compressed":false,"devView":true,"validate":false,"tmsMap":true,"host":"http://120.77.8.167/wms-extra-web/","ticketUser":{"phone":"11111111111","password":"123456a"}}; \ No newline at end of file -- Gitee From 4b2f5a7f37b151e989bd2cb36feecaf8f1eada15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= <1308369732@qq.com> Date: Thu, 7 Dec 2017 11:11:08 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/wms.css | 15 ++++++++ public/js/ctrl/a.ctrl.js | 35 +++++++++++++++++-- public/js/ctrl/p.ctrl.js | 20 +++++------ .../abnormalManagement.html | 3 +- .../abnormalManagement/printAbm.html | 30 ++++++++++++++++ routes/resource/base-config.js | 2 +- 6 files changed, 91 insertions(+), 14 deletions(-) create mode 100644 public/templates/maintenanceManagement/abnormalManagement/printAbm.html diff --git a/public/css/wms.css b/public/css/wms.css index 97d8162b..8ecd202d 100644 --- a/public/css/wms.css +++ b/public/css/wms.css @@ -1194,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 3e3634ce..e44c0282 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/p.ctrl.js b/public/js/ctrl/p.ctrl.js index 6e6675af..a4336926 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,7 +555,7 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic itemStyle: { normal: { label: { - show: true, + show: true } } } @@ -569,7 +569,7 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic itemStyle: { normal: { label: { - show: true, + 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/templates/maintenanceManagement/abnormalManagement/abnormalManagement.html b/public/templates/maintenanceManagement/abnormalManagement/abnormalManagement.html index 82a0db57..63e45a7f 100644 --- a/public/templates/maintenanceManagement/abnormalManagement/abnormalManagement.html +++ b/public/templates/maintenanceManagement/abnormalManagement/abnormalManagement.html @@ -4,6 +4,7 @@
@@ -102,7 +103,7 @@
- +
+ @@ -18,6 +19,7 @@ +
diff --git a/public/templates/maintenanceManagement/abnormalManagement/printAbm.html b/public/templates/maintenanceManagement/abnormalManagement/printAbm.html new file mode 100644 index 00000000..23451da5 --- /dev/null +++ b/public/templates/maintenanceManagement/abnormalManagement/printAbm.html @@ -0,0 +1,30 @@ +
+
中联物流（中国）有限公司
+
异常信息登记表
+
+ + + + + + + + + + + + + + + + + +
序号车架号异常类型异常描述异常登记时间签收
{{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/routes/resource/base-config.js b/routes/resource/base-config.js index f894c2d9..584a3f9f 100644 --- a/routes/resource/base-config.js +++ b/routes/resource/base-config.js @@ -1,3 +1,3 @@ /**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.20.30.111/wms-extra-web/","ticketUser":{"phone":"11111111111","password":"123456a"}}; \ No newline at end of file -- Gitee From 785fa8679aefade832f755debf788ac768261353 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= <1308369732@qq.com> Date: Thu, 7 Dec 2017 11:29:00 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B4=A3=E4=BB=BB=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../maintenanceManagement/abnormalManagement/printAbm.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/templates/maintenanceManagement/abnormalManagement/printAbm.html b/public/templates/maintenanceManagement/abnormalManagement/printAbm.html index 23451da5..bcd3c5d7 100644 --- a/public/templates/maintenanceManagement/abnormalManagement/printAbm.html +++ b/public/templates/maintenanceManagement/abnormalManagement/printAbm.html @@ -9,6 +9,7 @@ 		异常类型 异常描述 异常登记时间责任方 签收
{{abm_main_tableList[item].gmtCreate}}
-- Gitee From 92c470171e4b18a19dcbb8bd5c30e296626f9405 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= <1308369732@qq.com> Date: Thu, 7 Dec 2017 11:44:55 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=AE=A1=E7=90=86--?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=96=B9=E5=BC=8F=E4=B8=8B=E6=8B=89=E6=A1=86?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../abnormalManagement/abnormalManagement.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/templates/maintenanceManagement/abnormalManagement/abnormalManagement.html b/public/templates/maintenanceManagement/abnormalManagement/abnormalManagement.html index 63e45a7f..d842dc34 100644 --- a/public/templates/maintenanceManagement/abnormalManagement/abnormalManagement.html +++ b/public/templates/maintenanceManagement/abnormalManagement/abnormalManagement.html @@ -60,7 +60,7 @@ - + -- Gitee From 2786e4dbcd045a635de1d7678bd9573f2516df51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= <1308369732@qq.com> Date: Thu, 7 Dec 2017 14:54:09 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E8=A1=A5=E5=85=A8=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=8D=95=E7=9B=B8=E5=85=B3=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../maintenanceManagement/repairBill/repair-bill-list.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/templates/maintenanceManagement/repairBill/repair-bill-list.html b/public/templates/maintenanceManagement/repairBill/repair-bill-list.html index 9719263f..164db670 100644 --- a/public/templates/maintenanceManagement/repairBill/repair-bill-list.html +++ b/public/templates/maintenanceManagement/repairBill/repair-bill-list.html @@ -145,10 +145,10 @@ - + - - + + -- Gitee From 07bc9417f9ab84d4c3f4584c175bf6fb11dbc71e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= <1308369732@qq.com> Date: Thu, 7 Dec 2017 16:14:23 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/p.ctrl.js | 28 +++++++++---------- public/js/ctrl/r.ctrl.js | 3 ++ .../abnormalManagement/dealAbnormal.html | 2 +- routes/resource/base-config.js | 2 +- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/public/js/ctrl/p.ctrl.js b/public/js/ctrl/p.ctrl.js index a4336926..3e7b478d 100644 --- a/public/js/ctrl/p.ctrl.js +++ b/public/js/ctrl/p.ctrl.js @@ -560,20 +560,20 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic } } }, - { - 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 + // } + // } + // } + // } ] }; diff --git a/public/js/ctrl/r.ctrl.js b/public/js/ctrl/r.ctrl.js index 297f4684..0b9ef344 100644 --- a/public/js/ctrl/r.ctrl.js +++ b/public/js/ctrl/r.ctrl.js @@ -301,6 +301,7 @@ wmsCtrl.controller('reservoirCtrl',['$scope','reservoirService','dropDownService //列表 scope.list(); + rootScope.repairBillRefrsh = scope.list; //查询 click scope.searchClick = function(){ @@ -417,6 +418,8 @@ wmsCtrl.controller('reservoirCtrl',['$scope','reservoirService','dropDownService setTimeout(function(){ ngDialog.closeAll() },30) + //刷新列表 + rootScope.repairBillRefrsh() } else { scope.Tools.alert(res.message); setTimeout(function(){ diff --git a/public/templates/maintenanceManagement/abnormalManagement/dealAbnormal.html b/public/templates/maintenanceManagement/abnormalManagement/dealAbnormal.html index 485d770f..3c9a005b 100644 --- a/public/templates/maintenanceManagement/abnormalManagement/dealAbnormal.html +++ b/public/templates/maintenanceManagement/abnormalManagement/dealAbnormal.html @@ -9,7 +9,7 @@ - + diff --git a/routes/resource/base-config.js b/routes/resource/base-config.js index 584a3f9f..1222ca1f 100644 --- a/routes/resource/base-config.js +++ b/routes/resource/base-config.js @@ -1,3 +1,3 @@ /**Created on 2017-12-07*/ 'use strict'; - module.exports = {"version":"1.0.2","compressed":false,"devView":true,"validate":false,"tmsMap":true,"host":"http://10.20.30.111/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 -- Gitee From 4e663d1f177acc4a91a8f97e9a534159e755ecf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= <1308369732@qq.com> Date: Thu, 7 Dec 2017 17:25:29 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E5=8D=95=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=80=89=E6=8B=A9=E5=8D=81=E5=88=86=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../maintenanceManagement/repairBill/repair-bill-form.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/templates/maintenanceManagement/repairBill/repair-bill-form.html b/public/templates/maintenanceManagement/repairBill/repair-bill-form.html index 0e5ad35b..673320ec 100644 --- a/public/templates/maintenanceManagement/repairBill/repair-bill-form.html +++ b/public/templates/maintenanceManagement/repairBill/repair-bill-form.html @@ -12,7 +12,7 @@
维修完成时间
- +
-- Gitee From 89940ac59278b79d84dbe9680dd59970721dca58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= <1308369732@qq.com> Date: Fri, 8 Dec 2017 10:42:24 +0800 Subject: [PATCH 13/16] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E7=AE=A1=E7=90=86=E4=B8=AD=20=E6=8C=89=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/i.ctrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/ctrl/i.ctrl.js b/public/js/ctrl/i.ctrl.js index 5fcdc29e..cd699fcb 100644 --- a/public/js/ctrl/i.ctrl.js +++ b/public/js/ctrl/i.ctrl.js @@ -1256,7 +1256,7 @@ wmsCtrl.controller('inStorageBillCtrl',['$scope','inStorageBillService','dropDow } if(scope.otherForm){ //展开了更多 - scope.search.invWhName = scope.dropDownDefault.warehouse.whName; //仓库 + // scope.search.invWhName = scope.dropDownDefault.warehouse.whName; //仓库 scope.search.invVehicleSpecName = scope.dropDownDefault.vehicleSpec.name; //车型 scope.search.invCustomerName = scope.dropDownDefault.shipper.customerId ? scope.dropDownDefault.shipper.customerId.name : ''; //货主 return scope.search; -- Gitee From 6c59805ade53a0514bbf5fec59b650def14566b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= <1308369732@qq.com> Date: Fri, 8 Dec 2017 14:40:58 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=E5=87=BA=E5=BA=93=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=A4=87=E6=96=99?= =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E5=8A=A0=E8=BD=BD=E6=97=B6=EF=BC=8C=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E4=B8=BA=E7=A9=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/w.ctrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/ctrl/w.ctrl.js b/public/js/ctrl/w.ctrl.js index c5a2e3ec..521692ce 100644 --- a/public/js/ctrl/w.ctrl.js +++ b/public/js/ctrl/w.ctrl.js @@ -88,7 +88,7 @@ wmsCtrl.controller('warehouseCtrl',['$scope','warehouseService','dropDownService scope.search.otStatus = scope.dropDownDefault.status.value; //出库状态 scope.search.otVehicleSpecName = scope.dropDownDefault.vehicleSpec.name; //车型 scope.search.otEstimateLane = scope.dropDownDefaults.otEstimateLane.elName; //装车道 - scope.search.otDriver = scope.dropDownDefault.driver.id; //备料司机id + scope.search.otDriver = scope.dropDownDefault.driver?scope.dropDownDefault.driver.id:''; //备料司机id scope.search.otQuitFlag = scope.dropDownDefault.quitTask.value; //是否退库 return scope.search; }else{ //没有展开 -- Gitee From f067e358ee4ce95aa584c07fb3e74aa78f9037cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= <1308369732@qq.com> Date: Fri, 8 Dec 2017 14:58:33 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E6=AF=94=E7=8E=87=E7=BA=BF=E9=A2=9C=E8=89=B2=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/d.ctrl.js | 2 +- public/js/ctrl/p.ctrl.js | 21 +++++++++------------ 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/public/js/ctrl/d.ctrl.js b/public/js/ctrl/d.ctrl.js index 7e5c9b45..aa769256 100644 --- a/public/js/ctrl/d.ctrl.js +++ b/public/js/ctrl/d.ctrl.js @@ -32,7 +32,7 @@ wmsCtrl.controller('distributionCtrl',['$scope','$rootScope','$timeout','$state' saveAsImage: {show: true} } }, - color: ['#5086d6', '#f67c2b', '#a5a5a5'], + color: ['#5086d6', '#f67c2b', '#a5a5a5','#ffc000'], legend: { bottom: 10, left: 'center', diff --git a/public/js/ctrl/p.ctrl.js b/public/js/ctrl/p.ctrl.js index 3e7b478d..f42e7a29 100644 --- a/public/js/ctrl/p.ctrl.js +++ b/public/js/ctrl/p.ctrl.js @@ -9,7 +9,7 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic title: { x: 'center', text: '提车推移图', - subtext:'更新时间：2017-11-15 10:28:34', + subtext:'', textStyle: { color: '#fff', fontSize: '30' @@ -33,7 +33,7 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic saveAsImage: {show: true} } }, - color: ['#5086d6', '#f67c2b', '#a5a5a5'], + color: ['#5086d6', '#f67c2b', '#a5a5a5','#ffc000'], legend: { bottom: 10, left: 'center', @@ -109,7 +109,7 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic itemStyle: { normal: { label: { - show: true, + show: true } } } @@ -122,7 +122,7 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic itemStyle: { normal: { label: { - show: true, + show: true } } } @@ -135,7 +135,7 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic itemStyle: { normal: { label: { - show: true, + show: true } } } @@ -188,7 +188,7 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic saveAsImage: {show: true} } }, - color: ['#5086d6', '#f67c2b', '#a5a5a5'], + color: ['#5086d6', '#f67c2b', '#a5a5a5','#ffc000'], legend: { bottom: 10, left: 'center', @@ -436,7 +436,7 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic // } }, {value: 0, name: '管控'}, - {value: 0, name: '暂运'}, + {value: 0, name: '暂运'} ], itemStyle: { emphasis: { @@ -528,7 +528,7 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic itemStyle: { normal: { label: { - show: true, + show: true } } } @@ -584,9 +584,6 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic var $_bWidth = $('#bs_pc_tb1').width(); var $_bHeight = $('#bs_pc_tb1').height(); - console.log('加载了一次....'); - console.log('part的大小-->width:' + bWidth + ',height:' + bHeight); - var canvasBox = document.getElementsByClassName('bs_pc_canvasBox'); for (var i = 0; i < canvasBox.length; i++) { @@ -649,7 +646,7 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic $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.bs_load_1($scope.pt1, null, null, null); } -- Gitee From ca13a4b428d60612ce5aa3677671b30c8ec9bace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= <1308369732@qq.com> Date: Fri, 8 Dec 2017 15:31:44 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=20=20=E8=BF=90?= =?UTF-8?q?=E8=BE=93=E6=A8=A1=E5=BC=8F=E6=8E=A8=E7=A7=BB=E5=9B=BE=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/p.ctrl.js | 75 +++++++++------------------------------- 1 file changed, 17 insertions(+), 58 deletions(-) diff --git a/public/js/ctrl/p.ctrl.js b/public/js/ctrl/p.ctrl.js index f42e7a29..1c151a1a 100644 --- a/public/js/ctrl/p.ctrl.js +++ b/public/js/ctrl/p.ctrl.js @@ -519,62 +519,7 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic } } ], - series: [ - { - name: '', - type: 'bar', - stack: 'transport', - data: [0, 0, 0, 0, 0, 0, 0], - itemStyle: { - normal: { - label: { - show: true - } - } - } - }, - { - name: '', - type: 'bar', - 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 - } - } - } - }, - // { - // name: '', - // type: 'bar', - // // barWidth : 5, - // stack: 'transport', - // data: [0, 0, 0, 0, 0, 0, 0], - // itemStyle: { - // normal: { - // label: { - // show: true - // } - // } - // } - // } - ] + series: [] }; $rootScope.bs_load_1 = function(a,b,c,d){ @@ -704,8 +649,22 @@ wmsCtrl.controller('pickCarCtrl',['$scope','$rootScope','$timeout','$state','pic var pt_D = $scope.pt4.series; var temp = []; for (var i = 0; i < r_d.length; i++) { - pt_D[i].data = r_d[i].data; - pt_D[i].name = r_d[i].name; // 加载柱状图 + var obj = { + name: '', + type: 'bar', + stack: 'transport', + data: [0, 0, 0, 0, 0, 0, 0], + itemStyle: { + normal: { + label: { + show: true + } + } + } + }; + obj.data = r_d[i].data; + obj.name = r_d[i].name; // 加载柱状图 + pt_D.push(obj); temp.push(r_d[i].name); } $scope.pt4.legend.data = temp; // 加载条件注释 -- Gitee