超计调整

app/public/js/stage.js

@@ -456,7 +456,15 @@ $(document).ready(() => {
     };
     ledgerSpreadSetting.dgnUpFields = ['deal_dgn_qty1', 'deal_dgn_qty2', 'c_dgn_qty1', 'c_dgn_qty2'];
     ledgerSpreadSetting.getColor = function (sheet, data, col, defaultColor) {
-        return data && data.end_contract_qty > data.quantity ? '#f8d7da' : defaultColor;
+        if (data) {
+            if (data.is_tp) {
+                return data.end_contract_tp > data.total_price ? '#f8d7da' : defaultColor;
+            } else {
+                return data.end_contract_qty > data.quantity ? '#f8d7da' : defaultColor;
+            }
+        } else {
+            return defaultColor;
+        }
     };
     SpreadJsObj.initSheet(slSpread.getActiveSheet(), ledgerSpreadSetting);
     slSpread.getActiveSheet().frozenColumnCount(5);

app/public/js/stage_gather.js

@@ -103,9 +103,13 @@ $(document).ready(function () {
         for (let iRow = 0, iLength = sheet.getRowCount(); iRow < iLength; iRow++) {
             const node = sheet.zh_data[iRow];
             if (node) {
-                const bOverRangeQty = node.quantity ? node.end_gather_qty > ZhCalc.mul(node.quantity, nPercent) : node.end_gather_qty;
-                const bOverRangeDealQty = node.deal_bills_qty ? node.end_gather_qty > ZhCalc.mul(node.deal_bills_qty, nPercent) : node.end_gather_qty;
-                const bOverRange = bQty ? bOverRangeQty : (bDealQty ? bOverRangeDealQty : bOverRangeQty || bOverRangeDealQty);
+                const bOverRangeTz = node.end_gather_qty
+                    ? (node.quantity ? node.end_gather_qty > ZhCalc.mul(node.quantity, nPercent) : node.end_gather_qty)
+                    : (node.total_price ? node.end_gather_tp > ZhCalc.mul(node.total_price, nPercent) : node.end_gather_tp);
+                const bOverRangeDeal = node.end_gather_qty
+                    ? (node.deal_bills_qty ? node.end_gather_qty > ZhCalc.mul(node.deal_bills_qty, nPercent) : node.end_gather_qty)
+                    : (node.deal_bills_tp ? node.end_gather_tp > ZhCalc.mul(node.deal_bills_tp, nPercent) : node.end_gather_tp);
+                const bOverRange = bQty ? bOverRangeTz : (bDealQty ? bOverRangeDeal : bOverRangeTz || bOverRangeDeal);
                 const color = bOverRange ? '#f8d7da' : '';
                 sheet.getRange(iRow, -1, 1, -1).backColor(color);
             }