소스 검색

增加判断

gaodd 2 년 전
부모
커밋
a9acce9dcd

+ 8 - 5
src/main/resources/static/app/storage/drug/drugRestore/controller/drugRestoreSaveCtrl.js

@@ -255,11 +255,14 @@ angular.module('app.storage').controller("drugRestoreSaveCtrl", function($scope,
255 255
     $scope.save = function() {
256 256
         if (validator.form()) {
257 257
         	
258
-        	$scope.fumigateStoreList=angular.fromJson($scope.drugRestore.fumigateStore);
259
-            for (var s = 0; s < $scope.fumigateStoreList.length; s++) {
260
-            	fumigateStoreId=fumigateStoreId+$scope.fumigateStoreList[s].id+" ";
261
-            }
262
-            $scope.drugRestore.fumigateStore = angular.copy(fumigateStoreId);
258
+        	if($scope.drugRestore.fumigateStore != null){
259
+        		$scope.fumigateStoreList=angular.fromJson($scope.drugRestore.fumigateStore);
260
+                for (var s = 0; s < $scope.fumigateStoreList.length; s++) {
261
+                	fumigateStoreId=fumigateStoreId+$scope.fumigateStoreList[s].id+" ";
262
+                }
263
+                $scope.drugRestore.fumigateStore = angular.copy(fumigateStoreId);
264
+        	}
265
+        	
263 266
             //归还时间
264 267
             $("input[name='registerTime']").each(function(j,item){
265 268
                 if(item.value != '' && item.value != null && typeof item.value != 'undefined'){

+ 7 - 4
src/main/resources/static/app/storage/drug/drugUse/controller/drugUseSaveCtrl.js

@@ -193,11 +193,14 @@ angular.module('app.storage').controller("drugUseSaveCtrl", function ($scope, $r
193 193
                     }
194 194
                 });
195 195
 
196
-                $scope.fumigateStoreList=angular.fromJson($scope.drugUse.fumigateStore);
197
-                for (var s = 0; s < $scope.fumigateStoreList.length; s++) {
198
-                	fumigateStoreId=fumigateStoreId+$scope.fumigateStoreList[s].id+" ";
196
+                if($scope.drugUse.fumigateStore != null ){
197
+                	$scope.fumigateStoreList=angular.fromJson($scope.drugUse.fumigateStore);
198
+                    for (var s = 0; s < $scope.fumigateStoreList.length; s++) {
199
+                    	fumigateStoreId=fumigateStoreId+$scope.fumigateStoreList[s].id+" ";
200
+                    }
201
+                    $scope.drugUse.fumigateStore = angular.copy(fumigateStoreId);
199 202
                 }
200
-                $scope.drugUse.fumigateStore = angular.copy(fumigateStoreId);
203
+                
201 204
                 
202 205
                 drugUseService.save($scope.drugUse, $scope.details).then(function (data) {
203 206
                     if (data.status == "success") {

+ 6 - 5
src/main/resources/static/app/storage/drug/drugUseApply/controller/drugUseApplySaveCtrl.js

@@ -313,12 +313,13 @@ angular.module('app.storage').controller("drugUseApplySaveCtrl", function($scope
313 313
                         $scope.drugUseApply.useDate = $filter('date')(item.value, "yyyy-MM-dd HH:mm:ss");
314 314
                     }
315 315
                 });
316
-                
317
-                $scope.fumigateStoreList=angular.fromJson($scope.drugUseApply.fumigateStore);
318
-                for (var s = 0; s < $scope.fumigateStoreList.length; s++) {
319
-                	fumigateStoreId=fumigateStoreId+$scope.fumigateStoreList[s].id+" ";
316
+                if($scope.drugUseApply.fumigateStore != null){
317
+                	$scope.fumigateStoreList=angular.fromJson($scope.drugUseApply.fumigateStore);
318
+                    for (var s = 0; s < $scope.fumigateStoreList.length; s++) {
319
+                    	fumigateStoreId=fumigateStoreId+$scope.fumigateStoreList[s].id+" ";
320
+                    }
321
+                    $scope.drugUseApply.fumigateStore = angular.copy(fumigateStoreId);
320 322
                 }
321
-                $scope.drugUseApply.fumigateStore = angular.copy(fumigateStoreId);
322 323
 
323 324
                 drugUseApplyService.save($scope.drugUseApply, $scope.details, $scope.applyUser).then(function(data){
324 325
                     if (data.status === "success") {