.

src/main/resources/static/app/system/controller/orgCtrl.js

@@ -138,6 +138,7 @@ function($scope, $rootScope, $state, $stateParams, $filter, orgService, enumServ
 	$scope.loadOrg = function() {
 		orgService.editOrg($stateParams.orgId).then(function(data) {
 			$scope.orgInfo = data;
+			$scope.initBasic(319);
 			if (!$stateParams.orgId) {
 				$scope.orgInfo.parentId = $stateParams.parentId;
 				//$scope.orgInfo.registDate = new Date();
@@ -150,7 +151,6 @@ function($scope, $rootScope, $state, $stateParams, $filter, orgService, enumServ
 				$scope.orgInfo.useDate = $filter('date')($scope.orgInfo.useDate, "yyyy-MM-dd");
 				$scope.orgInfo.depotProperty = $scope.orgInfo.depotProperty == null ? "1":$scope.orgInfo.depotProperty;
 			}
-			$scope.initBasic(319);
 		}, function(data) {
 			console.log(data);
 		});
@@ -293,12 +293,14 @@ function($scope, $rootScope, $state, $stateParams, $filter, orgService, enumServ
     
     
 	$scope.save = function() {
-		$scope.grainAttribute = angular.fromJson($scope.orgInfo.depotClass);
-		if ($scope.grainAttribute == '' || $scope.grainAttribute == null || $scope.grainAttribute[0].id == null || $scope.grainAttribute.length == 0) {
-			$("#grainAttribute-error").text("不能为空");
-			return;
-		} else {
-			$("#grainAttribute-error").text("");
+		if ($scope.orgInfo.orgClassId == "5318") {
+			$scope.grainAttribute = angular.fromJson($scope.orgInfo.depotClass);
+			if ($scope.grainAttribute == '' || $scope.grainAttribute == null || $scope.grainAttribute[0].id == null || $scope.grainAttribute.length == 0) {
+				$("#grainAttribute-error").text("不能为空");
+				return;
+			} else {
+				$("#grainAttribute-error").text("");
+			}
 		}
 		if (validator.form()) {
 			// 行政区划