瀏覽代碼

计量台账,超计判断增加标段单独控制

MaiXinRong 4 年之前
父節點
當前提交
2ae8830e07
共有 3 個文件被更改,包括 8 次插入1 次删除
  1. 1 0
      app/const/tender_info.js
  2. 1 1
      app/controller/stage_controller.js
  3. 6 0
      app/view/tender/detail_modal.ejs

+ 1 - 0
app/const/tender_info.js

@@ -158,6 +158,7 @@ const defaultInfo = {
     ledger_check: {
         same_code: true,
         sibling: true,
+        over: true,
     }
 };
 

+ 1 - 1
app/controller/stage_controller.js

@@ -369,7 +369,7 @@ module.exports = app => {
                 checkData.check3fLimit(ctx.tender.data);
                 checkData.checkBillsQty(['sgfh_qty', 'qtcl_qty', 'sjcl_qty', 'quantity']);
 
-                projRela.banOver && checkData.checkOverRange(['contract_qty', 'qc_qty']);
+                projRela.banOver && ctx.tender.info.ledger_check.over && checkData.checkOverRange(['contract_qty', 'qc_qty']);
                 checkData.checkBillsTp([
                     { qty: 'contract_qty', tp: 'contract_tp' }, { qty: 'qc_qty', tp: 'qc_tp' },
                 ], this.ctx.tender.info.decimal);

+ 6 - 0
app/view/tender/detail_modal.ejs

@@ -1607,6 +1607,10 @@
                         <input type="checkbox" class="custom-control-input" id="lc_sibling" checked="">
                         <label class="custom-control-label" for="lc_sibling">项目节清单同层次</label>
                     </div>
+                    <div class="custom-control custom-checkbox mb-2">
+                        <input type="checkbox" class="custom-control-input" id="lc_over" checked="">
+                        <label class="custom-control-label" for="lc_over">超计判断</label>
+                    </div>
                 </div>
             </div>
             <div class="modal-footer">
@@ -1624,6 +1628,7 @@
     const loadLedgerCheckProperty = function () {
         $('#lc_same_code')[0].checked = property.ledger_check.same_code;
         $('#lc_sibling')[0].checked = property.ledger_check.sibling;
+        $('#lc_over')[0].checked = property.ledger_check.over;
     }
     $('#bd-set-10').on('show.bs.modal', function () {
         loadLedgerCheckProperty();
@@ -1633,6 +1638,7 @@
             ledger_check: {
                 same_code: $('#lc_same_code')[0].checked,
                 sibling: $('#lc_sibling')[0].checked,
+                over: $('#lc_over')[0].checked,
             },
         };
         const tenderId = window.location.pathname.split('/')[2];