Index: ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js =================================================================== diff -u -r33071 -r33072 --- ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js (.../routineMonitoringView.js) (revision 33071) +++ ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js (.../routineMonitoringView.js) (revision 33072) @@ -2180,15 +2180,30 @@ if(result.remark !== ''){ var remark = '【' + result.tousseName + '('+ result.barcode +'):' + result.remark + '】'; var oldRemark = top.Ext.getCmp('remark').getValue(); - if(oldRemark == ''){ - var resultRemark = '装配备注:' + remark; - top.Ext.getCmp('remark').setValue(resultRemark); + if(top.Ext.getCmp('remark2')){ + var oldRemark2 = top.Ext.getCmp('remark2').getValue(); + if(oldRemark2 == ''){ + var resultRemark = '装配备注:' + remark; + top.Ext.getCmp('remark2').setValue(resultRemark); + }else { + if(oldRemark2.indexOf('装配备注:') == -1){ + var resultRemark = '装配备注:' + remark; + top.Ext.getCmp('remark2').setValue(oldRemark + resultRemark); + }else { + top.Ext.getCmp('remark2').setValue(oldRemark + remark); + } + } }else { - if(oldRemark.indexOf('装配备注:') == -1){ + if(oldRemark == ''){ var resultRemark = '装配备注:' + remark; - top.Ext.getCmp('remark').setValue(oldRemark + resultRemark); + top.Ext.getCmp('remark').setValue(resultRemark); }else { - top.Ext.getCmp('remark').setValue(oldRemark + remark); + if(oldRemark.indexOf('装配备注:') == -1){ + var resultRemark = '装配备注:' + remark; + top.Ext.getCmp('remark').setValue(oldRemark + resultRemark); + }else { + top.Ext.getCmp('remark').setValue(oldRemark + remark); + } } } }