Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r37478 -r37774 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 37478) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 37774) @@ -28,6 +28,7 @@ if (enableNowScanAmount) { pendingSterilizationColumnTreeHeight = 420 } +var columnTreeIsLoader = false; var oldFormValue = {} @@ -3947,6 +3948,7 @@ top.Ext.getCmp('monitorBtn').enable(); top.Ext.getCmp('saveAndNewBtn').enable(); pendingSterilizationColumnTree.getEl().unmask(); + columnTreeIsLoader = true; return; } var result = Ext.decode(response.responseText); @@ -3996,6 +3998,7 @@ top.Ext.getCmp('monitorBtn').enable(); top.Ext.getCmp('saveAndNewBtn').enable(); pendingSterilizationColumnTree.getEl().unmask(); + columnTreeIsLoader = true; } } }), @@ -4558,6 +4561,11 @@ render: function (p) { p.getEl().on('keypress', function (e) {//可输入或扫描的类型有灭菌架、灭菌筐、灭菌炉、灭菌程序、器械包;20151102新增加虚拟篮筐 if (e.getKey() == 13) {//回车键 + //ZSYY-349:“今天审核的待灭菌物品”列表的物品未加载完成时,输入或扫描条码进行操作时,拦截本次操作 + if(!columnTreeIsLoader){ + showMultipleResult('请等待待灭菌物品列表加载完成后再操作。'); + return; + } var barcode = top.Ext.getCmp('inputBarcode').getValue(); var recordID = id; var sterilizationPurposeId = top.Ext.getCmp('sterilizationPurposeId').getValue();