Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r33975 -r34044 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 33975) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 34044) @@ -2362,7 +2362,7 @@ content: 'recyclingErrors.jsp?resolution=' + resolution + '&isEditIDCardError=' + isEditIDCardError + '&width=' + width + '&height=' + height + '&row=' + row + '&tousseDefinitionID=' + $('#tousseDefinitionID' + row).val() + '&tousseName=' + encodeAll(tousseName) + '&recordType=' + params_recordType + '&circuitNurse=' + encodeAll(circuitNurse) + '&operationRoom=' + encodeAll(operationRoom) - + '&tousseCount=' + ($('#recycleAmount' + row).val() == '' ? 0 : $('#recycleAmount' + row).val()) + '&errorRemark=' + errorRemark + + '&tousseCount=' + ($('#recycleAmount' + row).val() == '' ? 0 : $('#recycleAmount' + row).val()) + '&errorRemark=' + encodeAll(errorRemark) + '&errorDamageQmKey=' + errorDamageQmKey + '&depart=' + encodeAll(depart) + '&recyclingUser=' + encodeAll(recyclingUser), area: [width + 'px', height + heightExtra + 'px'], border: [5, 0.3, '#fff', true], @@ -2450,7 +2450,7 @@ + '&row=' + row + '&tousseDefinitionID=' + $('#tousseDefinitionID' + row).val() + '&tousseName=' + encodeAll(tousseName) + '&tousseItemId=' + tousseItemId + '&tousseCount=' + $('#recycleAmount' + row).attr('value') + '&recordType=' + params_recordType + '&circuitNurse=' + encodeAll(circuitNurse) + '&operationRoom=' + encodeAll(operationRoom) - + '&depart=' + encodeURI(depart) + '&departCode=' + departCode + '&damageRemark=' + damageRemark + + '&depart=' + encodeURI(depart) + '&departCode=' + departCode + '&damageRemark=' + encodeAll(damageRemark) + '&errorDamageQmKey=' + errorDamageQmKey + '&recyclingUser=' + encodeAll(recyclingUser), area: [width + 'px', height + heightExtra + 'px'], border: [5, 0.3, '#fff', true],