Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
===================================================================
diff -u -r25735 -r25775
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp (.../tousseImage.jsp) (revision 25735)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp (.../tousseImage.jsp) (revision 25775)
@@ -1,7 +1,10 @@
<%@ page contentType="text/html; charset=UTF-8"%>
<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile"%>
-
+<%
+ response.setHeader("Access-Control-Allow-Origin", "*");
+%>
+
器械包图片
@@ -56,7 +59,7 @@
var materialAmount = json[i].amount;
sumTotal+=parseFloat(materialAmount);
$('#SumTotal').text(sumTotal);
- trData += '';
+ trData += '
';
trData += '| '+materialName+' | ';
trData += ''+materialAmount+' | ';
trData += ''+emptyStringIfUndefinedOrNull(json[i].detachable)+' | ';
@@ -65,8 +68,8 @@
trData += ''+json[i].functionCheck+' | ';
trData += '
';
}
- document.getElementById("myTable").innerHTML = "";
- });
+ document.getElementById("myTable").innerHTML = "";
+ });
}
function getMaterial(){
@@ -212,11 +215,14 @@
}
var imageType = '<%=ImageFile.IMAGE_TYPE_TOUSSE%>';
loadImage(tousseDefinitionID,imageType);
- jQuery("#materialTable tr").css("background" , "#FFFFFF");
+ jQuery("#materialTable tr").css("background","#FFFFFF");
}
+function getMaterialNameWithAmount(materialName,amount){
+ $("#materialNameWithAmount",window.parent.document).attr("amount",amount);
+ $("#materialNameWithAmount",window.parent.document).val(materialName);
+}
-
function initPic(){
if(sstsConfig.toussePicturesShow){
showToussePictures = '${param.showToussePictures}';