变更令问题

app/public/js/stage.js

@@ -391,9 +391,11 @@ $(document).ready(() => {
                 getColor: function (sheet, data, row, col, defaultColor) {
                     if (col.field === 'uamount') {
                         if (data.bamount > 0) {
-                            return data.uamount < 0 || data.uamount > data.vamount ? '#ff6f5c' : defaultColor;
+                            const usedAmount = ZhCalc.add(data.uamount, data.pre_amount);
+                            return usedAmount < 0 || usedAmount > data.bamount ? '#ff6f5c' : defaultColor;
                         } else if (data.bamount < 0) {
-                            return data.uamount > 0 || data.uamount < data.vamount ? '#ff6f5c' : defaultColor;
+                            const usedAmount = ZhCalc.add(data.uamount, data.pre_amount);
+                            return usedAmount > 0 || usedAmount < data.bamount ? '#ff6f5c' : defaultColor;
                         } else {
                             return data.uamount ? '#ff6f5c' : defaultColor;
                         }
@@ -536,7 +538,7 @@ $(document).ready(() => {
                     c.uamount = uc.qty;
                     c.vamount = ZhCalc.add(c.vamount, uc.qty);
                 }
-                c.pre_amount = ZhCalc.sub(c.used_amount, c.uamount);
+                c.pre_amount = ZhCalc.sub(ZhCalc.add(c.used_amount, c.stage_used_amount), c.uamount);
             }
         }
         _loadChangeDetail(change) {