Merge branch 'dev' into uat

app/const/tender_info.js

@@ -167,7 +167,7 @@ const defaultInfo = {
     fun_rela: {
         hintOver: true,
         stage_change: {
-            minusNoValue: false,
+            minusNoValue: true,
         },
         sum_load: {
             ignoreParent: false,

app/lib/stage_im.js

@@ -351,7 +351,6 @@ class StageIm {
     }
 
     _getCalcMemo(im) {
-
         if (im.gclBills && im.gclBills.length > 0) {
             const self = this;
             im.gclBills.sort(function (x, y) {
@@ -584,7 +583,7 @@ class StageIm {
             gcl.jl = helper.add(gcl.jl, pos.gather_qty);
             gcl.contract_jl = helper.add(gcl.contract_jl, pos.contract_qty);
             gcl.qc_jl = helper.add(gcl.qc_jl, pos.qc_qty);
-            gcl.qc_minus_jl = helper.add(gcl.qc_minus_jl, pos.qc_minus_jl);
+            gcl.qc_minus_jl = helper.add(gcl.qc_minus_jl, pos.qc_minus_qty);
 
             gcl.tp = helper.mul(gcl.unit_price, gcl.jl, tp_decimal);
             gcl.contract_tp = helper.mul(gcl.unit_price, gcl.contract_jl, tp_decimal);
@@ -593,7 +592,7 @@ class StageIm {
             gcl.pre_jl = helper.add(gcl.pre_jl, pos.pre_gather_qty);
             gcl.pre_contract_jl = helper.add(gcl.pre_contract_jl, pos.pre_contract_qty);
             gcl.pre_qc_jl = helper.add(gcl.pre_qc_jl, pos.pre_qc_qty);
-            gcl.pre_qc_minus_jl = helper.add(gcl.pre_qc_minus_jl, pos.pre_qc_minus_jl);
+            gcl.pre_qc_minus_jl = helper.add(gcl.pre_qc_minus_jl, pos.pre_qc_minus_qty);
 
             gcl.pre_tp = helper.mul(gcl.unit_price, gcl.pre_jl, tp_decimal);
             gcl.pre_contract_tp = helper.mul(gcl.unit_price, gcl.pre_contract_jl, tp_decimal);
@@ -602,7 +601,7 @@ class StageIm {
             gcl.end_jl = helper.add(gcl.end_jl, pos.end_gather_qty);
             gcl.end_contract_jl = helper.add(gcl.end_contract_jl, pos.end_contract_qty);
             gcl.end_qc_jl = helper.add(gcl.end_qc_jl, pos.end_qc_qty);
-            gcl.end_qc_minus_jl = helper.add(gcl.end_qc_minus_jl, pos.end_qc_minus_jl);
+            gcl.end_qc_minus_jl = helper.add(gcl.end_qc_minus_jl, pos.end_qc_minus_qty);
 
             gcl.end_tp = helper.mul(gcl.unit_price, gcl.end_jl, tp_decimal);
             gcl.end_contract_tp = helper.mul(gcl.unit_price, gcl.end_contract_jl, tp_decimal);
@@ -614,7 +613,7 @@ class StageIm {
             gcl.jl = helper.add(gcl.jl, bills.gather_qty);
             gcl.contract_jl = helper.add(gcl.contract_jl, bills.contract_qty);
             gcl.qc_jl = helper.add(gcl.qc_jl, bills.qc_qty);
-            gcl.qc_minus_jl = helper.add(gcl.qc_minus_jl, bills.qc_minus_jl);
+            gcl.qc_minus_jl = helper.add(gcl.qc_minus_jl, bills.qc_minus_qty);
 
             gcl.tp = helper.add(gcl.tp, bills.gather_tp);
             gcl.contract_tp = helper.add(gcl.contract_tp, bills.contract_tp);
@@ -623,7 +622,7 @@ class StageIm {
             gcl.pre_jl = helper.add(gcl.pre_jl, bills.pre_gather_qty);
             gcl.pre_contract_jl = helper.add(gcl.pre_contract_jl, bills.pre_contract_qty);
             gcl.pre_qc_jl = helper.add(gcl.pre_qc_jl, bills.pre_qc_qty);
-            gcl.pre_qc_minus_jl = helper.add(gcl.pre_qc_minus_jl, bills.pre_qc_minus_jl);
+            gcl.pre_qc_minus_jl = helper.add(gcl.pre_qc_minus_jl, bills.pre_qc_minus_qty);
 
             gcl.pre_tp = helper.add(gcl.pre_tp, bills.pre_gather_tp);
             gcl.pre_contract_tp = helper.add(gcl.pre_contract_tp, bills.pre_contract_tp);
@@ -632,7 +631,7 @@ class StageIm {
             gcl.end_jl = helper.add(gcl.end_jl, bills.end_gather_qty);
             gcl.end_contract_jl = helper.add(gcl.end_contract_jl, bills.end_contract_qty);
             gcl.end_qc_jl = helper.add(gcl.end_qc_jl, bills.end_qc_qty);
-            gcl.end_qc_minus_jl = helper.add(gcl.end_qc_minus_jl, bills.end_qc_minus_jl);
+            gcl.end_qc_minus_jl = helper.add(gcl.end_qc_minus_jl, bills.end_qc_minus_qty);
 
             gcl.end_tp = helper.add(gcl.end_tp, bills.end_gather_tp);
             gcl.end_contract_tp = helper.add(gcl.end_contract_tp, bills.end_contract_tp);

app/public/js/change_information.js

@@ -344,7 +344,6 @@ $(document).ready(() => {
     const czSpreadObj = {
         makeBackColor: function () {
             const rowCount = czSpread.getActiveSheet().getRowCount();
-            console.log();
             for (let i = 0; i < rowCount; i++) {
                 if (czSpread.getActiveSheet().zh_data[i].color) czSpread.getActiveSheet().getRange(i, -1, 1, -1).backColor('#f5c6cb');
             }
@@ -397,7 +396,7 @@ $(document).ready(() => {
             let color = true;
             if (planInfo) {
                 _.remove(newPlanList, (item) => item === planInfo);
-                if (pamount === c.spamount) {
+                if ((pamount ? pamount : 0) === (c.spamount ? c.spamount : 0)) {
                     color = false;
                 }
             }

app/service/project.js

@@ -11,7 +11,7 @@ const imType = require('../const/tender').imType;
 const defaultFunRela = {
     banOver: true,
     hintOver: true,
-    minusNoValue: false,
+    minusNoValue: true,
     imType: imType.zl.value,
     needGcl: false,
 };