|
@@ -335,10 +335,15 @@ var projectObj = {
|
|
this.project = PROJECT.createNew(scUrlUtil.GetQueryString('project'), userID);
|
|
this.project = PROJECT.createNew(scUrlUtil.GetQueryString('project'), userID);
|
|
this.project.loadDatas(function (err) {
|
|
this.project.loadDatas(function (err) {
|
|
if (!err) {
|
|
if (!err) {
|
|
|
|
+ that.project.calcProgram.compileAllTemps();
|
|
that.project.calcFields = JSON.parse(JSON.stringify(feeType));
|
|
that.project.calcFields = JSON.parse(JSON.stringify(feeType));
|
|
that.project.initCalcFields();
|
|
that.project.initCalcFields();
|
|
let str = JSON.stringify(that.project.projSetting.main_tree_col);
|
|
let str = JSON.stringify(that.project.projSetting.main_tree_col);
|
|
- that.project.projSetting.mainGridSetting = JSON.parse(str);
|
|
|
|
|
|
+ let strObj = JSON.parse(str);
|
|
|
|
+ // for test. 后端没有绑定,暂时写死用于测试。
|
|
|
|
+ strObj.cols[14].data.field = 'programID';
|
|
|
|
+ strObj.cols[14].data.getText = 'getText.calcProgramName';
|
|
|
|
+ that.project.projSetting.mainGridSetting = strObj;
|
|
that.project.projSetting.mainGridSetting.frozenCols = 4;
|
|
that.project.projSetting.mainGridSetting.frozenCols = 4;
|
|
TREE_SHEET_HELPER.initSetting($('#billsSpread')[0], that.project.projSetting.mainGridSetting);
|
|
TREE_SHEET_HELPER.initSetting($('#billsSpread')[0], that.project.projSetting.mainGridSetting);
|
|
that.project.projSetting.mainGridSetting.cols.forEach(function (col) {
|
|
that.project.projSetting.mainGridSetting.cols.forEach(function (col) {
|
|
@@ -362,8 +367,6 @@ var projectObj = {
|
|
}
|
|
}
|
|
});
|
|
});
|
|
|
|
|
|
- that.project.calcProgram.compileAllTemps();
|
|
|
|
-
|
|
|
|
that.mainController = TREE_SHEET_CONTROLLER.createNew(that.project.mainTree, that.mainSpread.getActiveSheet(), that.project.projSetting.mainGridSetting);
|
|
that.mainController = TREE_SHEET_CONTROLLER.createNew(that.project.mainTree, that.mainSpread.getActiveSheet(), that.project.projSetting.mainGridSetting);
|
|
that.mainController.showTreeData();
|
|
that.mainController.showTreeData();
|
|
that.mainController.bind('refreshBaseActn', that.refreshBaseActn);
|
|
that.mainController.bind('refreshBaseActn', that.refreshBaseActn);
|