Index: ssts-web/src/main/webapp/systemmanage/orgUnitExtView.js =================================================================== diff -u -r26853 -r27303 --- ssts-web/src/main/webapp/systemmanage/orgUnitExtView.js (.../orgUnitExtView.js) (revision 26853) +++ ssts-web/src/main/webapp/systemmanage/orgUnitExtView.js (.../orgUnitExtView.js) (revision 27303) @@ -95,17 +95,29 @@ return ; } - var destinationOrgUnitKeyIdArray = openModalWindow(WWWROOT + '/common/selOrgUnit.jsp?onlyOneOrg=yes', '选择部门', '800', '400'); - if(destinationOrgUnitKeyIdArray==null||!destinationOrgUnitKeyIdArray.length>1){ - return ; + var destinationOrgUnitKeyIdArray = openModalWindowForExt(WWWROOT + '/common/selOrgUnit.jsp?onlyOneOrg=yes','', '选择部门', '800', '400'); + + if(destinationOrgUnitKeyIdArray == undefined){ + return; + }else { + var loop = setInterval(function() { + console.log(destinationOrgUnitKeyIdArray.hidden) + if(destinationOrgUnitKeyIdArray.hidden) { + clearInterval(loop); + + var returnValue = destinationOrgUnitKeyIdArray.returnValue || []; + console.log(returnValue) + if(returnValue.length > 0){ + var destinationOrgUnitKeyId = returnValue[0]; + if(sourceOrgUnitKeyId==destinationOrgUnitKeyId){ + alert("源组织不能与目标组织相同"); + return ; + } + OrgUnitTableManager.moveOrgUnitByKeyIds(sourceOrgUnitKeyId,destinationOrgUnitKeyId,function(){reloadTreeAndTable();}); + } + } + },500); } - - var destinationOrgUnitKeyId = destinationOrgUnitKeyIdArray[0]; - if(sourceOrgUnitKeyId==destinationOrgUnitKeyId){ - alert("源组织不能与目标组织相同"); - return ; - } - OrgUnitTableManager.moveOrgUnitByKeyIds(sourceOrgUnitKeyId,destinationOrgUnitKeyId,function(){reloadTreeAndTable();}); } function moveUp(id){