Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js =================================================================== diff -u -r28039 -r28248 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js (.../invoicePlanExtractedView.js) (revision 28039) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js (.../invoicePlanExtractedView.js) (revision 28248) @@ -11,7 +11,8 @@ var selectedTousseType; var selectedDisposableGoodsType = ''; var selectedSterilingMethods = ''; -var appFormType = ''; +var selectedAppFormType; + var invoiceDepartGroups = ''; var appDepartCode = ''; var view_recyclingapplicationStore = null; @@ -100,7 +101,7 @@ var startDate = Ext.getCmp('startDate'); var endDate = Ext.getCmp('endDate'); - appFormType = Ext.getCmp('appFormType').getValue(); + selectedAppFormType = Ext.getCmp('appFormType').getValue(); if (!isUndefinedOrNullOrEmpty(isSetDateValue) && isSetDateValue == true){ var dateArray = selectedApplyDate.split(';'); startDate.setValue(dateArray[0]); @@ -140,7 +141,7 @@ store.baseParams['tousseType'] = selectedTousseType; store.baseParams['disposableGoodsType'] = selectedDisposableGoodsType; store.baseParams['sterilingMethods'] = selectedSterilingMethods; - store.baseParams['appFormType'] = appFormType; + store.baseParams['appFormType'] = selectedAppFormType; store.baseParams['tousseGroupIds'] = tousseGroupIds; //刷新列表界面 store.load(); @@ -243,6 +244,7 @@ ['全部申请单', ''] ,['通用申请单', '通用申请单'] ,['器械包申请单', '器械包申请单'] + ,['回收申请单', '回收申请单'] ,['一次性物品申请单', '一次性物品申请单'] ,['消毒物品申请单', '消毒物品申请单'] ,['外来器械包申请单', '外来器械包申请单'] @@ -498,6 +500,8 @@ view_recyclingapplicationStore.baseParams['sterilingMethods'] = encodeURI(selectedSterilingMethods); } view_recyclingapplicationStore.baseParams['tousseGroupIds'] = tousseGroupIds; + //申请单类型 + view_recyclingapplicationStore.baseParams['appFormType'] = encodeURI(selectedAppFormType); });