1

src/main/resources/static/app/business/deliveryStorageNotice/controller/grainDeliveryStorageNoticeSaveCtrl.js

@@ -1,7 +1,7 @@
 angular.module('app.business').controller("grainDeliveryStorageNoticeSaveCtrl",
     function($scope, $http, $filter, $stateParams, $state, $uibModal, $rootScope,agentDepotService,
              deliveryStorageNoticeService, deliveryStorageNoticeAuditService, commonUtilService,
-             storeWareDetailService, enumService, codeRuleService,planService, customerService, contractReceiveService, $location, APP_CONFIG) {
+             storeWareDetailService, enumService, codeRuleService,planService, customerService, contractReceiveService, userRoleService, $location, APP_CONFIG) {
 
         $scope.deliveryStorageNotice = {};
         $scope.billNumber = {};
@@ -51,27 +51,19 @@ angular.module('app.business').controller("grainDeliveryStorageNoticeSaveCtrl",
                     $scope.billNumber.status = "success";
                     $scope.deliveryStorageNotice.billNumber = data.codeValue;
                     
-                    //当审批的人员信息没有设置完全时，则要增加提示
-    				planService.getjybjl($rootScope.userInfo.orgId).then(function(datas){
-    					if(datas==0){ //返回的是数量
+                    //当审批的人员信息没有设置完全时，则要增加提示(检查当前库有没有经营部经理这儿角色)
+                    userRoleService.getjsqx($rootScope.userInfo.orgId, '经营部经理').then(function(datas){
+    					if(datas==0){ //返回的是数量,0就是没有
     						$scope.isNotEdit = true;
    						    //确认框
-   						    var showConfim=document.getElementById("confim");
-   			                showConfim.style.display="block";
+   						    //var showConfim=document.getElementById("confim");
+   						    //showConfim.style.display="block";
+   						    alert("请增加经营部经理这一角色或者给人员赋予经营部经理的角色!");
+   						    $scope.retList();
     					}
     		        },function(datas){
     		            console.log(datas);
     		        });
-    				$scope.define = function () { //确定
-			            	 var showConfim=document.getElementById("confim");
-			                 showConfim.style.display="none";
-			                 $scope.retList();
-			        }  
-			        $scope.cancel = function () {//取消
-			            	var showConfim=document.getElementById("confim");
-			                showConfim.style.display="none";
-			                $scope.retList();
-			        }
                 } else if (data.status == "error") {
                     $scope.billNumber.msg = data.msg;
                     $scope.billNumber.status = "error";

src/main/resources/static/app/system/service/userService.js

@@ -474,5 +474,27 @@ angular.module('app.system').service("userRoleService", function($http, $q, APP_
 		});
 		return d.promise;
 	}
+	
+	/**
+	 * 查找某个单位下是否有谁拥有某个角色
+	 */
+	this.getjsqx = function(orgId, roleName) {
+		var d = $q.defer();
+		$http({
+			method : 'GET',
+			url : APP_CONFIG.systemUrl + '/userRole/getzzbjl',
+			params : {
+				orgId : orgId,
+				roleName : roleName
+			}
+		}).then(function successCallback(response) {
+			// 请求成功执行代码
+			d.resolve(response.data);
+		}, function errorCallback(response) {
+			// 请求失败执行代码
+			d.reject("error");
+		});
+		return d.promise;
+	}
 
 })