Browse Source

上报,检查超计相关

MaiXinRong 4 years ago
parent
commit
41f1cf742e
2 changed files with 2 additions and 13 deletions
  1. 1 2
      app/controller/stage_controller.js
  2. 1 11
      app/view/setting/fun.ejs

+ 1 - 2
app/controller/stage_controller.js

@@ -358,7 +358,6 @@ module.exports = app => {
 
         async check(ctx) {
             try {
-                const projRela = await this.ctx.service.project.getFunRela(this.ctx.session.sessionProject.id);
                 const ledgerData = await this._getStageLedgerData(ctx);
                 const posData = await this._getStagePosData(ctx);
 
@@ -369,7 +368,7 @@ module.exports = app => {
                 checkData.check3fLimit(ctx.tender.data);
                 checkData.checkBillsQty(['sgfh_qty', 'qtcl_qty', 'sjcl_qty', 'quantity']);
 
-                projRela.banOver && ctx.tender.info.ledger_check.over && checkData.checkOverRange(['contract_qty', 'qc_qty']);
+                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);

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

@@ -11,16 +11,6 @@
                 <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) { %>
@@ -46,6 +36,6 @@
         autoFlashHeight();
     });
     const updateSetting = function () {
-        postData('/setting/fun/update', {imType: parseInt($('[name=im_type]:checked').val()), banOver: $('[name=ban_over]')[0].checked});
+        postData('/setting/fun/update', {imType: parseInt($('[name=im_type]:checked').val())});
     }
 </script>