Browse Source

一个 账单分多次签收,每次生成的单据账单CNY/账单USD都应为原本账单总金额

Qukatie 1 week ago
parent
commit
69494c83aa

+ 2 - 2
src/views/iosBasicData/dcOffset/finstlbillsDetails.vue

@@ -1215,13 +1215,13 @@ export default {
             if (item.curCode == "CNY") {
               this.$set(item, "amountRMB", item.amount);
               this.$set(item, "currentInvoiceAmountRMB", Number(item.currentInvoiceAmount ? item.currentInvoiceAmount : 0));
-              this.$set(item, "unsettledAmountRMB", Number(item.unsettledAmount ? item.unsettledAmount : 0));
+              this.$set(item, "unsettledAmountRMB", Number(item.amount ? item.amount : 0));
               this.$set(item, "currentStlAmountRMB", Number(item.currentStlAmount ? item.currentStlAmount : 0));
               this.$set(item, "currentStlAmountUSD", Number(0));
             } else {
               this.$set(item, "amountUSD", item.amount);
               this.$set(item, "currentInvoiceAmountUSD", item.currentInvoiceAmount);
-              this.$set(item, "unsettledAmountUSD", Number(item.unsettledAmount ? item.unsettledAmount : 0));
+              this.$set(item, "unsettledAmountUSD", Number(item.amount ? item.amount : 0));
               this.$set(item, "currentStlAmountUSD", Number(item.currentStlAmount ? item.currentStlAmount : 0));
               this.$set(item, "currentStlAmountRMB", Number(0));
             }

+ 4 - 4
src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -1280,13 +1280,13 @@ export default {
             if (item.curCode == "CNY") {
               this.$set(item, "amountRMB", item.amount);
               this.$set(item, "currentInvoiceAmountRMB", Number(item.currentInvoiceAmount ? item.currentInvoiceAmount : 0));
-              this.$set(item, "unsettledAmountRMB", Number(item.unsettledAmount ? item.unsettledAmount : 0));
+              this.$set(item, "unsettledAmountRMB", Number(item.amount ? item.amount : 0));
               this.$set(item, "currentStlAmountRMB", Number(item.currentStlAmount ? item.currentStlAmount : 0));
               this.$set(item, "currentStlAmountUSD", Number(0));
             } else {
               this.$set(item, "amountUSD", item.amount);
               this.$set(item, "currentInvoiceAmountUSD", item.currentInvoiceAmount);
-              this.$set(item, "unsettledAmountUSD", Number(item.unsettledAmount ? item.unsettledAmount : 0));
+              this.$set(item, "unsettledAmountUSD", Number(item.amount ? item.amount : 0));
               this.$set(item, "currentStlAmountUSD", Number(item.currentStlAmount ? item.currentStlAmount : 0));
               this.$set(item, "currentStlAmountRMB", Number(0));
             }
@@ -1438,13 +1438,13 @@ export default {
           if (item.curCode == "CNY") {
             this.$set(item, "amountRMB", item.amount);
             this.$set(item, "currentInvoiceAmountRMB", Number(item.currentInvoiceAmount ? item.currentInvoiceAmount : 0));
-            this.$set(item, "unsettledAmountRMB", Number(item.unsettledAmount ? item.unsettledAmount : 0));
+            // this.$set(item, "unsettledAmountRMB", Number(item.unsettledAmount ? item.unsettledAmount : 0));
             this.$set(item, "currentStlAmountRMB", Number(item.reconciliationCurrentAmount ? item.reconciliationCurrentAmount : 0));
             this.$set(item, "currentStlAmountUSD", Number(0));
           } else {
             this.$set(item, "amountUSD", item.amount);
             this.$set(item, "currentInvoiceAmountUSD", Number(item.currentInvoiceAmount ? item.currentInvoiceAmount : 0));
-            this.$set(item, "unsettledAmountUSD", Number(item.unsettledAmount ? item.unsettledAmount : 0));
+            // this.$set(item, "unsettledAmountUSD", Number(item.unsettledAmount ? item.unsettledAmount : 0));
             this.$set(item, "currentStlAmountUSD", Number(item.reconciliationCurrentAmount ? item.reconciliationCurrentAmount : 0));
             this.$set(item, "currentStlAmountRMB", Number(0));
           }

+ 4 - 4
src/views/iosBasicData/writeOff/finstlbillsDetails.vue

@@ -1302,13 +1302,13 @@ export default {
             if (item.curCode == "CNY") {
               this.$set(item, "amountRMB", item.amount);
               this.$set(item, "currentInvoiceAmountRMB", Number(item.currentInvoiceAmount ? item.currentInvoiceAmount : 0));
-              this.$set(item, "unsettledAmountRMB", Number(item.unsettledAmount ? item.unsettledAmount : 0));
+              this.$set(item, "unsettledAmountRMB", Number(item.amount ? item.amount : 0));
               this.$set(item, "currentStlAmountRMB", Number(item.currentStlAmount ? item.currentStlAmount : 0));
               this.$set(item, "currentStlAmountUSD", Number(0));
             } else {
               this.$set(item, "amountUSD", item.amount);
               this.$set(item, "currentInvoiceAmountUSD", item.currentInvoiceAmount);
-              this.$set(item, "unsettledAmountUSD", Number(item.unsettledAmount ? item.unsettledAmount : 0));
+              this.$set(item, "unsettledAmountUSD", Number(item.amount ? item.amount : 0));
               this.$set(item, "currentStlAmountUSD", Number(item.currentStlAmount ? item.currentStlAmount : 0));
               this.$set(item, "currentStlAmountRMB", Number(0));
             }
@@ -1457,13 +1457,13 @@ export default {
           if (item.curCode == "CNY") {
             this.$set(item, "amountRMB", item.amount);
             this.$set(item, "currentInvoiceAmountRMB", Number(item.currentInvoiceAmount ? item.currentInvoiceAmount : 0));
-            this.$set(item, "unsettledAmountRMB", Number(item.unsettledAmount ? item.unsettledAmount : 0));
+            // this.$set(item, "unsettledAmountRMB", Number(item.unsettledAmount ? item.unsettledAmount : 0));
             this.$set(item, "currentStlAmountRMB", Number(item.reconciliationCurrentAmount ? item.reconciliationCurrentAmount : 0));
             this.$set(item, "currentStlAmountUSD", Number(0));
           } else {
             this.$set(item, "amountUSD", item.amount);
             this.$set(item, "currentInvoiceAmountUSD", Number(item.currentInvoiceAmount ? item.currentInvoiceAmount : 0));
-            this.$set(item, "unsettledAmountUSD", Number(item.unsettledAmount ? item.unsettledAmount : 0));
+            // this.$set(item, "unsettledAmountUSD", Number(item.unsettledAmount ? item.unsettledAmount : 0));
             this.$set(item, "currentStlAmountUSD", Number(item.reconciliationCurrentAmount ? item.reconciliationCurrentAmount : 0));
             this.$set(item, "currentStlAmountRMB", Number(0));
           }