Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/extend/context.js

@@ -11,5 +11,5 @@
 const moment = require('moment');
 
 module.exports = {
-    moment: moment,
-};
+    moment,
+};

app/public/report/js/rpt_custom.js

@@ -396,7 +396,7 @@ const rptCustomObj = (function () {
                 $('#audit-select-hint').html('未选择' + s.attributes['sf-title'].value).show();
                 return;
             }
-            data.audit_select.push(sf);
+            data.audit_select.push({...sf, sort: s.selectedIndex});
         }
         $('#audit-select-hint').hide();
         postData('/report/cDefine', data, function (result) {

build_min.js

@@ -12,7 +12,7 @@
 const Uglyfy = require('uglify-es');
 const fs = require('fs');
 const JsFiles = require('./config/web');
-const version = require('./config/config.default')({baseDir: __dirname + '/app', root: __dirname, name: 'calc'}).version;
+const version = require('./config/config.default')({ baseDir: __dirname + '/app', root: __dirname, name: 'calc' }).version;
 const savePath = __dirname + '/app' + JsFiles.webPath;
 
 if (!fs.existsSync(savePath)) fs.mkdirSync(savePath);
@@ -27,7 +27,7 @@ for (const c in JsFiles.controller) {
             for (const f of action.mergeFiles) {
                 code = code + fs.readFileSync(__dirname + '/app' + f, 'utf8');
             }
-            fs.writeFileSync(minFileName, Uglyfy.minify(code, {mangle: true}).code);
+            fs.writeFileSync(minFileName, Uglyfy.minify(code, { mangle: true }).code);
         }
     }
 }

builder_report_index_define.js

@@ -60,7 +60,7 @@ const ledger_cooperation = {
         { name: '台账id', field: 'ledger_id', type: dataType.int },
         { name: '密码', field: 'pwd', type: dataType.str },
         { name: '电子签名地址', field: 'sign_path', type: dataType.str },
-    ]
+    ],
 };
 // 其他台账
 const stage_jgcl = {
@@ -115,8 +115,8 @@ const stage_bonus = {
         { name: '备注', field: 'memo', type: dataType.str },
         { name: '期历史记录', field: 'shistory', type: dataType.str },
         { name: '排序', field: 'order', type: dataType.int },
-        { name: '编号', field: 'code', type: dataType.str},
-        { name: '发文单位', field: 'doc_co', type: dataType.str},
+        { name: '编号', field: 'code', type: dataType.str },
+        { name: '发文单位', field: 'doc_co', type: dataType.str },
         { name: '类型', field: 'b_type', type: dataType.str },
     ],
 };
