Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js =================================================================== diff -u -r29005 -r29009 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 29005) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 29009) @@ -2083,7 +2083,7 @@ all.set(combo.checkField, false); } combo.setValue(combo.getCheckedValue()); - reloadConditionPara(combo.getValue(), 'parm_s_tousseTypes'); + reloadConditionPara(combo.getValue(), 'parm_s_selectedTousseType'); } } }); @@ -2189,7 +2189,6 @@ function reloadConditionPara(fieldValue, domId) { var dom = document.getElementById(domId); dom.value = fieldValue; - var applyDepartment = Ext.getCmp('applyDepartment').getRawValue(); var settleAccountsDepartment = Ext.getCmp('settleAccountsDepartment').getRawValue(); var goods = Ext.getCmp('goods').getRawValue(); @@ -2220,12 +2219,9 @@ document.getElementById('parm_s_invoiceType').value =''; document.getElementById('parm_s_applyType').value =''; - //document.getElementById('invoiceDepartGroup').value =''; - //document.getElementById('parm_s_selectedDepartCodes').value =''; + document.getElementById('invoiceDepartGroup').value =''; + document.getElementById('parm_s_selectedDepartCodes').value =''; - document.getElementById('touseType').value =''; - document.getElementById('parm_s_selectedTousseType').value =''; - if(sstsConfig.invoicePlanExtractedView_showDisposableGoodsType){ document.getElementById('disposableGoodsType').value =''; document.getElementById('parm_s_disposableGoodsType').value =''; @@ -2242,7 +2238,7 @@ if(!sstsConfig.notShowTousseTypeSearchTbar){ //按器械包类型分组 document.getElementById('touseType').value = ''; - document.getElementById('parm_s_tousseTypes').value = ''; + document.getElementById('parm_s_selectedTousseType').value = ''; } if(!sstsConfig.notShowApplyDepartmentSearchTbar){ @@ -2263,13 +2259,6 @@ document.getElementById('parm_s_print').value = ''; } - //开始时间 - document.getElementById('parm_s_startTime').value = ''; - document.getElementById('startDate').value = ''; -// //结束时间 - document.getElementById('parm_s_endTime').value = ''; - document.getElementById('endDate').value = ''; - grid.dwrReload(); } @@ -2566,40 +2555,7 @@ } }, anchor : '95%' - },{ - text : '物品类型:' - },{ - xtype : 'multiSelect', - id : 'tousseType', - name : 'tousseType', - valueField : 'value', - displayField : 'key', - allowBlank : true, - editable : false, - fieldLabel:'类型', - width : 150, - emptyText:'请选择物品类型', - mode:'local', - store : new Ext.data.SimpleStore({ - data:tousseTypeDataArray, - fields:['key','value'] - }), -// forceSelection : true, - triggerAction : 'all', - listeners : { - select : function(combo, record, index){ - if (record.get('value') == '全部') { - if (record.get('checked')) { - combo.selectAll() - } else { - combo.deselectAll() - } - } - grid.dwrReload(); - } - }, - anchor : '95%' - }, { + }, { text : '一次性物品类型:', hidden : !sstsConfig.invoicePlanExtractedView_showDisposableGoodsType },{ Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.jsp =================================================================== diff -u -r29005 -r29009 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.jsp (.../invoiceView.jsp) (revision 29005) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.jsp (.../invoiceView.jsp) (revision 29009) @@ -119,13 +119,12 @@