Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

app/lib/rpt_data_analysis.js

@@ -858,7 +858,7 @@ const auditSelect = {
     name: '审批人选择',
     hint: '需搭配用户交互--审批人选择一起使用',
     defaultSetting: {
-        table: ['mem_stage_bills_compare', 'mem_stage_pos_compare'],
+        table: ['mem_stage_bills_compare', 'mem_stage_pos_compare', 'mem_stage_pay'],
     },
     _stageBillsCompare(data, order) {
         const fields = [];
@@ -893,6 +893,19 @@ const auditSelect = {
             }
         }
     },
+    _stagePay(data, order) {
+        const fields = [];
+        for (const [i, o] of order.entries()) {
+            const sPrefix = 'r' + o + '_';
+            const tPrefix = 'as' + i + '_';
+            fields.push({source: sPrefix + 'tp', target: tPrefix + 'tp'});
+        }
+        for (const d of data) {
+            for (const f of fields) {
+                d[f.target] = d[f.source];
+            }
+        }
+    },
     fun: function (ctx, data, fieldsKey, options, csRela) {
         if (!ctx.tender || !ctx.stage) return;
         if (!csRela.tplDefine) return;

app/service/report_memory.js

@@ -20,7 +20,7 @@ const changeConst = require('../const/change');
 const stageImTz = 'mem_stage_im_tz';
 const stageImTzBills = 'mem_stage_im_tz_bills';
 const stageImZl = 'mem_stage_im_zl';
-const stageImVersion = '1.0';
+const stageImVersion = '1.3';
 
 const Ledger = require('../lib/ledger');
 
@@ -253,6 +253,7 @@ module.exports = app => {
                 }
                 this.stageImData.main = err.statck ? '数据错误' : err;
             }
+            console.log(this.stageImData.main);
             return this.stageImData.main;
         }
 

config/web.js

@@ -165,6 +165,23 @@ const JsFiles = {
                 ],
                 mergeFile: 'ledger_audit',
             },
+            bwtz: {
+                files: [
+                    "/public/js/spreadjs/sheets/v11/gc.spread.sheets.all.11.2.2.min.js",
+                    "/public/js/decimal.min.js",
+                ],
+                mergeFiles: [
+                    "/public/js/sub_menu.js",
+                    "/public/js/div_resizer.js",
+                    "/public/js/spreadjs_rela/spreadjs_zh.js",
+                    "/public/js/shares/sjs_setting.js",
+                    "/public/js/zh_calc.js",
+                    "/public/js/path_tree.js",
+                    "/public/js/shares/bills_pos_convert.js",
+                    "/public/js/ledger_bwtz.js",
+                ],
+                mergeFile: 'ledger_bwtz',
+            },
             gather: {
                 files: [
                     "/public/js/spreadjs/sheets/v11/gc.spread.sheets.all.11.2.2.min.js",