MaiXinRong 4 лет назад
Родитель
Сommit
9e2b8202f3
2 измененных файлов с 13 добавлено и 2 удалено
  1. 2 1
      app/controller/stage_controller.js
  2. 11 1
      app/view/setting/fun.ejs

+ 2 - 1
app/controller/stage_controller.js

@@ -361,6 +361,7 @@ module.exports = app => {
                 const ledgerData = await this._getStageLedgerData(ctx);
                 const posData = await this._getStagePosData(ctx);
 
+                const projRela = await this.ctx.service.project.getFunRela(this.ctx.session.sessionProject.id);
                 const checkDataModel = require('../lib/ledger').checkData;
                 const checkData = new checkDataModel(ctx, measureType);
                 checkData.loadData(ledgerData, posData);
@@ -368,7 +369,7 @@ module.exports = app => {
                 checkData.check3fLimit(ctx.tender.data);
                 checkData.checkBillsQty(['sgfh_qty', 'qtcl_qty', 'sjcl_qty', 'quantity']);
 
-                ctx.tender.info.ledger_check.over && 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);

+ 11 - 1
app/view/setting/fun.ejs

@@ -11,6 +11,16 @@
                 <div class="row m-0 mt-3">
                     <div class="col-6">
                         <div class="form-group">
+                            <label>超计控制</label>
+                            <div>
+                                <div class="form-check form-check-inline">
+                                    <input class="form-check-input" type="checkbox" name="ban_over" <% if (funRela.banOver) { %>checked<% } %> onchange="updateSetting();">
+                                    <label class="form-check-label" for="inlineCheckbox6">超计时限制上报审批/审批通过</label>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
                             <label>中间计量模式设置</label>
                             <div>
                                 <% for (const i in imType) { %>
@@ -36,6 +46,6 @@
         autoFlashHeight();
     });
     const updateSetting = function () {
-        postData('/setting/fun/update', {imType: parseInt($('[name=im_type]:checked').val())});
+        postData('/setting/fun/update', {imType: parseInt($('[name=im_type]:checked').val()), banOver: $('[name=ban_over]')[0].checked});
     }
 </script>