Index: ssts-web/src/main/webapp/disinfectsystem/config/sznsrmyy/config.js =================================================================== diff -u -r20510 -r22162 --- ssts-web/src/main/webapp/disinfectsystem/config/sznsrmyy/config.js (.../config.js) (revision 20510) +++ ssts-web/src/main/webapp/disinfectsystem/config/sznsrmyy/config.js (.../config.js) (revision 22162) @@ -1,4 +1,4 @@ -var sstsConfig = { +var sstsConfig = { // 禁用标识牌功能 disableIdCard : false, // 审核器械包必须入篮筐(一级供应室) @@ -56,6 +56,8 @@ packAmountProcessTypeInDirectPackingView:1, // 自定义装配界面,灭菌日期的处理方式,,0或者未定义:清空,1:表示保留当前值,2表示设置回默认值。其他值跟1一样,保留当前值 disinfectionDateProcessTypeInDirectPackingView:1, + //发货计划列表默认选中的物品类型 + invoicePlanView_tousseType_selectedItems: ['一次性物品','普通器械包','敷料包','消毒物品','自定义器械包','外部代理灭菌包'], //只有装配完成才能使用清洗篮筐回收 recycleClassifyBasketAfterPacked:false } \ No newline at end of file Index: ssts-web/src/main/webapp/ext/js/multiSelectCombo.js =================================================================== diff -u -r21093 -r22162 --- ssts-web/src/main/webapp/ext/js/multiSelectCombo.js (.../multiSelectCombo.js) (revision 21093) +++ ssts-web/src/main/webapp/ext/js/multiSelectCombo.js (.../multiSelectCombo.js) (revision 22162) @@ -211,6 +211,16 @@ this.clearValue(); } }, + select: function (v) + { + this.store.each(function (record) + { + if (v === record.get(this.displayField)) { + record.set(this.checkField, true); + } + }, this); + this.setValue(this.getCheckedValue()); + }, selectAll: function () { this.store.each(function (record) Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js =================================================================== diff -u -r21702 -r22162 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js (.../invoicePlanExtractedView.js) (revision 21702) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js (.../invoicePlanExtractedView.js) (revision 22162) @@ -33,7 +33,31 @@ ] ) }); - +function selectDisposableGoodsTypeOnLoad(){ + if(sstsConfig.invoicePlanView_tousseType_selectedItems){ + var selectedItems = sstsConfig.invoicePlanView_tousseType_selectedItems; + if(selectedItems.contains('一次性物品')){ + Ext.getCmp('disposableGoodsType').selectAll(); + } + }else{ + Ext.getCmp('disposableGoodsType').selectAll(); + } +} +function selectTousseTypeOnLoad(){ + var tousseTypeCmp = Ext.getCmp('tousseType'); + if(sstsConfig.invoicePlanView_tousseType_selectedItems){ + var selectedItems = sstsConfig.invoicePlanView_tousseType_selectedItems; + for(var i=0;i" + v + ""; } diposableGooodsStore.on('load', function(){ - Ext.getCmp('disposableGoodsType').selectAll(); + selectDisposableGoodsTypeOnLoad(); refreshList(); }); diposableGooodsStore.load(); @@ -491,7 +515,7 @@ }); tbar2.render(grid.tbar); // 自动加载列表 - Ext.getCmp('tousseType').selectAll(); + selectTousseTypeOnLoad(); } }