Browse Source

经济指标问题

MaiXinRong 3 years ago
parent
commit
84a32db9dc
2 changed files with 2 additions and 4 deletions
  1. 2 2
      app/controller/ledger_controller.js
  2. 0 2
      app/public/js/ledger.js

+ 2 - 2
app/controller/ledger_controller.js

@@ -115,11 +115,11 @@ module.exports = app => {
             const tender = this.ctx.tender;
             const ledgerColumn = [
                 'id', 'tender_id', 'ledger_id', 'ledger_pid', 'level', 'order', 'full_path', 'is_leaf',
-                'code', 'b_code', 'name', 'unit', 'unit_price',
+                'code', 'b_code', 'name', 'unit', 'unit_price', 'quantity', 'total_price',
                 'sgfh_qty', 'sgfh_expr', 'sgfh_tp', 'memo', 'drawing_code'];
             if (tender.data.measure_type === measureType.gcl.value) ledgerColumn.push('deal_qty', 'deal_tp');
             if (tender.info.display.ledger.dgnQty) ledgerColumn.push('dgn_qty1', 'dgn_qty2');
-            if (tender.info.display.ledger.clQty) ledgerColumn.push('sjcl_qty', 'qtcl_qty', 'sjcl_expr', 'qtcl_expr', 'sjcl_tp', 'qtcl_tp', 'quantity', 'total_price');
+            if (tender.info.display.ledger.clQty) ledgerColumn.push('sjcl_qty', 'qtcl_qty', 'sjcl_expr', 'qtcl_expr', 'sjcl_tp', 'qtcl_tp');
             const posColumn = ['id', 'tid', 'lid', 'name', 'position', 'porder', 'sgfh_qty', 'sgfh_expr', 'add_stage_order', 'drawing_code'];
             if (tender.info.display.ledger.clQty) posColumn.push('sjcl_qty', 'qtcl_qty', 'sjcl_expr', 'qtcl_expr', 'quantity');
             for (const field of sjsRela.ledgerCol) {

+ 0 - 2
app/public/js/ledger.js

@@ -3521,7 +3521,6 @@ $(document).ready(function() {
         const node = SpreadJsObj.getSelectObject(ledgerSpread.getActiveSheet());
         if (!node) return;
         const files = $('#upload-file')[0].files;
-        // console.log(node);
         const formData = new FormData();
         formData.append('lid', node.id);
         for (const file of files) {
@@ -3792,7 +3791,6 @@ $(document).ready(function() {
         //   toastr.error('批量下载失败')
         // });
           // const url = `/tender/${tender.id}/ledger/compresse/file?fileIds=${JSON.stringify(fileIds)}`;
-          // console.log(url);
       }
   });