Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addMaterials.jsp
===================================================================
diff -u -r18336 -r23112
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addMaterials.jsp (.../addMaterials.jsp) (revision 18336)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addMaterials.jsp (.../addMaterials.jsp) (revision 23112)
@@ -18,8 +18,8 @@
//动态加载JS和CSS
document.write('');
- function addToussItem(materialDefinitionId,showName){
- window.opener.setMaterialName(row,showName);
+ function addToussItem(materialDefinitionId,showName,isImplant){
+ window.opener.setMaterialName(row,showName,isImplant);
window.close();
}
@@ -45,7 +45,7 @@
var htmlResultCode = "
";
num = tousseArray.length>countOfLI?countOfLI:tousseArray.length;
for(var i = 0 ; i < num ; i++){
- htmlResultCode += "- "+ tousseArray[i].showName + "
";
+ htmlResultCode += "- "+ tousseArray[i].showName + "
";
}
if(tousseArray.length < countOfLI){
for(var i = tousseArray.length ; i < countOfLI ; i++){
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp
===================================================================
diff -u -r21589 -r23112
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp (.../setForeignTousseDefinition.jsp) (revision 21589)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp (.../setForeignTousseDefinition.jsp) (revision 23112)
@@ -177,8 +177,9 @@
window.open ('addMaterials.jsp?from=errors&resolution=${param.resolution}&row=' + rowNum,'newwindow','height=750,width=1000,top=150,left=350,toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,status=no')
}
- function setMaterialName(row,materialName){
+ function setMaterialName(row,materialName,isImplant){
$('#materialName' + row).text(materialName);
+ $('#includeImplant' + row).text(isImplant);
}
var selects = null;