Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/basketMonitor/sterileBasketMonitorView.js =================================================================== diff -u -r22787 -r29412 --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/basketMonitor/sterileBasketMonitorView.js (.../sterileBasketMonitorView.js) (revision 22787) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/basketMonitor/sterileBasketMonitorView.js (.../sterileBasketMonitorView.js) (revision 29412) @@ -11,10 +11,10 @@ function isDetermineKey(){ - var searchKeyWord = Ext4.getCmp('searchKeyWord').getValue(); var searchKeyWordReg = /(\d){9}/; - + search(); + if (searchKeyWord.length == 9 && searchKeyWordReg.test(searchKeyWord)) { //执行扫条码 Ext4.Ajax.request({ url : WWWROOT + '/disinfectSystem/baseData/containerAction!checkBarcode.do', @@ -25,10 +25,6 @@ var result = Ext4.decode(response.responseText); if (result) { if (result.success) { - basketStore.proxy.extraParams.basketDarcode = searchKeyWord; - basketStore.reload(); - basketStore.proxy.extraParams.basketDarcode = null; //请求完毕,把这个参数置空,以免影响后面的请求 - getTousseInstances(searchKeyWord, result.containerName, 1); } else { showResult(result.message); @@ -39,8 +35,6 @@ alert("数据加载异常!"); } }); - } else { //执行搜索列 - search(); } } @@ -60,9 +54,8 @@ basketStore.proxy.extraParams.searchKeyWord = Ext4.getCmp('searchKeyWord').getValue(); basketStore.proxy.extraParams.searchColumns = searchColumns; + basketStore.loadPage(1); basketStore.reload(); - basketStore.proxy.extraParams.searchKeyWord = null; - basketStore.proxy.extraParams.searchColumns = null; Ext4.getCmp('searchKeyWord').setValue(''); }