Browse Source

mem_gather_stage_bills

MaiXinRong 5 years ago
parent
commit
46630bd765
2 changed files with 9 additions and 5 deletions
  1. 2 0
      app/lib/ledger.js
  2. 7 5
      builder_report_index_define.js

+ 2 - 0
app/lib/ledger.js

@@ -182,6 +182,7 @@ class baseTree {
         const datas = [];
         for (const node of this.nodes) {
             if (node.b_code && node.b_code !== '') node.chapter = this.ctx.helper.getChapterCode(node.b_code);
+            node.is_leaf = !node.children || node.children.length === 0;
             const data = {};
             for (const field of fields) {
                 data[field] = node[field];
@@ -202,6 +203,7 @@ class baseTree {
                 continue;
             }
             if (node.b_code && node.b_code !== '') node.chapter = this.ctx.helper.getChapterCode(node.b_code);
+            node.is_leaf = !node.children || node.children.length === 0;
             const data = {};
             for (const field in node) {
                 if (fields.indexOf(field) === -1) {

+ 7 - 5
builder_report_index_define.js

@@ -785,11 +785,11 @@ const gather_stage_bills = {
 
         { name: '交叉排序', field: 'cross_index', type: dataType.int },
 
-        { name: '树结构-id', fields: 'id', type: dataType.int },
-        { name: '树结构-父项id', fields: 'pid', type: dataType.int },
-        { name: '树结构-层次', fields: 'level', type: dataType.int },
-        { name: '树结构-排序', fields: 'order', type: dataType.int },
-        { name: '树结构-完整路径', fields: 'full_path', type: dataType.str },
+        { name: '树结构-id', field: 'id', type: dataType.int },
+        { name: '树结构-父项id', field: 'pid', type: dataType.int },
+        { name: '树结构-层次', field: 'level', type: dataType.int },
+        { name: '树结构-排序', field: 'order', type: dataType.int },
+        { name: '树结构-完整路径', field: 'full_path', type: dataType.str },
 
         { name: '(特殊1-需替换key1)台账-设计数量1', field: 'ts_key1_dgn_qty1', type: dataType.currency },
         { name: '(特殊1-需替换key1)台账-设计数量2', field: 'ts_key1_dgn_qty2', type: dataType.currency },
@@ -806,6 +806,8 @@ const gather_stage_bills = {
         { name: '(标段)合同-设计数量2', field: 't_deal_dgn_qty2', type: dataType.currency },
         { name: '(标段)变更-设计数量1', field: 't_c_dgn_qty1', type: dataType.currency },
         { name: '(标段)变更-设计数量2', field: 't_c_dgn_qty2', type: dataType.currency },
+
+        { name: '树结构-是否子项', field: 'is_leaf', type: dataType.int },
     ],
 };
 const gather_tender_info = {