Explorar o código

清单显示取费类别。

Chenshilong %!s(int64=7) %!d(string=hai) anos
pai
achega
9a8f5ee2e6

+ 6 - 0
web/building_saas/main/js/views/main_tree_col.js

@@ -14,6 +14,12 @@ let MainTreeCol = {
             } else if (node.sourceType === projectObj.project.ration_glj.getSourceType()) {
                 return '主';
             }
+        },
+
+        calcProgramName: function (node) {
+            let prgmID = node.data.programID;
+            if (!prgmID) return;
+            return projectObj.project.calcProgram.compiledTemplates[prgmID].name;
         }
     },
     readOnly: {

+ 6 - 3
web/building_saas/main/js/views/project_view.js

@@ -335,10 +335,15 @@ var projectObj = {
         this.project = PROJECT.createNew(scUrlUtil.GetQueryString('project'), userID);
         this.project.loadDatas(function (err) {
             if (!err) {
+                that.project.calcProgram.compileAllTemps();
                 that.project.calcFields = JSON.parse(JSON.stringify(feeType));
                 that.project.initCalcFields();
                 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;
                 TREE_SHEET_HELPER.initSetting($('#billsSpread')[0], that.project.projSetting.mainGridSetting);
                 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.showTreeData();
                 that.mainController.bind('refreshBaseActn', that.refreshBaseActn);