保管员获取变更

src/main/resources/static/app/business/commonUtilService.js

@@ -1,6 +1,6 @@
 "use strict";
 
-angular.module('app.business').service("commonUtilService", function($http, $q, APP_CONFIG) {
+angular.module('app.business').service("commonUtilService", function($http, $q, $rootScope, APP_CONFIG) {
     /*---------------js 两个数加 ------------------------------*/
     this.accAdd = function(arg1, arg2) {
         if (arg1 == '' || arg1 == null || arg1 == undefined) {
@@ -261,4 +261,22 @@ angular.module('app.business').service("commonUtilService", function($http, $q,
     	}
     	return v;
     }
+
+    /**
+     * 获取仓房或油罐的保管员
+     */
+    this.getKeeperNames = function(houseId) {
+    	var keeperNames;
+    	var datatype = $rootScope.storehouseObj[houseId].datatype;
+    	if (datatype == "0") {
+    		keeperNames = $rootScope.storehouseObj[houseId].dutystoreman;
+    	} else if (datatype == "1") {
+    		keeperNames = $rootScope.tankObj[houseId].keeperNames;
+    	} else {
+    		keeperNames = null;
+    		console.log("无法区分数据是油罐还是仓房");
+    	}
+    	return keeperNames
+    }
+	
 })

src/main/resources/static/app/storage/controller/keepAccount/keepDetailedAccountCtrl.js

@@ -196,7 +196,7 @@ angular.module('app.storage').controller("keepDetailedAccountCtrl",
 	};
 	
 })//记账凭证详情(跟保管明细账记账同一个页面)
-.controller('keepDetailedAccountEditCtrl', function($scope, $state, $stateParams, $rootScope, $filter, keeperService, keepVoucherService) {
+.controller('keepDetailedAccountEditCtrl', function($scope, $state, $stateParams, $rootScope, $filter, keeperService, keepVoucherService, commonUtilService) {
 
 	/*----初始化页面数据------start----*/
 	/**
@@ -247,12 +247,7 @@ angular.module('app.storage').controller("keepDetailedAccountCtrl",
 			$scope.accountInfo.rcfs = "机械方式";
 			$scope.accountInfo.jzr = $rootScope.userInfo.realName; //记账人
 			$scope.accountInfo.jzsj = $filter('date')(new Date(), "yyyy-MM-dd"); //记账时间
-			//通过仓房ID带出的保管员
-			keeperService.getKeeperNamesByHouseId($scope.accountObj.ch).then(function (data) {
-				$scope.accountInfo.bgy = data.keeperNames;
-			}, function (data) {
-				console.log(data);
-			});
+			$scope.accountInfo.bgy = commonUtilService.getKeeperNames($scope.accountInfo.ch);
 		}, function (data) {
 			console.log(data);
 		});

src/main/resources/static/app/storage/controller/qualitycheckAssayCtrl.js

@@ -555,9 +555,7 @@ angular.module('app.storage')
                         console.log(data);
                     });
 
-                    if (type != 0) {
-                    	$scope.findKeeperNames();
-                    }
+                    $scope.qualitycheck.keeper = commonUtilService.getKeeperNames($scope.qualitycheck.houseId);
                 }
             } else {
                 // 设置货位号为空.

src/main/resources/static/app/storage/controller/qualitycheckCtrl.js

@@ -650,18 +650,7 @@ angular.module('app.storage')
                         console.log(data);
                     });
 
-                    var datatype = $rootScope.storehouseObj[$scope.qualitycheck.houseId].datatype;
-                	var keeperNames = null;
-                	if (datatype == "0") {
-                		keeperNames = $rootScope.storehouseObj[$scope.qualitycheck.houseId].dutystoreman;
-                	} else if (datatype == "1") {
-                		keeperNames = $rootScope.tankObj[$scope.qualitycheck.houseId].keeperNames;
-                	}
-                	if (keeperNames != null && keeperNames != "") {
-                		$scope.qualitycheck.keeper = keeperNames;
-                	} else {
-                		$scope.qualitycheck.keeper = null;
-                	}
+                	$scope.qualitycheck.keeper = commonUtilService.getKeeperNames($scope.qualitycheck.houseId);
                 }
             } else {
                 // 设置货位号为空.

src/main/resources/static/app/storage/controller/qualitycheckSampleCtrl.js

@@ -137,18 +137,7 @@ angular.module('app.storage')
                 $scope.qualitycheck.levelUpdate = null; //粮油等级
             }
             if ($scope.qualitycheck.houseId != null && $scope.qualitycheck.houseId != undefined && $scope.qualitycheck.houseId != '') {
-                var datatype = $rootScope.storehouseObj[$scope.qualitycheck.houseId].datatype;
-                var keeperNames = null;
-                if (datatype == "0") {
-                    keeperNames = $rootScope.storehouseObj[$scope.qualitycheck.houseId].dutystoreman;
-                } else if (datatype == "1") {
-                    keeperNames = $rootScope.tankObj[$scope.qualitycheck.houseId].keeperNames;
-                }
-                if (keeperNames != null && keeperNames != "") {
-                    $scope.qualitycheck.keeper = keeperNames;
-                } else {
-                    $scope.qualitycheck.keeper = null;
-                }
+                $scope.qualitycheck.keeper = commonUtilService.getKeeperNames($scope.qualitycheck.houseId);
                 warehouseService.getStorehouse($rootScope.orgInfo.orgId, $scope.qualitycheck.houseId, "0").then(function (data) {
                     if (data.wareList.length > 0) {
                         $scope.warehouseList = data.wareList;  //下拉列表数据