Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r35008 -r35010
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 35008)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 35010)
@@ -1807,7 +1807,7 @@
 										for(var j=0;j<result.data[i].materials.length;j++){
 											var materialsJson = result.data[i].materials;
 											if(sstsConfig.enableTotalPriceCalculatedBasedOnTheUnitPriceOfTheMaterialOfForeignTousseFunction){
-												sumPrice = setParentPrice(materialsJson,result.data[i].price);
+												sumPrice = setParentPrice(materialsJson,0);
 											}else {
 												sumPrice = result.data[i].price
 											}
@@ -1854,17 +1854,6 @@
 										var rootNode = foreignTousseStore.getRootNode();
 										rootNode.appendChild(tousseItem);
 									}
-									if(sstsConfig.enableTotalPriceCalculatedBasedOnTheUnitPriceOfTheMaterialOfForeignTousseFunction){
-										for(var i=0;i<rootNode.childNodes.length;i++){
-											var sumPrice = 0;
-											for(var j=0;j<rootNode.childNodes[i].childNodes.length;j++){
-												var price = parseFloat(rootNode.childNodes[i].childNodes[j].data.price);
-												var amount = rootNode.childNodes[i].childNodes[j].data.amount;
-												sumPrice += parseFloat(price*amount)
-											}
-											rootNode.childNodes[i].raw.price = parseFloat(rootNode.childNodes[i].data.price - sumPrice).toFixed(2);
-										}
-									}
 									top.Ext4.getCmp('foreignTousseName1').setValue('');
 									return;
 								}
@@ -2257,7 +2246,7 @@
 					currentRecord.set("tousseName",r[0].data.name);
 					if(sstsConfig.enableTotalPriceCalculatedBasedOnTheUnitPriceOfTheMaterialOfForeignTousseFunction){
 						setTimeout(function(){
-							var sumPrice = setParentPrice(currentRecord.parentNode.childNodes,currentRecord.parentNode.raw.price);
+							var sumPrice = setParentPrice(currentRecord.parentNode.childNodes,0);
 							currentRecord.parentNode.set('price',sumPrice)
 						}, 200);
 					}
@@ -2340,7 +2329,7 @@
 				blur:function(field, event, eOpts){
 					if(sstsConfig.enableTotalPriceCalculatedBasedOnTheUnitPriceOfTheMaterialOfForeignTousseFunction){
 						setTimeout(function(){
-							var sumPrice = setParentPrice(currentRecord.parentNode.childNodes,currentRecord.parentNode.raw.price);
+							var sumPrice = setParentPrice(currentRecord.parentNode.childNodes,0);
 							currentRecord.parentNode.set('price',sumPrice)
 						}, 200);
 					}
@@ -2364,7 +2353,31 @@
                     this.selectText();  
                 }
             }
-        }
+        },
+		renderer: function(v,p,record,rowIndex, columnIndex, store){
+			var isLeaf = record.get('leaf');
+			if(isLeaf){
+				return v;
+			}else {
+				if(sstsConfig.enableTotalPriceCalculatedBasedOnTheUnitPriceOfTheMaterialOfForeignTousseFunction){
+					var sum = 0;
+					if(record.childNodes.length > 0){
+						for(var i=0;i<record.childNodes.length;i++){
+							var price = record.childNodes[i].data.price;
+							var amount = record.childNodes[i].data.amount;
+							sum += parseFloat(price*amount);
+						}
+					}
+					if(sum == 0){
+						return 0
+					}else {
+						return parseFloat(sum).toFixed(2);
+					}
+				}else {
+					return v;
+				}
+			}
+		}  
     },{
     	header: '加急级别',
     	width : 60,
@@ -2572,17 +2585,6 @@
 			load:function(store,record){
 				if(record.childNodes.length > 0){
 					record.childNodes[0].set('checked',true)
-					if(sstsConfig.enableTotalPriceCalculatedBasedOnTheUnitPriceOfTheMaterialOfForeignTousseFunction){
-						for(var i=0;i<record.childNodes.length;i++){
-							var sumPrice = 0;
-							for(var j=0;j<record.childNodes[i].childNodes.length;j++){
-								var price = parseFloat(record.childNodes[i].childNodes[j].data.price);
-								var amount = record.childNodes[i].childNodes[j].data.amount;
-								sumPrice += parseFloat(price*amount)
-							}
-							record.childNodes[i].raw.price = parseFloat(record.childNodes[i].data.price - sumPrice).toFixed(2);
-						}
-					}
 				}
 			}
 	    },