Index: ssts-web/src/main/webapp/systemmanage/orgUnitExt.js
===================================================================
diff -u -r27321 -r27345
--- ssts-web/src/main/webapp/systemmanage/orgUnitExt.js (.../orgUnitExt.js) (revision 27321)
+++ ssts-web/src/main/webapp/systemmanage/orgUnitExt.js (.../orgUnitExt.js) (revision 27345)
@@ -25,22 +25,22 @@
if(selectLeadersArray == undefined){
return;
- }else if(selectedOrgUnitArray[0] !== undefined){
+ }else if(selectLeadersArray[0] !== undefined){
if(action == 'principal'){//负责人
var userNames = null;
- for(var i = 0 ; i < selectedOrgUnitArray.length ; i++){
- var index = selectedOrgUnitArray[i].indexOf("#*");
+ for(var i = 0 ; i < selectLeadersArray.length ; i++){
+ var index = selectLeadersArray[i].indexOf("#*");
if(index == -1){
if(userNames == null){
- userNames = selectedOrgUnitArray[i];
+ userNames = selectLeadersArray[i];
}else{
- userNames += ';'+selectedOrgUnitArray[i];
+ userNames += ';'+selectLeadersArray[i];
}
}else{
if(userNames == null){
- userNames = selectedOrgUnitArray[i].split('#*')[1];
+ userNames = selectLeadersArray[i].split('#*')[1];
}else{
- userNames += ';'+selectedOrgUnitArray[i].split('#*')[1];
+ userNames += ';'+selectLeadersArray[i].split('#*')[1];
}
}
@@ -49,17 +49,17 @@
}else {
var userIds = null;
var userNames = null;
- for(var i = 0 ; i < selectedOrgUnitArray.length ; i++){
+ for(var i = 0 ; i < selectLeadersArray.length ; i++){
if(userIds == null){
- userIds = selectedOrgUnitArray[i].split('#*')[0];
+ userIds = selectLeadersArray[i].split('#*')[0];
}else{
- userIds += ';'+selectedOrgUnitArray[i].split('#*')[0];
+ userIds += ';'+selectLeadersArray[i].split('#*')[0];
}
if(userNames == null){
- userNames = selectedOrgUnitArray[i].split('#*')[1];
+ userNames = selectLeadersArray[i].split('#*')[1];
}else{
- userNames += ';'+selectedOrgUnitArray[i].split('#*')[1];
+ userNames += ';'+selectLeadersArray[i].split('#*')[1];
}
}
Ext.getCmp(action + "Ids").setValue(userIds) ;
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
===================================================================
diff -u -r27300 -r27345
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js (.../washAndDisinfectView.js) (revision 27300)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js (.../washAndDisinfectView.js) (revision 27345)
@@ -556,9 +556,9 @@
record.set("htmlContent",tableContent);
}
var maxHeight = grid.getInnerHeight();
- var rowEl = Ext4.fly(e.getTarget());// 把target转换成Ext.Element对象
- rowEl.set({
- 'data-qtip' : tableContent,'data-qtitle':' 清洗记录物品列表:'},false);
+
+ e.getTarget().setAttribute('data-qtip', tableContent);
+ e.getTarget().setAttribute('data-qtitle', ' 清洗记录物品列表:');
}
});
}