Index: ssts-web/src/main/webapp/networkdisk/addFile.jsp =================================================================== diff -u -r29535 -r29551 --- ssts-web/src/main/webapp/networkdisk/addFile.jsp (.../addFile.jsp) (revision 29535) +++ ssts-web/src/main/webapp/networkdisk/addFile.jsp (.../addFile.jsp) (revision 29551) @@ -76,76 +76,16 @@ var arg = {}; var userIdsElement = document.getElementById("readers"); var userNamesElement = document.getElementById("readersForDisplay"); - - arg.userIds = userIdsElement.value; - arg.userNames = userNamesElement.value; - var userIdsArray = arg.userIds.split(";"); - arg.userNamesArray = arg.userNames.split(";"); - var newArr = []; - for(var i=0,k=0;i 0){ - for(var i = 0;i Index: ssts-web/src/main/webapp/systemmanage/orgUnitExt.js =================================================================== diff -u -r29535 -r29551 --- ssts-web/src/main/webapp/systemmanage/orgUnitExt.js (.../orgUnitExt.js) (revision 29535) +++ ssts-web/src/main/webapp/systemmanage/orgUnitExt.js (.../orgUnitExt.js) (revision 29551) @@ -1,124 +1,26 @@ var isNotRepeatCoding = true; var isNotRepeatName = true; //(陈家儒改) var oldName = null; - -function selectePerson(action){ - var userIds = ""; - var userNames = ""; - if(action == 'principal'){ - userIds = ""; - userNames = Ext.getCmp('principal').getValue(); - }else{ - userIds = Ext.getCmp(action + "Ids").getValue(); - userNames = Ext.getCmp(action + "Names").getValue(); - } - - var arg = {}; - arg.userIds = userIds; - arg.userNames = userNames; - - arg.userIdsArray = userIds.split(";"); - arg.userNamesArray = userNames.split(";"); - arg.action = action; - //GGSRMYY-129修改了参数的提交方式 - sessionStorage.setItem('arg',JSON.stringify(arg)); - var selectLeadersArray = openModalWindow(WWWROOT+'/common/selPersonByOrgUnitByExt.jsp', {}, '700', '430'); - - if(selectLeadersArray == undefined){ - return; - }else if(selectLeadersArray[0] !== undefined){ - if(action == 'principal'){//负责人 - var userNames = null; - for(var i = 0 ; i < selectLeadersArray.length ; i++){ - var index = selectLeadersArray[i].indexOf("#*"); - if(index == -1){ - if(userNames == null){ - userNames = selectLeadersArray[i]; - }else{ - userNames += ';'+selectLeadersArray[i]; - } - }else{ - if(userNames == null){ - userNames = selectLeadersArray[i].split('#*')[1]; - }else{ - userNames += ';'+selectLeadersArray[i].split('#*')[1]; - } - } - - } - Ext.getCmp("principal").setValue(userNames); - }else { - var userIds = null; - var userNames = null; - for(var i = 0 ; i < selectLeadersArray.length ; i++){ - if(userIds == null){ - userIds = selectLeadersArray[i].split('#*')[0]; - }else{ - userIds += ';'+selectLeadersArray[i].split('#*')[0]; - } - - if(userNames == null){ - userNames = selectLeadersArray[i].split('#*')[1]; - }else{ - userNames += ';'+selectLeadersArray[i].split('#*')[1]; - } - } - Ext.getCmp(action + "Ids").setValue(userIds) ; - Ext.getCmp(action + "Names").setValue(userNames) ; - } +//打开用户选择界面,GGSRMYY-129问题后,负责人,分管领导,包含用户都用同一个公共的方法去维护 +function changeUser(action){ + var userIdsElement; + var userNamesElement; + if(action == 'includeUsers'){ + userIdsElement = Ext.getCmp("userIds") || top.Ext.getCmp("userIds"); + userNamesElement = Ext.getCmp("userNames") || top.Ext.getCmp("userNames"); + }else if(action == 'leader'){ + userIdsElement = Ext.getCmp(action + "Ids") || top.Ext.getCmp(action + "Ids"); + userNamesElement = Ext.getCmp(action + "Names") || top.Ext.getCmp(action + "Names"); }else { - var loop = setInterval(function() { - if(selectLeadersArray.closed) { - clearInterval(loop); - - var returnValue = selectLeadersArray.returnValue || []; - - if(action == 'principal'){//负责人 - var userNames = null; - if(returnValue.length > 0){ - for(var i = 0 ; i < returnValue.length ; i++){ - var index = returnValue[i].indexOf("#*"); - if(index == -1){ - if(userNames == null){ - userNames = returnValue[i]; - }else{ - userNames += ';'+returnValue[i]; - } - }else{ - if(userNames == null){ - userNames = returnValue[i].split('#*')[1]; - }else{ - userNames += ';'+returnValue[i].split('#*')[1]; - } - } - - } - Ext.getCmp("principal").setValue(userNames); - } - }else { - var userIds = null; - var userNames = null; - if(returnValue.length > 0){ - for(var i = 0 ; i < returnValue.length ; i++){ - if(userIds == null){ - userIds = returnValue[i].split('#*')[0]; - }else{ - userIds += ';'+returnValue[i].split('#*')[0]; - } - - if(userNames == null){ - userNames = returnValue[i].split('#*')[1]; - }else{ - userNames += ';'+returnValue[i].split('#*')[1]; - } - } - Ext.getCmp(action + "Ids").setValue(userIds) ; - Ext.getCmp(action + "Names").setValue(userNames) ; - } - } - } - },500); + userIdsElement = Ext.getCmp("userIds") || top.Ext.getCmp("userIds"); + userNamesElement = Ext.getCmp("principal") || top.Ext.getCmp("principal"); } + var params = { + userIdsElement:userIdsElement, + userNamesElement:userNamesElement, + action:action + } + openSelectUser(params); } Ext.onReady(function(){ Ext.QuickTips.init(); @@ -143,17 +45,17 @@ name: 'parentId' },{ xtype:'hidden', - // fieldLabel: 'userIds', - // xtype: 'textfield', id:'userIds', name: 'userIds' },{ xtype:'hidden', - // fieldLabel: 'leaderIds', - // xtype: 'textfield', id:'leaderIds', name:'leaderIds' },{ + xtype:'hidden', + id:'leaderIds', + name:'leaderIds' + },{ xtype:'hidden', id:'type', name:'type', @@ -176,7 +78,7 @@ name: 'principal', id: 'principal', readOnly:true, - onTriggerClick : function(){selectePerson("principal")}, + onTriggerClick : function(){changeUser("principal")}, triggerClass : 'x-form-search-trigger' },{ fieldLabel: '分管领导', @@ -185,7 +87,7 @@ name: 'leaderNames', id: 'leaderNames', readOnly:true, - onTriggerClick : function(){selectePerson("leader")}, + onTriggerClick : function(){changeUser("leader")}, triggerClass : 'x-form-search-trigger' },{ fieldLabel: '包含用户', @@ -194,7 +96,7 @@ readOnly:true, name: 'userNames', id: 'userNames', - onTriggerClick : function(){openSelectUser()}, + onTriggerClick : function(){changeUser('includeUsers')}, triggerClass : 'x-form-search-trigger' },{ layout:'column',//两列 Index: ssts-web/src/main/webapp/systemmanage/workFlow/workFlowAuthorize/workFlowAuthorizationAuthorizationForm.js =================================================================== diff -u -r29535 -r29551 --- ssts-web/src/main/webapp/systemmanage/workFlow/workFlowAuthorize/workFlowAuthorizationAuthorizationForm.js (.../workFlowAuthorizationAuthorizationForm.js) (revision 29535) +++ ssts-web/src/main/webapp/systemmanage/workFlow/workFlowAuthorize/workFlowAuthorizationAuthorizationForm.js (.../workFlowAuthorizationAuthorizationForm.js) (revision 29551) @@ -253,72 +253,15 @@ * 获得被授权用户 */ function openExt4SelectUser(){ - var userIdsElement; - var userNamesElement; - userIdsElement = top.Ext4.getCmp("authorizedUserIds"); - userNamesElement = top.Ext4.getCmp("authorizedUserNames"); - var arg = {}; - arg.userIds = userIdsElement.getValue(); - arg.userNames = userNamesElement.getValue(); - - arg.userIdsArray = arg.userIds.split(";"); - arg.userNamesArray = arg.userNames.split(";"); - arg.action = 'includeUsers'; - //GGSRMYY-129修改了参数的提交方式 - sessionStorage.setItem('arg',JSON.stringify(arg)); - var selectedUsersArray = openModalWindow(WWWROOT+'/common/selPersonByOrgUnitByExt.jsp', {}, '700', '430'); - var userIds = ''; - var userNames = ''; + var userIdsElement = top.Ext4.getCmp("authorizedUserIds"); + var userNamesElement = top.Ext4.getCmp("authorizedUserNames"); - if(selectedUsersArray == undefined){ - return; - }else if(selectedUsersArray[0] !== undefined){ - for(var i = 0;i 0){ - for(var i = 0;i 0){ + for(var i=0;i 0) { + if (selectedUsersArray && selectedUsersArray.length > 0) { for (var i = 0; i < selectedUsersArray.length; i++) { var userStr = selectedUsersArray[i]; - if (userIds == '') { - userIds = userStr.split('#*')[0]; - } else { - userIds += ';' + userStr.split('#*')[0]; + var name = userStr.split(';')[1]; + var fullName = userStr.split(';')[2]; + if(params.action == 'principal'){ + userNames.push(fullName); + }else if(params.action == 'leader'){ + userIds.push("USERID_" + name); + userNames.push(fullName); + }else { + userIds.push("USERID_" + name); + userNames.push(fullName); } - - if (userNames == '') { - userNames = userStr.split('#*')[1]; - } else { - userNames += ';' + userStr.split('#*')[1]; + } + if(isDom){ + userIdsElement.value = userIds.join(';'); + userNamesElement.value = userNames.join(';'); + }else { + if(params.action !== 'principal'){ + userIdsElement.setValue(userIds.join(';')); } + userNamesElement.setValue(userNames.join(';')); } - - userIdsElement.setValue(userIds); - userNamesElement.setValue(userNames); - }else { - userIdsElement.setValue(''); - userNamesElement.setValue(''); } } else { var loop = setInterval(function() { if (selectedUsersArray.closed) { clearInterval(loop); - var returnValue = selectedUsersArray.returnValue || []; - - if (returnValue.length > 0) { + var returnValue = selectedUsersArray.returnValue; + if (returnValue && returnValue.length > 0) { for (var i = 0; i < returnValue.length; i++) { var userStr = returnValue[i]; - if (userIds == '') { - userIds = userStr.split('#*')[0]; - } else { - userIds += ';' + userStr.split('#*')[0]; + var name = userStr.split(';')[1]; + var fullName = userStr.split(';')[2]; + if(params.action == 'principal'){ + userNames.push(fullName); + }else if(params.action == 'leader'){ + userIds.push("USERID_" + name); + userNames.push(fullName); + }else { + userIds.push("USERID_" + name); + userNames.push(fullName); } - - if (userNames == '') { - userNames = userStr.split('#*')[1]; - } else { - userNames += ';' + userStr.split('#*')[1]; + } + if(isDom){ + userIdsElement.value = userIds.join(';'); + userNamesElement.value = userNames.join(';'); + }else { + if(params.action !== 'principal'){ + userIdsElement.setValue(userIds.join(';')); } + userNamesElement.setValue(userNames.join(';')); } - - userIdsElement.setValue(userIds); - userNamesElement.setValue(userNames); - }else { - userIdsElement.setValue(''); - userNamesElement.setValue(''); + }else if(returnValue && returnValue.length == 0){ + if(isDom){ + userIdsElement.value = ''; + userNamesElement.value = ''; + }else { + if(params.action !== 'principal'){ + userIdsElement.setValue(''); + } + userNamesElement.setValue(''); + } } } }, 500); Index: ssts-web/src/main/webapp/common/orgUnitHelper.js =================================================================== diff -u -r22468 -r29551 --- ssts-web/src/main/webapp/common/orgUnitHelper.js (.../orgUnitHelper.js) (revision 22468) +++ ssts-web/src/main/webapp/common/orgUnitHelper.js (.../orgUnitHelper.js) (revision 29551) @@ -46,17 +46,6 @@ totalProperty: 'totalCount', listeners: { beforeload: function (store, options) { - //读取上次所选的请求参数 - /* var lastOptions = store.lastOptions; - if (lastOptions){ - var orgUnitCode = lastOptions.params.orgUnitCode; - var fullName = lastOptions.params.fullName; - //如果上次的orgUnitCode存在且这次的orgUnitCode为空,则设置orgUnitCode(这种情况是用户进行了翻页) - if (!Ext.isEmpty(orgUnitCode) && Ext.isEmpty(options.params.orgUnitCode)){ - options.params['orgUnitCode'] = orgUnitCode; - } - - }*/ } } } @@ -72,26 +61,12 @@ */ userObj.setReturnResult = function (saveCache, action) { var returnArr = []; - if ('principal' == action) { - for (var pro in saveCache) { - var fullName = saveCache[pro]['fullName']; - returnArr.push(fullName); - } + for (var pro in saveCache) { + var fullName = saveCache[pro]['fullName']; + var id = saveCache[pro]['id']; + var name = saveCache[pro]['name']; + returnArr.push(id+';'+name+';'+fullName); } - else if ('leader' == action) { - for (var pro in saveCache) { - var fullName = saveCache[pro]['fullName']; - var id = saveCache[pro]['id']; - returnArr.push(id + "#*" + fullName); - } - } - else if ('includeUsers' == action) { - for (var pro in saveCache) { - var name = saveCache[pro]['name']; - var fullName = saveCache[pro]['fullName']; - returnArr.push("USERID_" + name + "#*" + fullName); - } - } return returnArr; } @@ -162,48 +137,43 @@ var userNamesArrays = para.userNamesArrays; var userIdsArray = para.userIdsArray; var pageSize = para.pageSize; + var params = {}; //如果是组织人,用名字来查找 if ('principal' == action) { - userStore.load({ - params: {start: 0, limit: pageSize, userNamesArrays: userNamesArrays}, - callback: function (records, option) { - userCacheStore.load({ - params: {start: 0, limit: pageSize, userNamesArrays: userNamesArrays}, - callback: function (userCacheRecords, userCacheOption) { - me.setSaveCache(userCacheRecords, userCacheOption, saveCache); - } - }); - } - }); + params = { + start: 0, + limit: pageSize, + userNamesArrays: userNamesArrays + } } //如果是包含用户,用页面传进来的userIdsArray就是相当于User表中的name,所以用name来查找 else if ('includeUsers' == action) { - userStore.load({ - params: {start: 0, limit: pageSize, names: me.getIds(userIdsArray)}, - callback: function (records, option) { - userCacheStore.load({ - params: {start: 0, limit: pageSize, names: me.getIds(userIdsArray)}, - callback: function (userCacheRecords, userCacheOption) { - me.setSaveCache(userCacheRecords, userCacheOption, saveCache); - } - }); - } - }); + params = { + start: 0, + limit: pageSize, + names: me.getIds(userIdsArray) + } } //如果是分属领导,则用id来查找 else if ('leader' == action) { - userStore.load({ - params: {start: 0, limit: pageSize, userIds: userIdsArray}, - callback: function (records, option) { - userCacheStore.load({ - params: {start: 0, limit: pageSize, userIds: userIdsArray}, - callback: function (userCacheRecords, userCacheOption) { - me.setSaveCache(userCacheRecords, userCacheOption, saveCache); - } - }); - } - }); + params = { + start: 0, + limit: pageSize, + userNamesArrays: userNamesArrays + } } + + userStore.load({ + params: params, + callback: function (records, option) { + userCacheStore.load({ + params:params, + callback: function (userCacheRecords, userCacheOption) { + me.setSaveCache(userCacheRecords, userCacheOption, saveCache); + } + }); + } + }); } /** Index: ssts-web/src/main/webapp/knowledge/viewExt.js =================================================================== diff -u -r29535 -r29551 --- ssts-web/src/main/webapp/knowledge/viewExt.js (.../viewExt.js) (revision 29535) +++ ssts-web/src/main/webapp/knowledge/viewExt.js (.../viewExt.js) (revision 29551) @@ -325,7 +325,7 @@ text : '参与人员', listeners:{ click : function(){ - changeUser(); + changeUser('includeUsers'); } } }] @@ -418,80 +418,18 @@ }) } } -function changeUser(){ - var arg = {}; - var userIdsStrElement = top.Ext.getCmp("userIdsStr"); +function changeUser(action){ var userIdsElement = top.Ext.getCmp("userIds"); var userNamesElement = top.Ext.getCmp("userNames"); - arg.userIds = userIdsStrElement.getValue(); - arg.userNames = userNamesElement.getValue(); - - arg.userIdsArray = arg.userIds.split(";"); - arg.userNamesArray = arg.userNames.split(";"); - arg.action = 'includeUsers'; - //GGSRMYY-129修改了参数的提交方式 - sessionStorage.setItem('arg',JSON.stringify(arg)); - var selectedUsersArray = openModalWindow(WWWROOT+'/common/selPersonByOrgUnitByExt.jsp', {}, '700', '430'); - var userIds = ''; - var userIdsStr = ''; - var userNames = ''; - - if(selectedUsersArray == undefined){ - return; - }else if(selectedUsersArray[0] !== undefined){ - for(var i = 0;i 0){ - for(var i = 0;i