Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js =================================================================== diff -u -r15698 -r15831 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js (.../invoicePlanExtractedView.js) (revision 15698) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js (.../invoicePlanExtractedView.js) (revision 15831) @@ -13,6 +13,8 @@ var startDate = Ext.getCmp('startDate'); var endDate = Ext.getCmp('endDate'); + + var appFormType = Ext.getCmp('appFormType').getValue(); if (!isUndefinedOrNullOrEmpty(isSetDateValue) && isSetDateValue == true){ var dateArray = selectedApplyDate.split(';'); startDate.setValue(dateArray[0]); @@ -32,6 +34,7 @@ store.baseParams['departCode'] = Ext.getCmp('invoiceDepartGroup').getValue(); store.baseParams['applyDate'] = selectedApplyDate; store.baseParams['tousseType'] = selectedTousseType; + store.baseParams['appFormType'] = appFormType; //刷新列表界面 store.load(); // } @@ -94,6 +97,43 @@ } }); } + +/** + * 创建申请单下拉框 + * @returns {Ext.form.ComboBox|Ext4.form.ComboBox} + */ +function createAppFormCombo() { + var appFormModel = sstsConfig.appFormModel || [ + ['全部申请单', ''] + ,['一次性物品申请单', '一次性物品申请单'] + ,['器械包申请单', '器械包申请单'] + ,['消毒物品申请单', '消毒物品申请单'] + ,['外来器械包申请单', '外来器械包申请单'] + ,['自定义器械包申请单', '自定义器械包申请单'] + ,['借物单', '借物单'] + ,['代理灭菌申请单', '代理灭菌申请单'] + ,['外部器械包代理灭菌申请单', '外部器械包代理灭菌申请单'] + ,['回收申请单', '回收申请单'] + ,['手术预约申请单', '手术预约申请单'] + ]; + var appFormStore = new Ext.data.SimpleStore({ + data: appFormModel, + fields: ['key', 'value'] + }); + var comboConfig = { + id: 'appFormType', + name: 'appFormType', + emptyText: '请选择申请单类型', + mode: 'local', + store: appFormStore, + listeners: { + select: function (combo, record, index) { + refreshList(); + } + } + }; + return ext2CompUtil.getComboBuilder().getCombo(comboConfig); +} Ext.onReady(function() { Ext.QuickTips.init(); @@ -265,6 +305,10 @@ }, anchor : '95%' },{ + text : '申请单类型:' + }, + createAppFormCombo() + ,{ text : '刷新列表', iconCls : 'btn_ext_refresh1', handler : function() {