Przeglądaj źródła

工程量清单,单价调整,修订上报后,签约数据问题

MaiXinRong 2 lat temu
rodzic
commit
cea19c6ab4
3 zmienionych plików z 3 dodań i 3 usunięć
  1. 2 0
      app/lib/ledger.js
  2. 1 2
      app/public/js/file_detail.js
  3. 0 1
      app/service/file.js

+ 2 - 0
app/lib/ledger.js

@@ -1129,6 +1129,7 @@ class reviseTree extends billsTree {
                     sgfh_qty: 0, sgfh_tp: 0, sgfh_expr: '',
                     sjcl_qty: 0, sjcl_tp: 0, sjcl_expr: '',
                     qtcl_qty: 0, qtcl_tp: 0, qtcl_expr: '',
+                    deal_qty: 0, deal_tp: 0,
                 };
             } else {
                 return {
@@ -1142,6 +1143,7 @@ class reviseTree extends billsTree {
                     sgfh_qty: x.sgfh_qty, sgfh_tp: x.sgfh_tp, sgfh_expr: x.sgfh_expr,
                     sjcl_qty: x.sjcl_qty, sjcl_tp: x.sjcl_tp, sjcl_expr: x.sjcl_expr,
                     qtcl_qty: x.qtcl_qty, qtcl_tp: x.qtcl_tp, qtcl_expr: x.qtcl_expr,
+                    deal_qty: x.deal_qty, deal_tp: x.deal_tp,
                 };
             }
         });

+ 1 - 2
app/public/js/file_detail.js

@@ -43,8 +43,7 @@ $(document).ready(function() {
             html.push('<tr>');
             html.push(`<tr><td><input type="checkbox" name="bd-check" fid="${file.id}"></td>`);
             const editHtml = file.canEdit ? '<a href="javascript: void(0);" class="mr-1"><i class="fa fa-pencil fa-fw"></i></a>' : '';
-            const viewHtml = file.viewpath ? `<a href="${file.viewpath}" class="mr-1"><i class="fa fa-eye fa-fw"></i></a>` : '';
-            console.log(viewHtml);
+            const viewHtml = file.viewpath ? `<a href="${file.viewpath}" class="mr-1" target="_blank"><i class="fa fa-eye fa-fw"></i></a>` : '';
             const downHtml = `<a href="javascript: void(0);" onclick="AliOss.downloadFile('${file.filepath}', '${file.filename + file.fileext}')" class="mr-1"><i class="fa fa-download fa-fw"></i></a>`;
             const delHtml = file.canEdit ? '<a href="javascript: void(0);" class="mr-1"><i class="fa fa-trash-o fa-fw"></i></a>' : '';
             html.push(`<td><div class="d-flex justify-content-between align-items-center table-file"><div>${file.filename}${file.fileext}</div><div class="btn-group-table" style="display: none;">${editHtml}${viewHtml}${downHtml}${delHtml}</div></div></td>`);

+ 0 - 1
app/service/file.js

@@ -35,7 +35,6 @@ module.exports = app => {
                 x.fileext_str = helper.fileExtStr(x.fileext);
                 x.canEdit = x.user_id === userId;
             });
-            console.log(files);
         }
 
         async getFiles(condition) {