Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r29670 -r29671 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 29670) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 29671) @@ -3679,50 +3679,77 @@ // 选择器械包备注信息 function setTousseRemark(row){ $.ajax({ - type:'get', - url:encodeURI(WWWROOT + '/disinfectSystem/core/httpOptionAction!getHttpOptionsById.do?time='+new Date().getTime()), - data:'optionId=recycleItem_remark', - dataType:'json', - success:function(result){ - if(result.success){ - var htmlCode = ""; - var oldRemark = $('#tousseRemark'+row).val(); - for(var i = 0 ; i < result.data.length ; i++){ - var tmpRemark = result.data[i].value; - var redColor = ""; - if(oldRemark == tmpRemark){ - redColor = "color:red;"; - } - htmlCode += "

" + result.data[i].value + "

" - } - if(htmlCode == ""){ - alertDiv("未设置回收物品备注信息!"); - }else{ - $("#dialogConfirm").dialog({ - resizable: false, - height:530, - width:800, - title:'选择器械包备注信息', - modal: true, - open: function() { - $("#confirmMsg").html(htmlCode); - }, - close: function() { - $("#confirmMsg").html(""); - }, - buttons: { - "取消": function() { - $( this ).dialog( "close" ); - } - } - }); - } - } - }, - error:function(XMLHttpRequest, textStatus, errorThrown){ - alertDiv("未知错误,请联系管理员!"); - } - }); + type:'get', + url:encodeURI(WWWROOT + '/disinfectSystem/core/httpOptionAction!getHttpOptionsById.do?time='+new Date().getTime()), + data:'optionId=recycleItem_remark', + dataType:'json', + success:function(result){ + if(result.success){ + var htmlCode = ""; + var oldRemark = $('#tousseRemark'+row).val(); + for(var i = 0 ; i < result.data.length ; i++){ + var tmpRemark = result.data[i].value; + var redColor = ""; + if(oldRemark == tmpRemark){ + redColor = "color:red;"; + } + htmlCode += '
'; + htmlCode += ''; + htmlCode += ''; + htmlCode += ''; + htmlCode += '
' + } + htmlCode += '
'; + htmlCode += ''; + htmlCode += ''; + htmlCode += ''; + htmlCode += '
' + htmlCode += ''; + if(htmlCode == ""){ + alertDiv("未设置回收物品备注信息!"); + }else{ + $("#dialogConfirm").dialog({ + resizable: false, + height:530, + width:800, + title:'选择器械包备注信息', + modal: true, + open: function() { + $("#confirmMsg").html(htmlCode); + }, + close: function() { + $("#confirmMsg").html(""); + }, + buttons: { + "取消": function() { + $( this ).dialog( "close" ); + }, + "确定": function() { + var radios = document.getElementsByName("remarks"); + var value = 0; + for(var i=0;i