@@ -256,19 +256,19 @@ const stage_bills = {
         { name: '清单编号', field: 'b_code', type: dataType.str },
         { name: '名称', field: 'name', type: dataType.str },
         { name: '单位', field: 'unit', type: dataType.str }, // 12
-        { name: '单价', field: 'unit_price', type: dataType.currency, tag: {type: 'up'} },
+        { name: '单价', field: 'unit_price', type: dataType.currency, tag: { type: 'up' } },
 
-        { name: '签约-数量', field: 'deal_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '签约-金额', field: 'deal_tp', type: dataType.currency, tag: {type: 'tp'} },
+        { name: '签约-数量', field: 'deal_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '签约-金额', field: 'deal_tp', type: dataType.currency, tag: { type: 'tp' } },
 
-        { name: '施工复核-数量', field: 'sgfh_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '施工复核-金额', field: 'sgfh_tp', type: dataType.currency, tag: {type: 'tp'} },
-        { name: '设计错漏-数量', field: 'sjcl_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '设计错漏-金额', field: 'sjcl_tp', type: dataType.currency, tag: {type: 'tp'} },
-        { name: '其他错漏-数量', field: 'qtcl_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '其他错漏-金额', field: 'qtcl_tp', type: dataType.currency, tag: {type: 'tp'} },
-        { name: '台账-数量', field: 'quantity', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '台账-金额', field: 'total_price', type: dataType.currency, tag: {type: 'tp'} },
+        { name: '施工复核-数量', field: 'sgfh_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '施工复核-金额', field: 'sgfh_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '设计错漏-数量', field: 'sjcl_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '设计错漏-金额', field: 'sjcl_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '其他错漏-数量', field: 'qtcl_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '其他错漏-金额', field: 'qtcl_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '台账-数量', field: 'quantity', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '台账-金额', field: 'total_price', type: dataType.currency, tag: { type: 'tp' } },
 
         { name: '项目节-数量1', field: 'dgn_qty1', type: dataType.currency },
         { name: '项目节-数量2', field: 'dgn_qty2', type: dataType.currency },
@@ -278,29 +278,29 @@ const stage_bills = {
         { name: '节点类型', field: 'node_type', type: dataType.int },
         { name: '总额计量', field: 'is_tp', type: dataType.int },
 
-        { name: '本期-合同-数量', field: 'contract_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '本期-合同-金额', field: 'contract_tp', type: dataType.currency, tag: {type: 'tp'} },
-        { name: '本期-数量变更-数量', field: 'qc_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '本期-数量变更-金额', field: 'qc_tp', type: dataType.currency, tag: {type: 'tp'} },
-        { name: '本期-完成-数量', field: 'gather_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '本期-完成-金额', field: 'gather_tp', type: dataType.currency, tag: {type: 'tp'} },
+        { name: '本期-合同-数量', field: 'contract_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '本期-合同-金额', field: 'contract_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '本期-数量变更-数量', field: 'qc_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '本期-数量变更-金额', field: 'qc_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '本期-完成-数量', field: 'gather_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '本期-完成-金额', field: 'gather_tp', type: dataType.currency, tag: { type: 'tp' } },
         { name: '本期批注', field: 'postil', type: dataType.str },
 
-        { name: '截止上期-合同-数量', field: 'pre_contract_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '截止上期-合同-金额', field: 'pre_contract_tp', type: dataType.currency, tag: {type: 'tp'} },
-        { name: '截止上期-数量变更-数量', field: 'pre_qc_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '截止上期-数量变更-金额', field: 'pre_qc_tp', type: dataType.currency, tag: {type: 'tp'} },
-        { name: '截止上期-完成-数量', field: 'pre_gather_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '截止上期-完成-金额', field: 'pre_gather_tp', type: dataType.currency, tag: {type: 'tp'} },
-
-        { name: '截止本期-合同-数量', field: 'end_contract_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '截止本期-合同-金额', field: 'end_contract_tp', type: dataType.currency, tag: {type: 'tp'} },
-        { name: '截止本期-数量变更-数量', field: 'end_qc_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '截止本期-数量变更-金额', field: 'end_qc_tp', type: dataType.currency, tag: {type: 'tp'} },
-        { name: '截止本期-完成-数量', field: 'end_gather_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '截止本期-完成-金额', field: 'end_gather_tp', type: dataType.currency, tag: {type: 'tp'} },
-
-        { name: '(台账 + 截止本期变更)-金额', field: 'final_tp', type: dataType.currency, tag: {type: 'tp'} },
+        { name: '截止上期-合同-数量', field: 'pre_contract_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '截止上期-合同-金额', field: 'pre_contract_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '截止上期-数量变更-数量', field: 'pre_qc_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '截止上期-数量变更-金额', field: 'pre_qc_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '截止上期-完成-数量', field: 'pre_gather_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '截止上期-完成-金额', field: 'pre_gather_tp', type: dataType.currency, tag: { type: 'tp' } },
+
+        { name: '截止本期-合同-数量', field: 'end_contract_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '截止本期-合同-金额', field: 'end_contract_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '截止本期-数量变更-数量', field: 'end_qc_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '截止本期-数量变更-金额', field: 'end_qc_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '截止本期-完成-数量', field: 'end_gather_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '截止本期-完成-金额', field: 'end_gather_tp', type: dataType.currency, tag: { type: 'tp' } },
+
+        { name: '(台账 + 截止本期变更)-金额', field: 'final_tp', type: dataType.currency, tag: { type: 'tp' } },
         { name: '截止本期完成率(%)', field: 'final_ratio', type: dataType.double },
 
         { name: '本期-数量变更-变更令', field: 'qc_bgl_code', type: dataType.str },
@@ -343,19 +343,19 @@ const stage_bills_compare = {
         { name: '清单编号', field: 'b_code', type: dataType.str },
         { name: '名称', field: 'name', type: dataType.str },
         { name: '单位', field: 'unit', type: dataType.str }, // 12
-        { name: '单价', field: 'unit_price', type: dataType.currency, tag: {type: 'up'} },
+        { name: '单价', field: 'unit_price', type: dataType.currency, tag: { type: 'up' } },
 
-        { name: '签约-数量', field: 'deal_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '签约-金额', field: 'deal_tp', type: dataType.currency, tag: {type: 'tp'} },
+        { name: '签约-数量', field: 'deal_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '签约-金额', field: 'deal_tp', type: dataType.currency, tag: { type: 'tp' } },
 
-        { name: '施工复核-数量', field: 'sgfh_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '施工复核-金额', field: 'sgfh_tp', type: dataType.currency, tag: {type: 'tp'} },
-        { name: '设计错漏-数量', field: 'sjcl_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '设计错漏-金额', field: 'sjcl_tp', type: dataType.currency, tag: {type: 'tp'} },
-        { name: '其他错漏-数量', field: 'qtcl_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '其他错漏-金额', field: 'qtcl_tp', type: dataType.currency, tag: {type: 'tp'} },
-        { name: '台账-数量', field: 'quantity', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '台账-金额', field: 'total_price', type: dataType.currency, tag: {type: 'tp'} },
+        { name: '施工复核-数量', field: 'sgfh_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '施工复核-金额', field: 'sgfh_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '设计错漏-数量', field: 'sjcl_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '设计错漏-金额', field: 'sjcl_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '其他错漏-数量', field: 'qtcl_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '其他错漏-金额', field: 'qtcl_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '台账-数量', field: 'quantity', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '台账-金额', field: 'total_price', type: dataType.currency, tag: { type: 'tp' } },
 
         { name: '项目节-数量1', field: 'dgn_qty1', type: dataType.currency },
         { name: '项目节-数量2', field: 'dgn_qty2', type: dataType.currency },
@@ -365,82 +365,82 @@ const stage_bills_compare = {
         { name: '节点类型', field: 'node_type', type: dataType.int },
         { name: '总额计量', field: 'is_tp', type: dataType.int },
 
-        { name: '截止上期-合同-数量', field: 'pre_contract_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '截止上期-合同-金额', field: 'pre_contract_tp', type: dataType.currency, tag: {type: 'tp'} },
-        { name: '截止上期-数量变更-数量', field: 'pre_qc_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '截止上期-数量变更-金额', field: 'pre_qc_tp', type: dataType.currency, tag: {type: 'tp'} },
-        { name: '截止上期-完成-数量', field: 'pre_gather_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '截止上期-完成-金额', field: 'pre_gather_tp', type: dataType.currency, tag: {type: 'tp'} },
-
-        { name: '本期-合同-数量_0', field: 'r0_contract_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '本期-合同-金额_0', field: 'r0_contract_tp', type: dataType.currency, tag: {type: 'tp'} },
-        { name: '本期-数量变更-数量_0', field: 'r0_qc_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '本期-数量变更-金额_0', field: 'r0_qc_tp', type: dataType.currency, tag: {type: 'tp'} },
-        { name: '本期-完成-数量_0', field: 'r0_gather_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '本期-完成-金额_0', field: 'r0_gather_tp', type: dataType.currency, tag: {type: 'tp'} },
-
-        { name: '本期-合同-数量_1', field: 'r1_contract_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '本期-合同-金额_1', field: 'r1_contract_tp', type: dataType.currency, tag: {type: 'tp'} },
-        { name: '本期-数量变更-数量_1', field: 'r1_qc_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '本期-数量变更-金额_1', field: 'r1_qc_tp', type: dataType.currency, tag: {type: 'tp'} },
-        { name: '本期-完成-数量_1', field: 'r1_gather_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '本期-完成-金额_1', field: 'r1_gather_tp', type: dataType.currency, tag: {type: 'tp'} },
-
-        { name: '本期-合同-数量_2', field: 'r2_contract_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '本期-合同-金额_2', field: 'r2_contract_tp', type: dataType.currency, tag: {type: 'tp'} },
-        { name: '本期-数量变更-数量_2', field: 'r2_qc_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '本期-数量变更-金额_2', field: 'r2_qc_tp', type: dataType.currency, tag: {type: 'tp'} },
-        { name: '本期-完成-数量_2', field: 'r2_gather_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '本期-完成-金额_2', field: 'r2_gather_tp', type: dataType.currency, tag: {type: 'tp'} },
-
-        { name: '本期-合同-数量_3', field: 'r3_contract_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '本期-合同-金额_3', field: 'r3_contract_tp', type: dataType.currency, tag: {type: 'tp'} },
-        { name: '本期-数量变更-数量_3', field: 'r3_qc_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '本期-数量变更-金额_3', field: 'r3_qc_tp', type: dataType.currency, tag: {type: 'tp'} },
-        { name: '本期-完成-数量_3', field: 'r3_gather_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '本期-完成-金额_3', field: 'r3_gather_tp', type: dataType.currency, tag: {type: 'tp'} },
-
-        { name: '本期-合同-数量_4', field: 'r4_contract_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '本期-合同-金额_4', field: 'r4_contract_tp', type: dataType.currency, tag: {type: 'tp'} },
-        { name: '本期-数量变更-数量_4', field: 'r4_qc_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '本期-数量变更-金额_4', field: 'r4_qc_tp', type: dataType.currency, tag: {type: 'tp'} },
-        { name: '本期-完成-数量_4', field: 'r4_gather_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '本期-完成-金额_4', field: 'r4_gather_tp', type: dataType.currency, tag: {type: 'tp'} },
-
-        { name: '本期-合同-数量_5', field: 'r5_contract_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '本期-合同-金额_5', field: 'r5_contract_tp', type: dataType.currency, tag: {type: 'tp'} },
-        { name: '本期-数量变更-数量_5', field: 'r5_qc_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '本期-数量变更-金额_5', field: 'r5_qc_tp', type: dataType.currency, tag: {type: 'tp'} },
-        { name: '本期-完成-数量_5', field: 'r5_gather_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '本期-完成-金额_5', field: 'r5_gather_tp', type: dataType.currency, tag: {type: 'tp'} },
-
-        { name: '本期-合同-数量_6', field: 'r6_contract_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '本期-合同-金额_6', field: 'r6_contract_tp', type: dataType.currency, tag: {type: 'tp'} },
-        { name: '本期-数量变更-数量_6', field: 'r6_qc_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '本期-数量变更-金额_6', field: 'r6_qc_tp', type: dataType.currency, tag: {type: 'tp'} },
-        { name: '本期-完成-数量_6', field: 'r6_gather_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '本期-完成-金额_6', field: 'r6_gather_tp', type: dataType.currency, tag: {type: 'tp'} },
-
-        { name: '本期-合同-数量_7', field: 'r7_contract_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '本期-合同-金额_7', field: 'r7_contract_tp', type: dataType.currency, tag: {type: 'tp'} },
-        { name: '本期-数量变更-数量_7', field: 'r7_qc_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '本期-数量变更-金额_7', field: 'r7_qc_tp', type: dataType.currency, tag: {type: 'tp'} },
-        { name: '本期-完成-数量_7', field: 'r7_gather_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '本期-完成-金额_7', field: 'r7_gather_tp', type: dataType.currency, tag: {type: 'tp'} },
-
-        { name: '本期-合同-数量_8', field: 'r8_contract_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '本期-合同-金额_8', field: 'r8_contract_tp', type: dataType.currency, tag: {type: 'tp'} },
-        { name: '本期-数量变更-数量_8', field: 'r8_qc_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '本期-数量变更-金额_8', field: 'r8_qc_tp', type: dataType.currency, tag: {type: 'tp'} },
-        { name: '本期-完成-数量_8', field: 'r8_gather_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '本期-完成-金额_8', field: 'r8_gather_tp', type: dataType.currency, tag: {type: 'tp'} },
-
-        { name: '本期-合同-数量_9', field: 'r9_contract_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '本期-合同-金额_9', field: 'r9_contract_tp', type: dataType.currency, tag: {type: 'tp'} },
-        { name: '本期-数量变更-数量_9', field: 'r9_qc_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '本期-数量变更-金额_9', field: 'r9_qc_tp', type: dataType.currency, tag: {type: 'tp'} },
-        { name: '本期-完成-数量_9', field: 'r9_gather_qty', type: dataType.currency, tag: {type: 'qty', unitKey: 12} },
-        { name: '本期-完成-金额_9', field: 'r9_gather_tp', type: dataType.currency, tag: {type: 'tp'} },
+        { name: '截止上期-合同-数量', field: 'pre_contract_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '截止上期-合同-金额', field: 'pre_contract_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '截止上期-数量变更-数量', field: 'pre_qc_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '截止上期-数量变更-金额', field: 'pre_qc_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '截止上期-完成-数量', field: 'pre_gather_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '截止上期-完成-金额', field: 'pre_gather_tp', type: dataType.currency, tag: { type: 'tp' } },
+
+        { name: '本期-合同-数量_0', field: 'r0_contract_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '本期-合同-金额_0', field: 'r0_contract_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '本期-数量变更-数量_0', field: 'r0_qc_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '本期-数量变更-金额_0', field: 'r0_qc_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '本期-完成-数量_0', field: 'r0_gather_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '本期-完成-金额_0', field: 'r0_gather_tp', type: dataType.currency, tag: { type: 'tp' } },
+
+        { name: '本期-合同-数量_1', field: 'r1_contract_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '本期-合同-金额_1', field: 'r1_contract_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '本期-数量变更-数量_1', field: 'r1_qc_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '本期-数量变更-金额_1', field: 'r1_qc_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '本期-完成-数量_1', field: 'r1_gather_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '本期-完成-金额_1', field: 'r1_gather_tp', type: dataType.currency, tag: { type: 'tp' } },
+
+        { name: '本期-合同-数量_2', field: 'r2_contract_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '本期-合同-金额_2', field: 'r2_contract_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '本期-数量变更-数量_2', field: 'r2_qc_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '本期-数量变更-金额_2', field: 'r2_qc_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '本期-完成-数量_2', field: 'r2_gather_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '本期-完成-金额_2', field: 'r2_gather_tp', type: dataType.currency, tag: { type: 'tp' } },
+
+        { name: '本期-合同-数量_3', field: 'r3_contract_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '本期-合同-金额_3', field: 'r3_contract_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '本期-数量变更-数量_3', field: 'r3_qc_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '本期-数量变更-金额_3', field: 'r3_qc_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '本期-完成-数量_3', field: 'r3_gather_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '本期-完成-金额_3', field: 'r3_gather_tp', type: dataType.currency, tag: { type: 'tp' } },
+
+        { name: '本期-合同-数量_4', field: 'r4_contract_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '本期-合同-金额_4', field: 'r4_contract_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '本期-数量变更-数量_4', field: 'r4_qc_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '本期-数量变更-金额_4', field: 'r4_qc_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '本期-完成-数量_4', field: 'r4_gather_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '本期-完成-金额_4', field: 'r4_gather_tp', type: dataType.currency, tag: { type: 'tp' } },
+
+        { name: '本期-合同-数量_5', field: 'r5_contract_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '本期-合同-金额_5', field: 'r5_contract_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '本期-数量变更-数量_5', field: 'r5_qc_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '本期-数量变更-金额_5', field: 'r5_qc_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '本期-完成-数量_5', field: 'r5_gather_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '本期-完成-金额_5', field: 'r5_gather_tp', type: dataType.currency, tag: { type: 'tp' } },
+
+        { name: '本期-合同-数量_6', field: 'r6_contract_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '本期-合同-金额_6', field: 'r6_contract_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '本期-数量变更-数量_6', field: 'r6_qc_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '本期-数量变更-金额_6', field: 'r6_qc_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '本期-完成-数量_6', field: 'r6_gather_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '本期-完成-金额_6', field: 'r6_gather_tp', type: dataType.currency, tag: { type: 'tp' } },
+
+        { name: '本期-合同-数量_7', field: 'r7_contract_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '本期-合同-金额_7', field: 'r7_contract_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '本期-数量变更-数量_7', field: 'r7_qc_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '本期-数量变更-金额_7', field: 'r7_qc_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '本期-完成-数量_7', field: 'r7_gather_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '本期-完成-金额_7', field: 'r7_gather_tp', type: dataType.currency, tag: { type: 'tp' } },
+
+        { name: '本期-合同-数量_8', field: 'r8_contract_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '本期-合同-金额_8', field: 'r8_contract_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '本期-数量变更-数量_8', field: 'r8_qc_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '本期-数量变更-金额_8', field: 'r8_qc_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '本期-完成-数量_8', field: 'r8_gather_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '本期-完成-金额_8', field: 'r8_gather_tp', type: dataType.currency, tag: { type: 'tp' } },
+
+        { name: '本期-合同-数量_9', field: 'r9_contract_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '本期-合同-金额_9', field: 'r9_contract_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '本期-数量变更-数量_9', field: 'r9_qc_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '本期-数量变更-金额_9', field: 'r9_qc_tp', type: dataType.currency, tag: { type: 'tp' } },
+        { name: '本期-完成-数量_9', field: 'r9_gather_qty', type: dataType.currency, tag: { type: 'qty', unitKey: 12 } },
+        { name: '本期-完成-金额_9', field: 'r9_gather_tp', type: dataType.currency, tag: { type: 'tp' } },
 
         { name: '章节编号', field: 'chapter', type: dataType.str },
         { name: '最底层项目节id', field: 'leaf_xmj_id', type: dataType.str },
@@ -546,9 +546,9 @@ const month_progress = {
     prefix: '工程进度',
     cols: [
         { name: '计量年月', field: 'month', type: dataType.str },
-        { name: '本月计量', field: 'tp', type: dataType.currency, tag: {type: 'tp'} },
+        { name: '本月计量', field: 'tp', type: dataType.currency, tag: { type: 'tp' } },
         { name: '本月完成度', field: 'ratio', type: dataType.double },
-        { name: '累计计量', field: 'end_tp', type: dataType.currency, tag: {type: 'tp'} },
+        { name: '累计计量', field: 'end_tp', type: dataType.currency, tag: { type: 'tp' } },
         { name: '累计完成度', field: 'end_ratio', type: dataType.double },
     ],
 };
@@ -897,7 +897,7 @@ const gather_tender_info = {
     key: 'mem_gather_tender_info',
     prefix: '汇总-标段信息',
     cols: [
-        { name: 'id', field: 'id', type: dataType.int},
+        { name: 'id', field: 'id', type: dataType.int },
         { name: '名称', field: 'name', type: dataType.str },
         { name: '是否特殊标', field: 'spec', type: dataType.str },
 
@@ -922,38 +922,38 @@ const gather_tender_info = {
 
         { name: '签约清单-金额', field: 'deal_bills_tp', type: dataType.currency },
 
-        { name: '合同信息-建设项目名称', field: 'deal_info.buildName', type: dataType.str},
-        { name: '合同信息-合同编号', field: 'deal_info.dealCode', type: dataType.str},
-        { name: '合同信息-合同名称', field: 'deal_info.dealName', type: dataType.str},
+        { name: '合同信息-建设项目名称', field: 'deal_info.buildName', type: dataType.str },
+        { name: '合同信息-合同编号', field: 'deal_info.dealCode', type: dataType.str },
+        { name: '合同信息-合同名称', field: 'deal_info.dealName', type: dataType.str },
 
-        { name: '参建单位-建设单位-单位名称', field: 'construction_unit.build.company', type: dataType.str},
-        { name: '参建单位-建设单位-法人代表', field: 'construction_unit.build.corporation', type: dataType.str},
-        { name: '参建单位-建设单位-签订日期', field: 'construction_unit.build.date', type: dataType.str},
+        { name: '参建单位-建设单位-单位名称', field: 'construction_unit.build.company', type: dataType.str },
+        { name: '参建单位-建设单位-法人代表', field: 'construction_unit.build.corporation', type: dataType.str },
+        { name: '参建单位-建设单位-签订日期', field: 'construction_unit.build.date', type: dataType.str },
 
-        { name: '参建单位-承包单位1-单位名称', field: 'construction_unit.contract1.company', type: dataType.str},
-        { name: '参建单位-承包单位1-法人代表', field: 'construction_unit.contract1.corporation', type: dataType.str},
-        { name: '参建单位-承包单位1-签订日期', field: 'construction_unit.contract1.date', type: dataType.str},
+        { name: '参建单位-承包单位1-单位名称', field: 'construction_unit.contract1.company', type: dataType.str },
+        { name: '参建单位-承包单位1-法人代表', field: 'construction_unit.contract1.corporation', type: dataType.str },
+        { name: '参建单位-承包单位1-签订日期', field: 'construction_unit.contract1.date', type: dataType.str },
 
-        { name: '参建单位-承包单位2-单位名称', field: 'construction_unit.contract2.company', type: dataType.str},
-        { name: '参建单位-承包单位2-法人代表', field: 'construction_unit.contract2.corporation', type: dataType.str},
-        { name: '参建单位-承包单位2-签订日期', field: 'construction_unit.contract2.date', type: dataType.str},
+        { name: '参建单位-承包单位2-单位名称', field: 'construction_unit.contract2.company', type: dataType.str },
+        { name: '参建单位-承包单位2-法人代表', field: 'construction_unit.contract2.corporation', type: dataType.str },
+        { name: '参建单位-承包单位2-签订日期', field: 'construction_unit.contract2.date', type: dataType.str },
 
-        { name: '参建单位-监理单位1-单位名称', field: 'construction_unit.supervision1.company', type: dataType.str},
-        { name: '参建单位-监理单位1-法人代表', field: 'construction_unit.supervision1.corporation', type: dataType.str},
-        { name: '参建单位-监理单位1-签订日期', field: 'construction_unit.supervision1.date', type: dataType.str},
+        { name: '参建单位-监理单位1-单位名称', field: 'construction_unit.supervision1.company', type: dataType.str },
+        { name: '参建单位-监理单位1-法人代表', field: 'construction_unit.supervision1.corporation', type: dataType.str },
+        { name: '参建单位-监理单位1-签订日期', field: 'construction_unit.supervision1.date', type: dataType.str },
 
-        { name: '参建单位-监理单位2-单位名称', field: 'construction_unit.supervision2.company', type: dataType.str},
-        { name: '参建单位-监理单位2-法人代表', field: 'construction_unit.supervision2.corporation', type: dataType.str},
-        { name: '参建单位-监理单位2-签订日期', field: 'construction_unit.supervision2.date', type: dataType.str},
+        { name: '参建单位-监理单位2-单位名称', field: 'construction_unit.supervision2.company', type: dataType.str },
+        { name: '参建单位-监理单位2-法人代表', field: 'construction_unit.supervision2.corporation', type: dataType.str },
+        { name: '参建单位-监理单位2-签订日期', field: 'construction_unit.supervision2.date', type: dataType.str },
 
-        { name: '技术参数-公路等级', field: 'tech_param.loadLevel', type: dataType.int},
-        { name: '技术参数-长度(KM)', field: 'tech_param.loadLength', type: dataType.int},
-        { name: '技术参数-起始桩号', field: 'tech_param.startPeg', type: dataType.str},
-        { name: '技术参数-终止桩号', field: 'tech_param.endPeg', type: dataType.str},
-        { name: '技术参数-车道数', field: 'tech_param.laneCount', type: dataType.int},
-        { name: '技术参数-合同工期', field: 'tech_param.dealPeriod', type: dataType.str},
-        { name: '技术参数-开工日期', field: 'tech_param.startDate', type: dataType.str},
-        { name: '技术参数-计划完工日期', field: 'tech_param.planEndDate', type: dataType.str},
+        { name: '技术参数-公路等级', field: 'tech_param.loadLevel', type: dataType.int },
+        { name: '技术参数-长度(KM)', field: 'tech_param.loadLength', type: dataType.int },
+        { name: '技术参数-起始桩号', field: 'tech_param.startPeg', type: dataType.str },
+        { name: '技术参数-终止桩号', field: 'tech_param.endPeg', type: dataType.str },
+        { name: '技术参数-车道数', field: 'tech_param.laneCount', type: dataType.int },
+        { name: '技术参数-合同工期', field: 'tech_param.dealPeriod', type: dataType.str },
+        { name: '技术参数-开工日期', field: 'tech_param.startDate', type: dataType.str },
+        { name: '技术参数-计划完工日期', field: 'tech_param.planEndDate', type: dataType.str },
 
         { name: '合同参数-签约合同价', field: 'deal_param.contractPrice', type: dataType.currency },
         { name: '合同参数-暂列金额', field: 'deal_param.zanLiePrice', type: dataType.currency },
@@ -975,13 +975,13 @@ const gather_tender_info = {
         { name: '付款账号-农民工工资专用账户-联系人', field: 'pay_account.worker.contact', type: dataType.str },
         { name: '付款账号-农民工工资专用账户-联系电话', field: 'pay_account.worker.phone', type: dataType.str },
 
-        { name: '合同信息-工程类别', field: 'deal_info.projectType', type: dataType.str},
-        { name: '合同信息-合同类别', field: 'deal_info.dealType', type: dataType.str},
-        { name: '合同信息-结算书编号', field: 'deal_info.finalCode', type: dataType.str},
+        { name: '合同信息-工程类别', field: 'deal_info.projectType', type: dataType.str },
+        { name: '合同信息-合同类别', field: 'deal_info.dealType', type: dataType.str },
+        { name: '合同信息-结算书编号', field: 'deal_info.finalCode', type: dataType.str },
 
-        { name: '技术参数-实际开工日期', field: 'tech_param.realStartDate', type: dataType.str},
-        { name: '技术参数-实际完工日期', field: 'tech_param.realEndDate', type: dataType.str},
-        { name: '技术参数-构造物规模', field: 'tech_param.structureScale', type: dataType.str},
+        { name: '技术参数-实际开工日期', field: 'tech_param.realStartDate', type: dataType.str },
+        { name: '技术参数-实际完工日期', field: 'tech_param.realEndDate', type: dataType.str },
+        { name: '技术参数-构造物规模', field: 'tech_param.structureScale', type: dataType.str },
 
         { name: '中标信息-业主控制价', field: 'bid_info.controlPrice', type: dataType.currency },
         { name: '中标信息-中标价', field: 'bid_info.bidPrice', type: dataType.currency },
@@ -1280,7 +1280,7 @@ const stage_change_ledger = {
     name: '期-变更台账(mem_stage_change_ledger)',
     remark: '',
     key: 'mem_stage_change_ledger',
-    id: 48,
+    id: 49,
     prefix: '期-变更台账',
     cols: [
         { name: '项目节编号', field: 'code', type: dataType.str },
@@ -1300,7 +1300,7 @@ const stage_change_ledger = {
         { name: '变更令-工程变更理由及内容', field: 'c_content', type: dataType.str },
         { name: '变更令-工程变更合同依据', field: 'c_basis', type: dataType.str },
         { name: '变更令-变更状态发生时间', field: 'c_cin_time', type: dataType.str },
-    ]
+    ],
 };
 
 const recursiveMkdirSync = async function(pathName) {
@@ -1407,6 +1407,7 @@ const defines = [
     gather_stage_bills, gather_tender_info, gather_stage_pay, gather_deal_bills,
     material, materialGl,
     stage_sum_bills, stage_sum_pay, stage_audit, sign_select,
+    stage_change_bills, stage_change_ledger,
 ];
 for (const d of defines) {
     exportTableDefine(d);

test/app/lib/rpt_data_analysis.test.js

@@ -627,4 +627,38 @@ describe('test/app/service/report_memory.test.js', () => {
         assert(testData18.bills[9].ximu === '04');
         assert(testData18.bills[10].ximu === 'GD0401');
     });
+
+
+
+    it('test treeFilter', function* () {
+        const ctx = app.mockContext(mockData);
+        const orgData = [
+            { id: 1, pid: -1, order: 1, level: 1, full_path: '1', code: '1', is_leaf: false },
+            { id: 2, pid: 1, order: 1, level: 2, full_path: '1.2', code: '1-1', is_leaf: false },
+            { id: 6, pid: 2, order: 1, level: 3, full_path: '1.2.6', code: '1-1-1', is_leaf: false },
+            { id: 7, pid: 6, order: 1, level: 4, full_path: '1.2.6.7', code: '202-1', is_leaf: false },
+            { id: 10, pid: 7, order: 2, level: 5, full_path: '1.2.6.7.10', code: '202-1-a', is_leaf: true },
+            { id: 9, pid: 7, order: 1, level: 5, full_path: '1.2.6.7.9', code: '202-1-b', is_leaf: true },
+            { id: 8, pid: 6, order: 2, level: 4, full_path: '1.2.6.8', code: '202-2', is_leaf: false },
+            { id: 11, pid: 8, order: 1, level: 5, full_path: '1.2.6.8.11', code: '202-2-c', is_leaf: true },
+            { id: 12, pid: 8, order: 2, level: 5, full_path: '1.2.6.8.12', code: '202-2-e', is_leaf: true },
+            { id: 13, pid: 2, order: 2, level: 3, full_path: '1.2.13', code: '1-1-2', is_leaf: true },
+            { id: 14, pid: 2, order: 3, level: 3, full_path: '1.2.14', code: '1-1-3', is_leaf: true },
+            { id: 3, pid: 1, order: 2, level: 2, full_path: '1.3', code: '1-2', is_leaf: false },
+            { id: 15, pid: 3, order: 1, level: 3, full_path: '1.3.15', code: '1-2-1', is_leaf: true },
+            { id: 4, pid: 1, order: 3, level: 2, full_path: '1.4', code: '1-3', is_leaf: false },
+            { id: 16, pid: 4, order: 1, level: 3, full_path: '1.4.16', code: '1-3-1', is_leaf: true },
+            { id: 5, pid: 1, order: 4, level: 2, full_path: '1.5', code: '1-4', is_leaf: true },
+        ];
+        const data = { mem_stage_bills: orgData };
+        reportDataAnalysis.analysisObj.treeFilter.fun(ctx, data, [], {
+            table: 'mem_stage_bills',
+            type: 'match',
+            subType: 'posterity',
+            condition: [
+                { field: 'code', type: 'str', value: '1-1', operate: '=' },
+            ],
+        });
+        assert(data.mem_stage_bills.length = 9);
+    });
 });