Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r37250 -r37304 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 37250) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 37304) @@ -1437,6 +1437,7 @@ { name: 'isTraceable' }, { name: 'isPrint' }, { name: 'isReview' }, + { name: 'isSterile' }, { name: 'replenishMaterils' }, { name: 'packedPhotographed' }, { name: 'partPacking' }, @@ -6374,19 +6375,28 @@ if(sstsConfig.enableFlexiblePriceCalculationOfDisinfectionGoodsFunction){ var sterilizationPackageType = ''; var sterilizedThisTime = Ext4.getCmp('sterilizedThisTime').getValue(); - if(tousseType == '消毒物品'){ - if (record.childNodes.length == 0) { - sterilizationPackageType = record.get('sterilizationPackageType'); - } else { - sterilizationPackageType = record.childNodes[0].get('sterilizationPackageType'); + var isSterile = record.get('isSterile'); + if(isSterile == '可选'){ + Ext4.getCmp('sterilizedThisTime').show(); + Ext4.getCmp('secondaryDisinfection').show(); + if(tousseType == '消毒物品'){ + if (record.childNodes.length == 0) { + sterilizationPackageType = record.get('sterilizationPackageType'); + } else { + sterilizationPackageType = record.childNodes[0].get('sterilizationPackageType'); + } } - } - if(sterilizationPackageType !== ''){ - Ext4.getCmp('sterilizationPackageType').setValue(sterilizationPackageType); - if(sterilizedThisTime == true){ - Ext4.getCmp('packageType').setValue(sterilizationPackageType); + if(sterilizationPackageType !== ''){ + Ext4.getCmp('sterilizationPackageType').setValue(sterilizationPackageType); + if(sterilizedThisTime == true){ + Ext4.getCmp('packageType').setValue(sterilizationPackageType); + } } + }else { + Ext4.getCmp('sterilizedThisTime').hide(); + Ext4.getCmp('secondaryDisinfection').hide(); } + } lastSelectedTousseName = tousseName; @@ -6452,6 +6462,9 @@ if(sstsConfig.enableAvailableSterilizationProgramsOfTousseFunction){ Ext4.getCmp('updateSterilingTypeButton').disable(); } + if(sstsConfig.enablePackingMultipleGoodsWithRemarks){ + Ext4.getCmp('remark').disable(); + } } } }