|  | @@ -14,24 +14,28 @@ let rationPM = {
 | 
	
		
			
				|  |  |          ],
 | 
	
		
			
				|  |  |          view:{
 | 
	
		
			
				|  |  |              comboBox:[],
 | 
	
		
			
				|  |  | -            lockColumns:[0,1]
 | 
	
		
			
				|  |  | +            lockColumns:[0,1],
 | 
	
		
			
				|  |  | +            colHeaderHeight: CP_Col_Width.colHeader,
 | 
	
		
			
				|  |  | +            rowHeaderWidth: CP_Col_Width.rowHeader
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      detailSetting: {
 | 
	
		
			
				|  |  |          header:[
 | 
	
		
			
				|  |  |              // {headerName:"ID",headerWidth:80,dataCode:"ID", hAlign: "center"},
 | 
	
		
			
				|  |  | -            {headerName:"费用代号",headerWidth:80,dataCode:"code", dataType: "String"},
 | 
	
		
			
				|  |  | -            {headerName:"费用名称",headerWidth:200,dataCode:"name", dataType: "String"},
 | 
	
		
			
				|  |  | -            {headerName:"计算基数",headerWidth:180,dataCode:"dispExprUser", dataType: "String"},
 | 
	
		
			
				|  |  | -            {headerName:"基数说明",headerWidth:300,dataCode:"statement", dataType: "String"},
 | 
	
		
			
				|  |  | -            {headerName:"费率",headerWidth:80,dataCode:"feeRate", dataType: "Number",hAlign: "left",tofix:feeRate_consts.decimal},
 | 
	
		
			
				|  |  | -            {headerName:"字段名称",headerWidth:140,dataCode:"displayFieldName", dataType: "String", hAlign: "center"},
 | 
	
		
			
				|  |  | -            {headerName:"备注",headerWidth:100,dataCode:"memo", dataType: "String"}
 | 
	
		
			
				|  |  | +            {headerName:"费用代号",headerWidth:CP_Col_Width.code, dataCode:"code", dataType: "String"},
 | 
	
		
			
				|  |  | +            {headerName:"费用名称",headerWidth:CP_Col_Width.name, dataCode:"name", dataType: "String"},
 | 
	
		
			
				|  |  | +            {headerName:"计算基数",headerWidth:CP_Col_Width.dispExprUser, dataCode:"dispExprUser", dataType: "String"},
 | 
	
		
			
				|  |  | +            {headerName:"费率",headerWidth:CP_Col_Width.feeRate, dataCode:"feeRate", dataType: "Number",hAlign: "right",tofix: feeRate_consts.decimal},
 | 
	
		
			
				|  |  | +            {headerName:"费用类别",headerWidth:CP_Col_Width.displayFieldName, dataCode:"displayFieldName", dataType: "String", hAlign: "center"},
 | 
	
		
			
				|  |  | +            {headerName:"基数说明",headerWidth:CP_Col_Width.statement, dataCode:"statement", dataType: "String"},
 | 
	
		
			
				|  |  | +            {headerName:"备注",headerWidth:CP_Col_Width.memo, dataCode:"memo", dataType: "String"}
 | 
	
		
			
				|  |  |          ],
 | 
	
		
			
				|  |  |          view:{
 | 
	
		
			
				|  |  |              comboBox:[],
 | 
	
		
			
				|  |  | -            lockColumns:[0,1,2,3,6]
 | 
	
		
			
				|  |  | +            lockColumns:[0,1,2,3,6],
 | 
	
		
			
				|  |  | +            colHeaderHeight: CP_Col_Width.colHeader,
 | 
	
		
			
				|  |  | +            rowHeaderWidth: CP_Col_Width.rowHeader
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -51,8 +55,7 @@ let rationPM = {
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          var fieldName = new GC.Spread.Sheets.CellTypes.ComboBox();
 | 
	
		
			
				|  |  |          fieldName.items(projectObj.project.calcProgram.calc.compiledFeeTypeNames);
 | 
	
		
			
				|  |  | -        // fieldName.items(["直接费","人工费","材料费","机械费","主材费","企业管理费","利润","风险费","人工价差","材料价差","机械价差","工程造价","调整人工费","调整机上人工费","甲供材料费"]);
 | 
	
		
			
				|  |  | -        me.detailSpread.getSheet(0).getRange(-1, 5, -1, 1).cellType(fieldName);
 | 
	
		
			
				|  |  | +        me.detailSpread.getSheet(0).getRange(-1, 4, -1, 1).cellType(fieldName);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          me.mainSpread.getSheet(0).bind(GC.Spread.Sheets.Events.EnterCell, me.onMainEnterCell);
 | 
	
		
			
				|  |  |          me.detailSpread.getSheet(0).bind(GC.Spread.Sheets.Events.CellChanged, me.onDetailCellChanged);
 | 
	
	
		
			
				|  | @@ -64,7 +67,6 @@ let rationPM = {
 | 
	
		
			
				|  |  |          feeRateObject.setFeeRateCellCol(dSheet,_.findIndex(me.detailSetting.header,{'dataCode':'feeRate'}));
 | 
	
		
			
				|  |  |          dSheet.name('calc_detail');
 | 
	
		
			
				|  |  |          sheetCommonObj.showData(dSheet, me.detailSetting, me.datas[0].calcItems);
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      onMainEnterCell: function(sender, args) {
 | 
	
		
			
				|  |  |          var me = rationPM;
 |