Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js =================================================================== diff -u -r30416 -r30419 --- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 30416) +++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 30419) @@ -208,12 +208,16 @@ //器械包状态 queryCondition['tousseStatus'] = ($Id('id_tousseStatus').value == '')?$Id('tousseStatus').value:$Id('id_tousseStatus').value; queryCondition['tousseGroupName'] = $Id('tousseGroupName').value; //器械包分组 - if(preciseQuery == Ext.getCmp('queryMode').getRawValue()){ //器械包名称(根据查询模式设置不同) - queryCondition['tousseName'] = Ext.getCmp('tousseName').getRawValue(); - queryCondition['tousseNameFuzzy'] = ''; - }else{ - queryCondition['tousseNameFuzzy'] = Ext.getCmp('tousseName').getRawValue(); - queryCondition['tousseName'] = ''; + if($Id('id_tousseNameFuzzy').value !== ''){ + queryCondition['tousseNameFuzzy'] = $Id('id_tousseNameFuzzy').value; + }else { + if(preciseQuery == Ext.getCmp('queryMode').getRawValue()){ //器械包名称(根据查询模式设置不同) + queryCondition['tousseName'] = Ext.getCmp('tousseName').getRawValue(); + queryCondition['tousseNameFuzzy'] = ''; + }else{ + queryCondition['tousseNameFuzzy'] = Ext.getCmp('tousseName').getRawValue(); + queryCondition['tousseName'] = ''; + } } queryCondition['sterilizationStart'] = $Id('sterilizationStart').value; //灭菌开始时间 @@ -717,7 +721,7 @@ }else if(dataIndex == 'status'){ $Id('id_tousseStatus').value = value.join(','); }else if(dataIndex == 'tousseDefinition.name'){ - $Id('id_tousseName').value = value; + $Id('id_tousseNameFuzzy').value = value; }else { if($Id('id_'+dataIndex)){ $Id('id_'+dataIndex).value = value; @@ -729,7 +733,7 @@ }else if(dataIndex == 'status'){ $Id('id_tousseStatus').value = ''; }else if(dataIndex == 'tousseDefinition.name'){ - $Id('id_tousseName').value = ''; + $Id('id_tousseNameFuzzy').value = ''; }else { if($Id('id_'+dataIndex)){ $Id('id_'+dataIndex).value = ''; @@ -1373,7 +1377,7 @@ $Id('id_reviewer').value = ""; $Id('id_packageType').value = ""; $Id('id_sterilizationBasket').value = ""; - + $Id('id_tousseNameFuzzy').value = ""; //重置gridFilters的过滤条件 var plugins = grid.plugins; if(plugins instanceof Ext.grid.GridFilters){ @@ -1458,6 +1462,7 @@ return; } var queryCondition = getQueryCondition(); + //console.log(queryCondition);return //表单元素的id前缀 var idPrefix = "id_"; for(var propName in queryCondition){