Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
===================================================================
diff -u -r29065 -r29066
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js	(.../goodsApplicationForm.js)	(revision 29065)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js	(.../goodsApplicationForm.js)	(revision 29066)
@@ -340,6 +340,7 @@
              * @param autoReturnTheBorrowingTousse	是否自动归还借物
              */
 			function submitRecyclingApplication(autoReturnTheBorrowingTousse){
+				//console.log(rightTemplateStore.getRootNode())
 				//console.log(JSON.parse(top.Ext4.getCmp('tousseInstanceInfos').getValue()));return
                 form.form.submit({
                     url : WWWROOT + '/disinfectSystem/recyclingApplicationAction!saveRecyclingApplication.do',
@@ -963,23 +964,7 @@
 	},{
         header:"单位",dataIndex:'unit',width:45 * fontSizeScale,hidden:!sstsConfig.showTousseUnitColumn,menuDisabled:true
     },{
-		header:"单价",dataIndex:'price',width:48 * fontSizeScale,sortable:false,hidden:sstsConfig.hideToussePriceColumn,align:'right',
-		renderer:function formartNumber(v,p,record,rowIndex, columnIndex, store){
-			if (typeof(record) == 'undefined'){
-				return "";
-			}
-			// 分支节点，并且不是整包清洗，则不显示金额
-			if ( !record.get('leaf') && '是' != record.get('isApplyEntireTousse')){
-				return "";
-			}
-			var transferScale = record.get('transferScale') || '';
-			var price = record.get('price') || '';
-			if(transferScale !== '' && transferScale !== 0){
-				return Number(transferScale*price).toFixed(2);
-			}else {
-				return Number(price).toFixed(2);
-			}
-		}
+		header:"单价",dataIndex:'price',width:48 * fontSizeScale,sortable:false,hidden:sstsConfig.hideToussePriceColumn,align:'right',renderer:formartNumber
 	},{
 		header:"小计",dataIndex:'totalPrice',id:'rowTotalPrice',hidden:sstsConfig.hideToussePriceColumn,width:48 * fontSizeScale,align:'right',sortable:false,renderer:formartNumber
 	}];
@@ -1193,23 +1178,8 @@
 	},{
         header : "单位",dataIndex : 'unit',hidden : hiddenUnit2,align:'center',width : 60 * fontSizeScale,menuDisabled : true
     },{
-		header : "单价",width : 48 * fontSizeScale,dataIndex : 'sumPrice',hidden : hiddenPrice2,align:'right',sortable: false,
-		renderer:function formartNumber(v,p,record,rowIndex, columnIndex, store){
-			if (typeof(record) == 'undefined'){
-				return "";
-			}
-			// 分支节点，并且不是整包清洗，则不显示金额
-			if ( !record.get('leaf') && '是' != record.get('isApplyEntireTousse')){
-				return "";
-			}
-			var transferScale = record.get('transferScale') || '';
-			var price = record.get('price') || '';
-			if(transferScale !== '' && transferScale !== 0){
-				return Number(transferScale*price).toFixed(2);
-			}else {
-				return Number(price).toFixed(2);
-			}
-		}
+		header : "单价",width : 48 * fontSizeScale,dataIndex : 'price',hidden : hiddenPrice2,align:'right',sortable: false,
+		renderer:formartNumber
 	},{
 		header : "小计",dataIndex : 'totalPrice',id:'rowTotalPrice2',width : 56 * fontSizeScale,hidden : hiddenTotalPrice2,align:'right',sortable: false,renderer:formartNumber
 	},{
@@ -2855,6 +2825,7 @@
 			if (diposable == '是' && originalPrice && count && disposableFloatPercent) {
 				var price = originalPrice * disposableFloatPercent;
 				if(disposableGoodsNode.transferScale !== '' && disposableGoodsNode.transferScale !== 0){
+					//disposableGoodsNode.price = price*disposableGoodsNode.transferScale;
 					disposableGoodsNode.unitCount = count * disposableGoodsNode.transferScale;
 				}