| 
					
				 | 
			
			
				@@ -1629,7 +1629,7 @@ class CalcProgram { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         me.compiledFeeTypeMaps = {}; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         me.compiledFeeTypeNames = []; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         me.compiledCalcBases = {}; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        me.saveForReports = []; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        // me.saveForReports = []; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         me.feeRates = this.project.FeeRate.datas.rates; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         me.labourCoes = this.project.labourCoe.datas.coes; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1647,16 +1647,16 @@ class CalcProgram { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // 存储费率临时数据,报表用。 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if (isInit && me.saveForReports.length > 0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            let saveDatas = {}; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            saveDatas.projectID = projectObj.project.projectInfo.ID; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            saveDatas.calcItems = me.saveForReports; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            CommonAjax.post('/calcProgram/saveCalcItems', saveDatas, function (result) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                if (result){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    me.saveForReports = []; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                }; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        }; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        // if (isInit && me.saveForReports.length > 0){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        //     let saveDatas = {}; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        //     saveDatas.projectID = projectObj.project.projectInfo.ID; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        //     saveDatas.calcItems = me.saveForReports; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        //     CommonAjax.post('/calcProgram/saveCalcItems', saveDatas, function (result) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        //         if (result){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        //             me.saveForReports = []; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        //         }; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        //     }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        // }; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     compilePublics(){ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1756,9 +1756,9 @@ class CalcProgram { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     let cfr = me.compiledFeeRates[item.feeRateID]; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     item.feeRate = cfr ? cfr.rate : 100; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    if (!orgFeeRate || (orgFeeRate && orgFeeRate != item.feeRate)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        me.saveForReports.push({templatesID: template.ID, calcItem: item}); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    // if (!orgFeeRate || (orgFeeRate && orgFeeRate != item.feeRate)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //     me.saveForReports.push({templatesID: template.ID, calcItem: item}); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    // } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 }; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 // 字段名映射 
			 |