日常检查保管员获取

src/main/resources/static/app/basic/warehouse/service/warehouseService.js

@@ -156,4 +156,25 @@ angular.module('app.basic').service("warehouseService", function($http, $q, $roo
         return d.promise;
     }
 
+    //按条件查询某种货位状态的数据
+    this.getCrkStatusList = function(lylx, crkStatus, orgId) {
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.basicUrl + '/Warehouse/getCrkStatusList',
+            params : {
+            	lylx : lylx,
+                crkStatus : crkStatus,
+                orgId : orgId
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    }
+
 });

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

@@ -123,7 +123,7 @@ angular.module('app.storage')
 
 
     .controller("dailyListAddCtrl", function($scope,$state, $http, $stateParams, StorehouseService, warehouseService,$rootScope, 
-    		dailyService, kcswService, keeperService, productService, $filter, APP_CONFIG) {
+    		dailyService, kcswService, keeperService, productService, commonUtilService, $filter, APP_CONFIG) {
 
         $scope.loadDataById = function(id) {
             dailyService.loadDataById(id).then(function(data){
@@ -166,13 +166,7 @@ angular.module('app.storage')
                 });
 
 				// 通过仓房id 获取保管员姓名
-                if (flag !== 0) {
-                    keeperService.getKeeperNamesByHouseId($scope.dailycheck.houseId).then(function(data){
-                        $scope.dailycheck.bgy = data.keeperNames;
-                    },function(data){
-                        console.log(data);
-                    });
-                }
+                $scope.dailycheck.bgy = commonUtilService.getKeeperNames($scope.dailycheck.houseId);
             } else {
                 // 设置货位号为空.
                 $scope.dailycheck.warehouseId = null;

src/main/resources/static/app/storage/grainCard/controller/grainCarAddCtrl.js

@@ -120,7 +120,7 @@ angular.module('app.storage').controller("grainCarAddCtrl", function ($scope, $s
     }
     // 原粮粮情卡保存
     var validator = $("#grainCarAdd-form").validate();
-    $scope.save = function () {
+    $scope.save = function (flagType) {
         if (validator.form()) {
         	$scope.grainCard.flagType = flagType;
             $scope.grainCard.orgId = $rootScope.orgInfo.orgId; // 组织编码

src/main/resources/static/app/storage/waterCheck/controller/waterCheckCtrl.js

@@ -110,40 +110,34 @@ angular.module('app.storage')
 
         // 修改用户信息
         $scope.edit = function () {
-            if ($stateParams.id !== '') {
-                waterCheckService.edit($stateParams.id).then(function (data) {
-                    $scope.waterCheck = data.storageWaterCheck;
-                    if ($scope.waterCheck.houseId != null && $scope.waterCheck.houseId != "") {
-                        $scope.loadWare($scope.waterCheck.houseId);
-                    }
+            waterCheckService.edit($stateParams.id).then(function (data) {
+                $scope.waterCheck = data.storageWaterCheck;
+                if ($scope.waterCheck.houseId != null && $scope.waterCheck.houseId != "") {
+                    $scope.loadWare($scope.waterCheck.houseId);
+                }
 
-                    $scope.gdd_list = data.storageWarterFixedPoint;
-                    for (var i = 0; i < $scope.gdd_list.length; i++) {
-                        $scope.gdd_list[i].inputTime = $filter('date')($scope.gdd_list[i].inputTime, "yyyy-MM-dd");
-                    }
-                    $scope.jdd_list = data.storageWarterMobilePoint;
-                    for (var i = 0; i < $scope.jdd_list.length; i++) {
-                        $scope.jdd_list[i].inputTime = $filter('date')($scope.jdd_list[i].inputTime, "yyyy-MM-dd");
-                    }
-                    $scope.waterCheck.hyDate = $filter('date')($scope.waterCheck.hyDate, "yyyy-MM-dd");
-                    if ($stateParams.butType == '1') {//查看
-                        $scope.isNotEdit = true;
-                    } else if ($stateParams.butType == '0') {//修改
-                        $scope.isNotEdit_lspz = true;
-                        $scope.waterCheck.commitPeople = $rootScope.userInfo.realName; // 提交人
-                        $scope.waterCheck.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
-                    } else {
-                        // $scope.waterCheck.hyDate = $filter('date')(new Date(), "yyyy-MM-dd");
-                        // $scope.waterCheck.hyPerson = $rootScope.userInfo.realName;
-                    }
-                }, function (data) {
-                    console.log(data);
-                });
-            } else {
-                $scope.waterCheck.commitPeople = $rootScope.userInfo.realName; // 提交人
-                $scope.waterCheck.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
-            }
-        };
+                $scope.gdd_list = data.storageWarterFixedPoint;
+                for (var i = 0; i < $scope.gdd_list.length; i++) {
+                    $scope.gdd_list[i].inputTime = $filter('date')($scope.gdd_list[i].inputTime, "yyyy-MM-dd");
+                }
+                $scope.jdd_list = data.storageWarterMobilePoint;
+                for (var i = 0; i < $scope.jdd_list.length; i++) {
+                    $scope.jdd_list[i].inputTime = $filter('date')($scope.jdd_list[i].inputTime, "yyyy-MM-dd");
+                }
+                if ($stateParams.butType == '1') {//查看
+                    $scope.isNotEdit = true;
+                } else if ($stateParams.butType == '0') {//修改
+                    $scope.isNotEdit_lspz = true;
+                    $scope.waterCheck.commitPeople = $rootScope.userInfo.realName; // 提交人
+                    $scope.waterCheck.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
+                } else {
+                	$scope.waterCheck.commitPeople = $rootScope.userInfo.realName; // 提交人
+                    $scope.waterCheck.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
+                }
+            }, function (data) {
+                console.log(data);
+            });
+        }
         $scope.edit();
 
         // 货位列表