task#3337

app/public/report/js/rpt_main.js

@@ -308,6 +308,7 @@ let zTreeOprObj = {
             params.material_order = getMaterialOrder();
             params.closeWatermark = getCloseWatermark();
             // me.requestNormalReport(params);
+            localStorage[CUST_NAME + '_custCfg'] = JSON.stringify(CUST_CFG);
 
             const gather_select = customSelects.gather_select.find(function (x) {
                 return x.id === me.currentNode.refId;

app/reports/util/rpt_excel_util.js

@@ -919,8 +919,8 @@ function writeSheet(pageData, sheetData, paperSize, sharedStrList, stylesObj, ap
             self_create_cell(theShtData[JV.PROP_SIGNATURE_DATE_CELLS], rows, theYPos);
             self_create_cell(theShtData[JV.PROP_SIGNATURE_AUDIT_CELLS], rows, theYPos);
             // fsUtil.writeObjToFile(newPageData, 'D:/GitHome/ConstructionOperation/tmp/combinedHeader.js');
-            console.log('theShtData[JV.PROP_SIGNATURE_AUDIT_CELLS]: ');
-            console.log(theShtData[JV.PROP_SIGNATURE_AUDIT_CELLS]);
+            // console.log('theShtData[JV.PROP_SIGNATURE_AUDIT_CELLS]: ');
+            // console.log(theShtData[JV.PROP_SIGNATURE_AUDIT_CELLS]);
 
             // 3. then fill up rst
             for (let i = 0; i < rows.length; i++) {

app/view/report/index.ejs

@@ -291,6 +291,7 @@
     if (!CUST_CFG.hasOwnProperty('continuousOutput')) {
         CUST_CFG.continuousOutput = false;
     }
+    //
     const PROJECT_ID = <%- project_id %>;
     const TENDER_ID = <%- tender_id %>;
     const TENDER_NAME = '<%- tender_name %>';
@@ -301,6 +302,12 @@
     const STAGE_LIST = <%- stage_list %>;
     const PRJ_ACCOUNT_LIST = <%- prj_account_list %>;
     const ROLE_LIST = <%- role_list %>;
+    const CUST_NAME = '<%- ctx.session.sessionUser.name %>';
+    if (localStorage[CUST_NAME + '_custCfg']) {
+        CUST_CFG = JSON.parse(localStorage[CUST_NAME + '_custCfg']);
+    } else {
+        localStorage[CUST_NAME + '_custCfg'] = JSON.stringify(CUST_CFG);
+    }
     let USED_LIST = <%- used_list %>;
     const STAGE_STATUS = <%- stg_status %>;
     const FOLDER_SEPERATER = '->';