Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r41427 -r41428 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 41427) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 41428) @@ -5232,7 +5232,7 @@ Ext4.getCmp('damageMaterialsTip').setValue(damageMaterials); } } - function refreshErrorAndDamageRemark(record) { + function refreshErrorAndDamageRemark(record, remarks) { if (record) { var errorRemark = ''; var damageRemark = ''; @@ -5242,6 +5242,9 @@ if (record.data.damageRemark && record.data.damages.length > 0) { damageRemark = record.data.damageRemark; } + if(remarks){ + errorRemark += remarks; + } Ext4.getCmp('errorRemark').setValue(errorRemark); Ext4.getCmp('damageRemark').setValue(damageRemark); @@ -5281,29 +5284,34 @@ Ext4.getCmp('errorDamageRemarkInfo').setValue(''); } if(sstsConfig.enablePackingMaterialErrorDamageRemark){ - Ext4.getCmp('errorRemark').setValue(remarks); + refreshErrorAndDamageRemark(record, remarks); Ext4.getCmp('remark').setValue(remarkOfApplyGoodsInfo); }else if(sstsConfig.enableRecyclingItemRemark){ - Ext4.getCmp('recyclingItemRemark').setValue(remarks); + refreshRecyclingItemRemark(record, remarks); Ext4.getCmp('remark').setValue(remarkOfApplyGoodsInfo); }else { if (remarkOfApplyGoodsInfo !== '') { remarks += remarkOfApplyGoodsInfo; } Ext4.getCmp('remark').setValue(remarks); + refreshErrorAndDamageRemark(record); + refreshRecyclingItemRemark(record); } }else { Ext4.getCmp('remark').setValue(''); } } - function refreshRecyclingItemRemark(record) { + function refreshRecyclingItemRemark(record, remarks) { if (record) { var recyclingItemRemark = record.data.recyclingItemRemark; if (!recyclingItemRemark) { recyclingItemRemark = ''; } + if(remarks){ + recyclingItemRemark += remarks; + } Ext4.getCmp('recyclingItemRemark').setValue(recyclingItemRemark); } } @@ -8062,9 +8070,7 @@ } } } - refreshErrorAndDamageRemark(record); refreshRemarks(); - refreshRecyclingItemRemark(record); } function updatePackageType(storeId) {