Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.js =================================================================== diff -u -r33400 -r33412 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.js (.../useRecordItemView.js) (revision 33400) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.js (.../useRecordItemView.js) (revision 33412) @@ -49,35 +49,12 @@ barcode: barcode, reportName: 'useRecordItemView' } - searchReport(url, params); } //获取物品的id function getGoodsId(type, id, checked) { - if (type == '器械包') { - var tousseInstanceIds = Ext.getCmp('tousseInstanceIds').getValue(); - var tousseInstanceArray = tousseInstanceIds.split(','); - var index = tousseInstanceArray.indexOf(id.toString()); - if (checked) { - if (index == -1) { - if (tousseInstanceIds !== '') { - Ext.getCmp('tousseInstanceIds').setValue(tousseInstanceIds + ',' + id); - } else { - Ext.getCmp('tousseInstanceIds').setValue(id); - } - } - } else { - if (index >= 0) { - tousseInstanceArray.splice(index, 1); - if (tousseInstanceIds !== '') { - Ext.getCmp('tousseInstanceIds').setValue(tousseInstanceArray.join(',')); - } else { - Ext.getCmp('tousseInstanceIds').setValue(''); - } - } - } - } else if (type == '一次性物品') { + if (type == '一次性物品') { var disposableGoodIds = Ext.getCmp('disposableGoodIds').getValue(); var disposableGoodIdsArray = disposableGoodIds.split(','); var index = disposableGoodIdsArray.indexOf(id.toString()); @@ -99,7 +76,7 @@ } } } - } else { + } else if (type == '高值耗材') { var expensiveGoodIds = Ext.getCmp('expensiveGoodIds').getValue(); var expensiveGoodIdsArray = expensiveGoodIds.split(','); var index = expensiveGoodIdsArray.indexOf(id.toString()); @@ -121,6 +98,28 @@ } } } + } else { + var tousseInstanceIds = Ext.getCmp('tousseInstanceIds').getValue(); + var tousseInstanceArray = tousseInstanceIds.split(','); + var index = tousseInstanceArray.indexOf(id.toString()); + if (checked) { + if (index == -1) { + if (tousseInstanceIds !== '') { + Ext.getCmp('tousseInstanceIds').setValue(tousseInstanceIds + ',' + id); + } else { + Ext.getCmp('tousseInstanceIds').setValue(id); + } + } + } else { + if (index >= 0) { + tousseInstanceArray.splice(index, 1); + if (tousseInstanceIds !== '') { + Ext.getCmp('tousseInstanceIds').setValue(tousseInstanceArray.join(',')); + } else { + Ext.getCmp('tousseInstanceIds').setValue(''); + } + } + } } } @@ -251,8 +250,8 @@ iconCls: 'icon_set', handler: function () { form.getForm().reset(); - $Id('startTime').value = ""; - $Id('endTime').value = ""; + Ext.getCmp('startTime').setValue(new Date(startDayofMonth)); + Ext.getCmp('endTime').setValue(new Date()); } }], items: [{ @@ -519,7 +518,7 @@ name: 'goodsSearchText', fieldLabel: '物品', height: 40, - anchor: '95%', + anchor: '100%', disabled: true, minChars: 0 }]