瀏覽代碼

传detail id

Tony Kang 1 年之前
父節點
當前提交
3d22e7400a
共有 3 個文件被更改,包括 6 次插入1 次删除
  1. 2 0
      app/controller/report_controller.js
  2. 3 1
      app/public/report/js/rpt_main.js
  3. 1 0
      app/view/report/index.ejs

+ 2 - 0
app/controller/report_controller.js

@@ -310,6 +310,7 @@ module.exports = app => {
                     project_id: tender.data.project_id,
                     tender_id: tender.id,
                     tender_name: tender.data.name,
+                    detail_id: -1,
                     stg_id: stage_id,
                     stg_order: stage_order,
                     cur_order: sorder,
@@ -469,6 +470,7 @@ module.exports = app => {
                     project_id: tender.pid,
                     tender_id: tenderId,
                     tender_name: tender.name,
+                    detail_id: paymentDetail_id,
                     stg_id: stage_id,
                     stg_order: stage_order,
                     cur_order: sorder,

+ 3 - 1
app/public/report/js/rpt_main.js

@@ -307,6 +307,7 @@ let zTreeOprObj = {
             params.closeWatermark = getCloseWatermark();
             params.isTextSignature = getTxtSignature();
             params.custCfg = CUST_CFG;
+            params.detail_id = DETAIL_ID;
             _getSplitAmendmentParam(params, treeNode);
         
             rptArchiveObj.toggleBtn(false);
@@ -385,8 +386,8 @@ let zTreeOprObj = {
             params.material_order = getMaterialOrder();
             params.closeWatermark = getCloseWatermark();
             params.isTextSignature = getTxtSignature();
+            params.detail_id = DETAIL_ID;
             _getSplitAmendmentParam(params, me.currentNode);
-            // me.requestNormalReport(params);
             localStorage[CUST_NAME + '_custCfg'] = JSON.stringify(CUST_CFG);
 
             if (customSelects) {
@@ -703,6 +704,7 @@ let rptControlObj = {
         rst.custCfg = CUST_CFG;
         rst.closeWatermark = getCloseWatermark();
         rst.isTextSignature = getTxtSignature();
+        rst.detail_id = DETAIL_ID;
         // rst.amendmentType = 
         return rst;
     },

+ 1 - 0
app/view/report/index.ejs

@@ -362,6 +362,7 @@
 
 <script type="text/javascript">
     let TOP_TREE_NODES = <%- rpt_tpl_data %>;
+    const DETAIL_ID = <%- detail_id %>;
     const PAGE_SHOW = {closeWatermark: 0, closeExportPdf: 0, closeExportExcel: 0, showArchive: 0, closeShowAllCustomized: 0, isTextSignature: 0};
     <% if (pageShow !== null) { %>
         <% if (parseInt(pageShow.closeWatermark) === 1) { %>