|
|
@@ -205,8 +205,7 @@ var feeRateObject={
|
|
|
pID = rates[rowIdx].ParentID;
|
|
|
}
|
|
|
// 费率现有可能有多层节点，所以要递归展开父节点
|
|
|
- expandParent(pID,rates,sheet);
|
|
|
-
|
|
|
+ if(pID) expandParent(pID,rates,sheet);
|
|
|
sheet.setSelection(rowIdx, -1, 1, -1);
|
|
|
sheet.showRow(rowIdx, GC.Spread.Sheets.VerticalPosition.center);
|
|
|
feeRateObject.onCellClick({type: 'CellClick'}, {row:rowIdx});
|
|
|
@@ -1006,13 +1005,15 @@ $(function(){
|
|
|
|
|
|
$('#calcBaseFeeRate').on('shown.bs.modal', function (e) {
|
|
|
let toggle = $('#calcBaseFeeRateConf').attr('toggle');
|
|
|
- if(feeRateObject.feeRateSpreads==null){
|
|
|
- feeRateObject.createSheet();
|
|
|
+ if(toggle == 'feeRate'){
|
|
|
+ if(feeRateObject.feeRateSpreads==null){
|
|
|
+ feeRateObject.createSheet();
|
|
|
+ }
|
|
|
+ feeRateObject.feeRateSelection=null;
|
|
|
+ feeRateObject.showFeeRateTree(feeRateObject.feeRateSheet,feeRateObject.sheetSetting,projectObj.project.FeeRate.getActivateFeeRate().rates);
|
|
|
+ feeRateObject.locate();
|
|
|
+ feeRateObject.feeRateSpreads.refresh();
|
|
|
}
|
|
|
- feeRateObject.feeRateSelection=null;
|
|
|
- feeRateObject.showFeeRateTree(feeRateObject.feeRateSheet,feeRateObject.sheetSetting,projectObj.project.FeeRate.getActivateFeeRate().rates);
|
|
|
- feeRateObject.locate();
|
|
|
- feeRateObject.feeRateSpreads.refresh();
|
|
|
});
|
|
|
$('#tabFeeRate').on('shown.bs.tab', function () {
|
|
|
if(feeRateObject.feeRateSpreads){
|
