Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r34427 -r34516 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 34427) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 34516) @@ -708,6 +708,9 @@ } sterilizerBioMonitoringIntervalReminder(params) } + if(sstsConfig.enableSterilizersAndFrequencyFilterToSterilizeItems){ + pendingSterilizationColumnTree.loader.load(pendingSterilizationColumnTree.root, function () { }); + } } else { showMultipleResult(resultArray[1], null, sstsConfig.messagePauseTimeOnSterilizationRecordPage); } @@ -3243,14 +3246,15 @@ listeners: { beforeload: function (treeLoader, node) { pendingSterilizationColumnTree.getEl().mask("数据重新加载中,请稍等!"); - treeLoader.baseParams.sterilizerNameTemp = top.Ext.getCmp("sterilizerName").getValue(); - //treeLoader.baseParams.sterilingMode = top.Ext.getCmp("hiddenSterilingMode").getValue(); - /* - top.Ext.getCmp('saveBtn').disable(); - top.Ext.getCmp('save2').disable(); - top.Ext.getCmp('monitorBtn').disable(); - top.Ext.getCmp('saveAndNewBtn').disable(); - */ + //DLZXYY-3:增加“灭菌炉”和“当天炉次” + if(sstsConfig.enableSterilizersAndFrequencyFilterToSterilizeItems){ + treeLoader.baseParams.sterilizerNameTemp = top.Ext.getCmp("sterilizerName").getValue(); + treeLoader.baseParams.sterileFrequency = top.Ext.getCmp("frequency").getValue(); + } + if(sstsConfig.sterilizationCheckTousseSterilingType){ + treeLoader.baseParams.sterilizerNameTemp = top.Ext.getCmp("sterilizerName").getValue(); + } + treeLoader.baseParams.ownGroupTemp = ownGroup; }, load: function (treeLoader, node, response) { @@ -3534,6 +3538,9 @@ } SterilizationRecordTableManager.getMaxFrequency(combo.value, recordId, function (result) { top.Ext.getCmp('frequency').setValue(result); + if(sstsConfig.enableSterilizersAndFrequencyFilterToSterilizeItems){ + pendingSterilizationColumnTree.loader.load(pendingSterilizationColumnTree.root, function () { }); + } }); SterilizationRecordTableManager.getNextCycleCounter(combo.value, recordId, function (result) { if (result == 0) { Index: ssts-web/src/main/webapp/disinfectsystem/config/dlzxyy/config.js =================================================================== diff -u -r34268 -r34516 --- ssts-web/src/main/webapp/disinfectsystem/config/dlzxyy/config.js (.../config.js) (revision 34268) +++ ssts-web/src/main/webapp/disinfectsystem/config/dlzxyy/config.js (.../config.js) (revision 34516) @@ -161,5 +161,7 @@ //隐藏预回收人 hiddenRecyclingPeople:true, //隐藏预回收确认人 - hiddenPreRecyclingConfirmPeople:true + hiddenPreRecyclingConfirmPeople:true, + //启用灭菌炉和炉次过滤待灭菌物品 + enableSterilizersAndFrequencyFilterToSterilizeItems:true } \ No newline at end of file