Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r37313 -r37331 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 37313) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 37331) @@ -3975,6 +3975,8 @@ remarks += remarkOfApplyGoodsInfo; } Ext4.getCmp('remark').setValue(remarks); + }else { + Ext4.getCmp('remark').setValue(''); } } @@ -6515,13 +6517,28 @@ var selLength = selNodes.length; if (selLength > 0) { var map = {}, dest = []; + var remarkLength = 0; + var count = 0; Ext4.each(selNodes, function (pNode) { if (pNode.childNodes.length == 0) { var ai = pNode; if (!map[ai.get('tousseName')]) { dest.push(ai); map[ai.get('tousseName')] = ai; } + var remarkOfApplyGoods = ai.get('remarkOfApplyGoods') || ''; + var errorDamageRemarkInfo = ai.get('errorDamageRemarkInfo') || ''; + var remark = ''; + if(errorDamageRemarkInfo !== ''){ + remark += errorDamageRemarkInfo; + } + if(remarkOfApplyGoods !== ''){ + remark += remarkOfApplyGoods; + } + if(remark !== ''){ + remarkLength++; + } + count++ } }); if (dest.length == 1) { @@ -6537,15 +6554,21 @@ sterilizerTypeStore.reload(); } if(sstsConfig.enablePackingMultipleGoodsWithRemarks){ - Ext4.getCmp('remark').enable(); + if(count > 2 && remarkLength == 0){ + Ext4.getCmp('remark').enable(); + }else if(count == 1){ + Ext4.getCmp('remark').enable(); + }else { + Ext4.getCmp('remark').disable(); + } } } else { Ext4.getCmp('sterilingType').disable(); Ext4.getCmp('packageType').disable(); if(sstsConfig.enableAvailableSterilizationProgramsOfTousseFunction){ Ext4.getCmp('updateSterilingTypeButton').disable(); } - if(sstsConfig.enablePackingMultipleGoodsWithRemarks){ + if(sstsConfig.enablePackingMultipleGoodsWithRemarks && remarkLength > 0){ Ext4.getCmp('remark').disable(); } }