Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r41450 -r41451 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 41450) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 41451) @@ -5236,12 +5236,6 @@ if (record) { var errorRemark = ''; var damageRemark = ''; - if (record.data.errorRemark && record.data.errors.length > 0) { - errorRemark = record.data.errorRemark; - } - if (record.data.damageRemark && record.data.damages.length > 0) { - damageRemark = record.data.damageRemark; - } if(remarks){ if(remarks.indexOf('报损:') >= 0 && (remarks.indexOf('增加:') >= 0 || remarks.indexOf('丢失:') >= 0)){ errorRemark += remarks.split('报损:')[0]; @@ -5252,6 +5246,12 @@ errorRemark += remarks; } } + if (record.data.errorRemark && record.data.errors.length > 0) { + errorRemark += record.data.errorRemark; + } + if (record.data.damageRemark && record.data.damages.length > 0) { + damageRemark += record.data.damageRemark; + } Ext4.getCmp('errorRemark').setValue(errorRemark); Ext4.getCmp('damageRemark').setValue(damageRemark);