Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp
===================================================================
diff -u -r40302 -r41460
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp (.../setForeignTousseDefinition.jsp) (revision 40302)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp (.../setForeignTousseDefinition.jsp) (revision 41460)
@@ -406,6 +406,8 @@
var rowNum = 1;
var totalRecycleAmount = 0;
+ var totalImplantsUsedAmount = 0;
+ var totalTousseItemAmountColumn = 0;
for(var i = 0;i < children.length ; i++){
var materialItem = children[i];
@@ -441,7 +443,8 @@
+ '');
totalRecycleAmount += recycleAmount;
-
+ totalTousseItemAmountColumn += Number(applyAmount) || 0;
+ totalImplantsUsedAmount += Number(materialItem.usedAmountOfIncludeImplant) || 0;
$("#recyclingErrorTable").append(materialElement);
if(sstsConfig.enableModifyWeightOfForeignTousseAfterApply && sstsConfig.foreignTousseAddWeight){
$(".weight").show()
@@ -452,6 +455,9 @@
rowNum++;
}
$('#recycleAmountColumn').text("回收数量(" + totalRecycleAmount + "件)");
+ $('#tousseItemAmountColumn').text("申请数量(" + totalTousseItemAmountColumn + "件)");
+ //让(*件)独自一行
+ $('#implantsUsedAmountColumn').html("植入物
使用数量
(" + totalImplantsUsedAmount + "件)");
},
error : function() {
}
@@ -501,11 +507,11 @@