From 3fc6753d10314b544a34340b264884bdb82636fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=96=E4=BB=95=E5=81=A5?= <564208006@qq.com> Date: Tue, 21 Nov 2017 10:56:04 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E9=9C=80?= =?UTF-8?q?=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/w.ctrl.js | 34 ++++++++++++++--- public/js/wms-constant.js | 16 ++++++-- public/js/wms-filter.js | 10 +++++ public/js/wms-service.js | 3 ++ public/js/wms-tools.js | 10 +++++ .../warehouse/warehouse-list.html | 37 ++++++++++++++++++- .../warehouse-record-list.html | 23 ++++++++++++ 7 files changed, 123 insertions(+), 10 deletions(-) diff --git a/public/js/ctrl/w.ctrl.js b/public/js/ctrl/w.ctrl.js index 1d3f61bd..cd63e27d 100644 --- a/public/js/ctrl/w.ctrl.js +++ b/public/js/ctrl/w.ctrl.js @@ -18,14 +18,17 @@ wmsCtrl.controller('warehouseCtrl',['$scope','warehouseService','dropDownService /*状态数据*/ scope.dropDownList = { - status : scope.Tools.dropDown.warehouseDropDown.concat() //出库状态 + status : scope.Tools.dropDown.warehouseDropDown.concat(), //出库状态 + quitTask : scope.Tools.dropDown.quitTaskDropDown.concat() //是否退库 } - scope.dropDownList.status.unshift(scope.constant.defaultDropDownNullData) //插入出库状态数据 + scope.dropDownList.status.unshift(scope.constant.defaultDropDownNullData); //插入出库状态数据 + scope.dropDownList.quitTask.unshift(scope.constant.defaultDropDownNullData); //插入出库状态数据 //设置默认值 scope.dropDownDefault = { - status : scope.dropDownList.status[0] //出库状态 + status : scope.dropDownList.status[0], //出库状态 + quitTask : scope.dropDownList.quitTask[0] //是否退库 } //获取车型 @@ -56,6 +59,18 @@ wmsCtrl.controller('warehouseCtrl',['$scope','warehouseService','dropDownService } }) + //获取司机 + dropDownService.getUserByWarehouse() + .then(function(result){ + if(result.success){ + scope.dropDownList.driver= result.data; + scope.dropDownList.driver.unshift(scope.constant.defaultDropDownNullData); //插入空值 + scope.dropDownDefault.driver = scope.dropDownList.driver[0]; //设置默认值 + }else{ + scope.Tools.alert(result.message); + } + }) + //列表查询接口参数构造 scope.listParam = function(){ @@ -821,8 +836,17 @@ wmsCtrl.controller('warehouseCtrl',['$scope','warehouseService','dropDownService } } - scope.dropDownList = {}; //初始化 下拉对象 - scope.dropDownDefault = {}; //初始化下拉默认对象 + //下拉对象 + scope.dropDownList = { + shipmentStatus : scope.Tools.dropDown.shipmentPlanStatusDropDown.concat() + }; + + scope.dropDownList.shipmentStatus.unshift(scope.constant.defaultDropDownNullData); //插入空值 + //下拉默认值 + scope.dropDownDefault = { + shipmentStatus : scope.dropDownList.shipmentStatus[0] + }; + //获取车型 dropDownService.getVehicleSpec() .then(function(result){ diff --git a/public/js/wms-constant.js b/public/js/wms-constant.js index 561cc7ad..5dc3efb0 100644 --- a/public/js/wms-constant.js +++ b/public/js/wms-constant.js @@ -242,12 +242,12 @@ angular.module('wms.constant',[]) exit : '已退库' }, shipmentPlanStatus : { //发运状态 - untreated : '0', //未处理 - treated : '1' //已处理 + untreated : '0', //未发运 + treated : '1' //已发运 }, shipmentPlanStatusName : { //发运状态 name - untreated : '未处理', - treated : '已处理' + untreated : '未发运', + treated : '已发运' }, userType : { //用户类型 pc : 1, //pc @@ -385,5 +385,13 @@ angular.module('wms.constant',[]) gateController : { //闸门控制 notOpen : 0, //不开闸门 open : 1 //开闸 + }, + quitTask : { //是否退库 + yes : 0, + no : 1 + }, + quitTaskName : { //是否退库 name + yes : '是', + no : '否' } }) \ No newline at end of file diff --git a/public/js/wms-filter.js b/public/js/wms-filter.js index f09f1fad..44e08e51 100644 --- a/public/js/wms-filter.js +++ b/public/js/wms-filter.js @@ -482,4 +482,14 @@ var wmsFilter = angular.module('wms.filter', []) } } }) + .filter('quitTaskFilter',['constant',function(constant){ //是否退库 + return function(input,param){ + if(input == constant.quitTask.yes){ //是 + return constant.quitTaskName.yes; + }else if(input == constant.quitTask.no){ //否 + return constant.quitTaskName.no; + } + return input; + } + }]) diff --git a/public/js/wms-service.js b/public/js/wms-service.js index a9f8b3a0..71c2f078 100644 --- a/public/js/wms-service.js +++ b/public/js/wms-service.js @@ -413,6 +413,9 @@ var wmsService = angular.module('wms.services', []) }, getColorList : function(){ //车型颜色 return httpService.customGET('/baseData/getColorList'); + }, + getUserByWarehouse : function(){ //获取司机 + return httpService.customGET('/sysUser/getUserByWarehouse'); } } }]) diff --git a/public/js/wms-tools.js b/public/js/wms-tools.js index 1ebcd397..3f04cbb8 100644 --- a/public/js/wms-tools.js +++ b/public/js/wms-tools.js @@ -472,6 +472,16 @@ wmsService.service('Tools',['ngDialog','constant','$timeout',function(ngDialog,c name : constant.departureTypeName.errorDeparture, //异常离场 value : constant.departureType.errorDeparture } + ], + quitTaskDropDown : [ //是否退库 + { + name : constant.quitTaskName.yes, //是 + value : constant.quitTask.yes + }, + { + name : constant.quitTaskName.no, //否 + value : constant.quitTask.no + } ] }, modelAssignment : function(valueObj,scope){ //给model赋值 diff --git a/public/templates/warehouseManagement/warehouse/warehouse-list.html b/public/templates/warehouseManagement/warehouse/warehouse-list.html index 6d11d30a..1f2dd6e2 100644 --- a/public/templates/warehouseManagement/warehouse/warehouse-list.html +++ b/public/templates/warehouseManagement/warehouse/warehouse-list.html @@ -4,7 +4,6 @@