MaiXinRong 1 bulan lalu
induk
melakukan
a87c1d916a
2 mengubah file dengan 2 tambahan dan 2 penghapusan
  1. 1 1
      app/controller/stage_controller.js
  2. 1 1
      app/public/js/stage.js

+ 1 - 1
app/controller/stage_controller.js

@@ -536,7 +536,7 @@ module.exports = app => {
                 if (projRela.banOver && ctx.tender.info.ledger_check.over) {
                     checkData.checkOverRange(ctx.tender.info.checkOverInfo);
                 }
-                if (this.ctx.tender.info.calc_type === 'up' && this.ctx.subProject.page_show.correctCalcContractTp) {
+                if (this.ctx.tender.info.calc_type === 'up' && !this.ctx.subProject.page_show.correctCalcContractTp) {
                     checkData.checkBillsTp([
                         { qty: 'contract_qty', tp: 'contract_tp' }, { qty: 'qc_qty', tp: 'qc_tp' },
                     ], this.ctx.tender.info.decimal, x => { return x.is_tp; });

+ 1 - 1
app/public/js/stage.js

@@ -233,7 +233,7 @@ $(document).ready(() => {
     };
     let detail, searchLedger, checkedChanges;
     const tpCalcFields = [{qty: 'qc_qty', tp: 'qc_tp'}];
-    if (tenderInfo.calc_type === 'up' && correctCalcContractTp) tpCalcFields.shift({qty: 'contract_qty', tp: 'contract_tp'});
+    if (tenderInfo.calc_type === 'up' && !correctCalcContractTp) tpCalcFields.shift({qty: 'contract_qty', tp: 'contract_tp'});
     const checkOption = {
         sibling: { enable: 0 },
         empty_code: { enable: 0 },