Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js =================================================================== diff -u -r33863 -r34681 --- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js (.../dataSource.js) (revision 33863) +++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js (.../dataSource.js) (revision 34681) @@ -840,9 +840,11 @@ textForPreview: '中山一院' })] }); -if(sstsConfig.enableScanSterilizationMonitoringPackage){ - objectDataSourceManager.registerDataSource(biologicalMonitoringDataSource); - objectDataSourceManager.registerDataSource(chemistryPackageBarcodeDataSource); +if(!sstsConfig.enableSterilizerConsumptiveMaterialConsumptionFunction){ + if(sstsConfig.enableScanSterilizationMonitoringPackage){ + objectDataSourceManager.registerDataSource(biologicalMonitoringDataSource); + objectDataSourceManager.registerDataSource(chemistryPackageBarcodeDataSource); + } } //开启库位管理,才显示库位编码、库位简称 if(sstsConfig.enableWarehousePositionModule){ Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r34670 -r34681 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 34670) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 34681) @@ -3456,6 +3456,13 @@ changeFontColor = true; } + var enableScanSterilizationMonitoringPackage = false; + if (sstsConfig.enableSterilizerConsumptiveMaterialConsumptionFunction) { + enableScanSterilizationMonitoringPackage = false; + } else { + enableScanSterilizationMonitoringPackage = sstsConfig.enableScanSterilizationMonitoringPackage; + } + this.id = id; tousseItemCountJsonStore.removeAll(); formObj = new top.Ext.FormPanel({ @@ -4199,7 +4206,7 @@ columnWidth: .33, layout: 'form', cls: 'edit-5char-labelwidth', - hidden: (sstsConfig.enableScanSterilizationMonitoringPackage) ? false : true, + hidden: enableScanSterilizationMonitoringPackage ? false : true, items: [{ xtype: 'textfield', fieldLabel: "生物监测包", @@ -4216,7 +4223,7 @@ columnWidth: .33, layout: 'form', cls: 'edit-5char-labelwidth', - hidden: (sstsConfig.enableScanSterilizationMonitoringPackage) ? false : true, + hidden: enableScanSterilizationMonitoringPackage ? false : true, items: [{ xtype: 'textfield', fieldLabel: "化学监测包", @@ -5632,6 +5639,20 @@ }); } +function getInclude4(a, b) { + // a和b其中一个不是数组,直接返回false + if (!(a instanceof Array) || !(b instanceof Array)) return false; + var len = b.length; + // a的长度小于b的长度,直接返回false + if (a.length < len) return false; + for (var i = 0; i < len; i++) { + // 遍历b中的元素,遇到a没有包含某个元素的,直接返回false + if (!a.includes(b[i])) return false; + } + // 遍历结束,返回true + return true; +} + //保存表单 function saveData(dataType, that) { if (!formObj.form.isValid()) { @@ -5755,6 +5776,26 @@ deleteDetailIds = deleteDetailIds.substr(0, deleteDetailIds.length - 1); } top.Ext.getCmp("deleteDetailIds").setValue(deleteDetailIds); + + var consumptiveMaterialVolumes = top.Ext.getCmp("consumptiveMaterialVolumes").getValue(); + if (consumptiveMaterialVolumes !== '') { + var consumptiveMaterialVolumesArr = consumptiveMaterialVolumes.split('|'); + var newArr = []; + if (sterilizationPurposeStore.getCount() == 0) { + showMultipleResult('请扫码添加指定灭菌耗材后再保存记录'); + return; + } + for (var k = 0; k < sterilizationPurposeStore.getCount(); k++) { + var item = sterilizationPurposeStore.getAt(k); + var disposableGoodsName = item.data.disposableGoodsName; + newArr.push(disposableGoodsName); + } + var res = getInclude4(newArr, consumptiveMaterialVolumesArr); + if (!res) { + showMultipleResult('请扫码添加指定灭菌耗材后再保存记录'); + return; + } + } } formObj.form.submit({ url: url, @@ -5807,20 +5848,24 @@ //保存 function save(that) { - if (sstsConfig.enableScanSterilizationMonitoringPackage) { - var monitorPackageBarcode = top.Ext.getCmp('monitorPackageBarcode').getValue(); - var chemistryPackageBarcode = top.Ext.getCmp('chemistryPackageBarcode').getValue(); - var sterilizerName = top.Ext.getCmp('sterilizerName').getValue(); - if (sstsConfig.enableSterilizerBioMonitoringIntervalReminder) { - var params = { - sterilizerName: sterilizerName, - isSave: true, - monitorPackageBarcode: monitorPackageBarcode, - chemistryPackageBarcode: chemistryPackageBarcode, - button: that, - saveType: 1 + if (!sstsConfig.enableSterilizerConsumptiveMaterialConsumptionFunction) { + if (sstsConfig.enableScanSterilizationMonitoringPackage) { + var monitorPackageBarcode = top.Ext.getCmp('monitorPackageBarcode').getValue(); + var chemistryPackageBarcode = top.Ext.getCmp('chemistryPackageBarcode').getValue(); + var sterilizerName = top.Ext.getCmp('sterilizerName').getValue(); + if (sstsConfig.enableSterilizerBioMonitoringIntervalReminder) { + var params = { + sterilizerName: sterilizerName, + isSave: true, + monitorPackageBarcode: monitorPackageBarcode, + chemistryPackageBarcode: chemistryPackageBarcode, + button: that, + saveType: 1 + } + sterilizerBioMonitoringIntervalReminder(params); + } else { + saveData(1, that); } - sterilizerBioMonitoringIntervalReminder(params); } else { saveData(1, that); } @@ -5831,19 +5876,23 @@ //暂存 function save2() { - if (sstsConfig.enableScanSterilizationMonitoringPackage) { - var monitorPackageBarcode = top.Ext.getCmp('monitorPackageBarcode').getValue(); - var chemistryPackageBarcode = top.Ext.getCmp('chemistryPackageBarcode').getValue(); - var sterilizerName = top.Ext.getCmp('sterilizerName').getValue(); - if (sstsConfig.enableSterilizerBioMonitoringIntervalReminder) { - var params = { - sterilizerName: sterilizerName, - isSave: true, - monitorPackageBarcode: monitorPackageBarcode, - chemistryPackageBarcode: chemistryPackageBarcode, - saveType: 2 + if (!sstsConfig.enableSterilizerConsumptiveMaterialConsumptionFunction) { + if (sstsConfig.enableScanSterilizationMonitoringPackage) { + var monitorPackageBarcode = top.Ext.getCmp('monitorPackageBarcode').getValue(); + var chemistryPackageBarcode = top.Ext.getCmp('chemistryPackageBarcode').getValue(); + var sterilizerName = top.Ext.getCmp('sterilizerName').getValue(); + if (sstsConfig.enableSterilizerBioMonitoringIntervalReminder) { + var params = { + sterilizerName: sterilizerName, + isSave: true, + monitorPackageBarcode: monitorPackageBarcode, + chemistryPackageBarcode: chemistryPackageBarcode, + saveType: 2 + } + sterilizerBioMonitoringIntervalReminder(params); + } else { + saveData(2); } - sterilizerBioMonitoringIntervalReminder(params); } else { saveData(2); } Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js =================================================================== diff -u -r33038 -r34681 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js (.../sterilizerForm.js) (revision 33038) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js (.../sterilizerForm.js) (revision 34681) @@ -452,6 +452,13 @@ ) }); + var enableScanSterilizationMonitoringPackage = false; + if(sstsConfig.enableSterilizerConsumptiveMaterialConsumptionFunction){ + enableScanSterilizationMonitoringPackage = false; + }else { + enableScanSterilizationMonitoringPackage = sstsConfig.enableScanSterilizationMonitoringPackage; + } + formObj = new top.Ext.FormPanel({ id: 'sterilizerForm', frame: true, @@ -1171,7 +1178,7 @@ height: 38, autoHeight: true, bodyStyle: 'margin:10px 0 !important', - hidden: (sstsConfig.enableScanSterilizationMonitoringPackage) ? false : true, + hidden: enableScanSterilizationMonitoringPackage ? false : true, items: [{ layout: 'column', columnWidth: 0.45, Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationMonitoring.js =================================================================== diff -u -r33063 -r34681 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationMonitoring.js (.../sterilizationMonitoring.js) (revision 33063) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationMonitoring.js (.../sterilizationMonitoring.js) (revision 34681) @@ -160,19 +160,23 @@ } //保存 function saveMonitor(){ - if(sstsConfig.enableScanSterilizationMonitoringPackage){ - var monitorPackageBarcode = top.Ext.getCmp('monitorPackageBarcode').getValue(); - var chemistryPackageBarcode = top.Ext.getCmp('chemistryPackageBarcode').getValue(); - var sterilizerName = top.Ext.getCmp('sterilizerName').getValue(); - if(sstsConfig.enableSterilizerBioMonitoringIntervalReminder){ - var params = { - sterilizerName:sterilizerName, - isSave:true, - monitorPackageBarcode: monitorPackageBarcode, - chemistryPackageBarcode: chemistryPackageBarcode, - saveType:3 + if(!sstsConfig.enableSterilizerConsumptiveMaterialConsumptionFunction){ + if(sstsConfig.enableScanSterilizationMonitoringPackage){ + var monitorPackageBarcode = top.Ext.getCmp('monitorPackageBarcode').getValue(); + var chemistryPackageBarcode = top.Ext.getCmp('chemistryPackageBarcode').getValue(); + var sterilizerName = top.Ext.getCmp('sterilizerName').getValue(); + if(sstsConfig.enableSterilizerBioMonitoringIntervalReminder){ + var params = { + sterilizerName:sterilizerName, + isSave:true, + monitorPackageBarcode: monitorPackageBarcode, + chemistryPackageBarcode: chemistryPackageBarcode, + saveType:3 + } + sterilizerBioMonitoringIntervalReminder(params); + }else { + saveMonitorData(); } - sterilizerBioMonitoringIntervalReminder(params); }else { saveMonitorData(); } Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js =================================================================== diff -u -r34654 -r34681 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js (.../diposableGoodsView.js) (revision 34654) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js (.../diposableGoodsView.js) (revision 34681) @@ -95,11 +95,15 @@ data : [[STR_YES],[STR_NO]] }); - var consumptiveMaterialUseData = [['清洗耗材']] + var consumptiveMaterialUseData = []; + if(sstsConfig.enableRinserConsumptiveMaterialConsumptionFunction){ + consumptiveMaterialUseData.push(['清洗耗材']); + } if(sstsConfig.enableSterilizerConsumptiveMaterialConsumptionFunction){ consumptiveMaterialUseData.push(['灭菌耗材']); } + //耗材用途 var consumptiveMaterialUseStore = new Ext.data.SimpleStore( { fields : [ 'value'],