Merge remote-tracking branch 'remotes/origin/dev' into uat

app/controller/report_controller.js

@@ -1016,7 +1016,7 @@ async function getMultiRptsCommon(ctx, params, outputType, baseDir) {
                 ? await ctx.service.rptCustomDefine.getCustomDefine(params.tender_id, params.stage_id, rptTpl.id)
                 : await ctx.service.rptCustomDefine.getCustomDefine(params.tender_id, -1, rptTpl.id);
             console.log(rptTpl[JV.NODE_CUSTOM_DEFINE],customSelect);
-            if (rptTpl[JV.NODE_CUSTOM_DEFINE] && rptTpl[JV.NODE_CUSTOM_DEFINE][JV.NODE_CUS_CHANGE_SELECT].enable) {
+            if (rptTpl[JV.NODE_CUSTOM_DEFINE] && rptTpl[JV.NODE_CUSTOM_DEFINE][JV.NODE_CUS_CHANGE_SELECT] && rptTpl[JV.NODE_CUSTOM_DEFINE][JV.NODE_CUS_CHANGE_SELECT].enable) {
                 customSelect = { tid: params.tender_id, rid: params.rpt_tpl_id, sid: -1, change_select: params.customSelect[tplIdx].change_select };
             }
 

app/public/js/ledger.js

@@ -3371,10 +3371,13 @@ $(document).ready(function() {
             headerFont: 'bold 10px 微软雅黑',
             font: '10px 微软雅黑'
         };
+        const hasCl = ledgerSpreadSetting.cols.find(x => { return x.field === 'sjcl_qty'});
+        const qtyF = hasCl ? 'quantity' : 'sgfh_qty';
+        const tpF = hasCl ? 'total_price' : 'sgfh_tp';
         for (const node of ledgerTree.nodes) {
             data.push({
                 code: node.code, b_code: node.b_code, name: node.name, unit: node.unit,
-                unit_price: node.unit_price, quantity: node.quantity, total_price: node.total_price,
+                unit_price: node.unit_price, quantity: node[qtyF], total_price: node[tpF],
                 dgn_qty1: node.dgn_qty1, dgn_qty2: node.dgn_qty2,
                 drawing_code: node.drawing_code, memo: node.memo
             });