12231744

src/components/OP/EntryDetails.vue

@@ -2409,9 +2409,12 @@ export default {
         currencys: {
             handler(val) {
                 this.TotalAccommodationFee = 0
+                console.log(val,this.quarterageData);
+                console.log(this.currencys);
+                
                 for (let q = 0; q < this.quarterageData.length; q++) {
                     for (let qc = 0; qc < this.currencys.length; qc++) {
-                        if (this.currencys[qc].currencyCode == this.quarterageData[q].curremcyCode) {
+                        if (this.currencys[qc].currencyCode == this.quarterageData[q].curremcyCode||this.currencys[qc].currencyName == this.quarterageData[q].currencyName) {
                             this.quarterageData[q].subTotal = this.currencys[qc].rate * this.quarterageData[q].cost
                         }
                     }
@@ -2421,7 +2424,7 @@ export default {
                 this.TotalMeals = 0
                 for (let b = 0; b < this.boardWagesData.length; b++) {
                     for (let bc = 0; bc < this.currencys.length; bc++) {
-                        if (this.currencys[bc].currencyCode == this.boardWagesData[b].curremcyCode) {
+                        if (this.currencys[bc].currencyCode == this.boardWagesData[b].curremcyCode||this.currencys[bc].currencyName == this.boardWagesData[b].currencyName) {
                             this.boardWagesData[b].subTotal = this.currencys[bc].rate * this.boardWagesData[b].cost
                         }
                     }
@@ -2431,7 +2434,7 @@ export default {
                 this.TotalMiscellaneous = 0
                 for (let m = 0; m < this.miscellaneousFeeData.length; m++) {
                     for (let mc = 0; mc < this.currencys.length; mc++) {
-                        if (this.currencys[mc].currencyCode == this.miscellaneousFeeData[m].curremcyCode) {
+                        if (this.currencys[mc].currencyCode == this.miscellaneousFeeData[m].curremcyCode||this.currencys[mc].currencyName == this.miscellaneousFeeData[m].currencyName) {
                             this.miscellaneousFeeData[m].subTotal = this.currencys[mc].rate * this.miscellaneousFeeData[m].cost
                         }
                     }
@@ -2441,7 +2444,7 @@ export default {
                 this.trainingExpense = 0
                 for (let t = 0; t < this.trainingExpenseData.length; t++) {
                     for (let tc = 0; tc < this.currencys.length; tc++) {
-                        if (this.currencys[tc].currencyCode == this.trainingExpenseData[t].curremcyCode) {
+                        if (this.currencys[tc].currencyCode == this.trainingExpenseData[t].curremcyCode||this.currencys[tc].currencyName == this.trainingExpenseData[t].currencyName) {
                             this.trainingExpenseData[t].subTotal = this.currencys[tc].rate * this.trainingExpenseData[t].cost
                         }
                     }
@@ -2450,7 +2453,7 @@ export default {
                 //其他费用
                 for (let nc = 0; nc < this.currencys.length; nc++) {
                     for (let nt = 0; nt < this.othercurrencys.length; nt++) {
-                        if (this.currencys[nc].currencyCode == this.othercurrencys[nt].currencyCode) {
+                        if (this.currencys[nc].currencyCode == this.othercurrencys[nt].currencyCode||this.currencys[nc].currencyName == this.othercurrencys[nt].currencyName) {
                             this.othercurrencys[nt].rate = this.currencys[nc].rate;
                         }
                     }
@@ -2468,8 +2471,6 @@ export default {
                         this.otherData[wm].subTotal = this.otherData[wm].cost * this.otherData[wm].rate;
                     }
                 }
-                console.log(this.otherData);
-
             },
             deep: true
         }