Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js =================================================================== diff -u -r22579 -r23157 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js (.../invoicePlanExtractedView.js) (revision 22579) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js (.../invoicePlanExtractedView.js) (revision 23157) @@ -10,6 +10,7 @@ var selectedApplyDate; var selectedTousseType; var selectedDisposableGoodsType = ''; +var selectedSterilingMethods = ''; var appFormType = ''; var invoiceDepartGroups = ''; var appDepartCode = ''; @@ -59,6 +60,11 @@ } } +function selectSterilingMethodsOnLoad(){ + if(sstsConfig.invoicePlanExtractedView_showSterilingMethods){ + Ext.getCmp('sterilingMethods').selectAll(); + } +} function onDisposableGoodsTousseTypeChange(combo, record){ if(!sstsConfig.invoicePlanExtractedView_showDisposableGoodsType){ return ; @@ -81,6 +87,10 @@ if(sstsConfig.invoicePlanExtractedView_showDisposableGoodsType){ selectedDisposableGoodsType = Ext.getCmp('disposableGoodsType').getValue(); } + if(sstsConfig.invoicePlanExtractedView_showSterilingMethods){ + selectedSterilingMethods = Ext.getCmp('sterilingMethods').getValue(); + } + appDepartCode = Ext.getCmp('appDepart').getValue(); if(!isUndefinedOrNullOrEmpty(appDepartCode)){ invoiceDepartGroups = appDepartCode; @@ -114,6 +124,7 @@ store.baseParams['applyDate'] = selectedApplyDate; store.baseParams['tousseType'] = selectedTousseType; store.baseParams['disposableGoodsType'] = selectedDisposableGoodsType; + store.baseParams['sterilingMethods'] = selectedSterilingMethods; store.baseParams['appFormType'] = appFormType; //刷新列表界面 store.load(); @@ -436,6 +447,7 @@ view_recyclingapplicationStore.baseParams['applyDate'] = selectedApplyDate; view_recyclingapplicationStore.baseParams['tousseType'] = encodeURI(selectedTousseType); view_recyclingapplicationStore.baseParams['disposableGoodsType'] = encodeURI(selectedDisposableGoodsType); + view_recyclingapplicationStore.baseParams['sterilingMethods'] = encodeURI(selectedSterilingMethods); }); @@ -651,14 +663,49 @@ } }, anchor : '95%' + }, { + text : '灭菌程序:', + hidden : !sstsConfig.invoicePlanExtractedView_showSterilingMethods + },{ + xtype : 'multiSelect', + id : 'sterilingMethods', + name : 'sterilingMethods', + hidden : !sstsConfig.invoicePlanExtractedView_showSterilingMethods, + valueField : 'value', + displayField : 'key', + allowBlank : true, + editable : false, + fieldLabel:'类型', + width : 150, + emptyText:'请选择物品类型', + mode:'local', + store : new Ext.data.SimpleStore({ + data: sterilingMethodArray, + fields:['key','value'] + }), +// forceSelection : true, + triggerAction : 'all', + listeners : { + select : function(combo, record, index){ + refreshList(); + }, + beforeselect:function(combo, record, index){ + var c = record.get(combo.checkField); + if(combo.getCheckedCount() <= 1 && c){ + return false; + } + return true; + } + }, + anchor : '95%' } ] }); var c = Ext.getCmp('container_panel'); tbar2.render(c.tbar); // 自动加载列表 selectTousseTypeOnLoad(); - + selectSterilingMethodsOnLoad(); } } }]