Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java =================================================================== diff -u -r16108 -r16113 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java (.../MaterialDefinitionManagerImpl.java) (revision 16108) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/service/MaterialDefinitionManagerImpl.java (.../MaterialDefinitionManagerImpl.java) (revision 16113) @@ -249,7 +249,7 @@ String searchMode = AcegiHelper.getLoginUser().getSearchMode(); if (simpleSpell.trim().length() > 0) { simpleSpell = simpleSpell.toUpperCase(); - if (m.find()) { + if (m.find()) { //如果关键字是中文就按照"名称"检索即可 sql += " and po.name like '" + simpleSpell + "%'"; } else { sql += getSelfSearchSQL(searchMode, simpleSpell); Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js =================================================================== diff -u -r15953 -r16113 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 15953) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 16113) @@ -398,6 +398,7 @@ minChars : 0, valueField : 'id', displayField : 'name', + listWidth : 250, store : new Ext.data.Store({ proxy : new Ext.data.HttpProxy({ url : WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!getMaterialDefinitionData.do', @@ -430,13 +431,14 @@ editRecord.data.type = record.data.type; editRecord.data.isImplant = record.data.isImplant; } - },specialKey : function(field,event){ + }, + specialKey : function(field,event){ if(event.getKey()==13 ){ if(isLastRow){//是最后一行,新增空白行 newRow(); } } - } + } } }) }, { Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r16092 -r16113 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 16092) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 16113) @@ -1255,7 +1255,7 @@ autoScroll:true, containerScroll : false, height: 325, - width : 340, + width : 355, title:'灭菌物品列表', frame : false, bodyStyle : 'border:1px solid #afd7af', @@ -2069,15 +2069,15 @@ ] }] },{ - columnWidth : .5, + columnWidth : .46, id : 'sterilizationColumnTree', items : [sterilizationColumnTree] }, { - columnWidth : .5, + columnWidth : .54, items : [ new top.Ext.grid.GridPanel({ id : 'tousseItemCountPanel', height : 325, - width : 341, + width : 385, frame : false, border : true, tbar:[{