blackteay/vue-element-admin
1
0
Fork 0
mirror of https://github.com/PanJiaChen/vue-element-admin.git synced 2025-08-10 20:39:48 +08:00
Code Issues Releases Wiki Activity

adding converted currency symbol (#1026)

Browse Source 
Co-authored-by: elsiosanchez <elsiossanches@gmail.com>
This commit is contained in:
Elsio Sanchez 2021-08-06 19:37:19 -04:00 committed by GitHub
parent 2e64bb5d35
commit 8542714daf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/ADempiere/Form/PriceChecking/index.vue
View File

@ -90,7 +90,7 @@
<el-row> <el-row>
<el-col> <el-col>
<div v-if="!isEmptyValue(currentConvertion)" class="rate-date"> <div v-if="!isEmptyValue(currentConvertion)" class="rate-date">
{{ $t('form.pos.collect.dayRate') }}: {{ formatQuantity(currentConvertion.divideRate) }} ~ ({{ formatPrice(1, productPrice.currency.iSOCode) }} = {{ formatPrice(currentConvertion.divideRate) }} {{ currentPointOfSales.displayCurrency.iso_code }}) {{ $t('form.pos.collect.dayRate') }}: {{ formatConversionCurrenty(currentConvertion.divideRate) }} ~ ({{ formatPrice(1, productPrice.currency.iSOCode) }} = {{ formatPrice(currentConvertion.divideRate) }} {{ currentPointOfSales.displayCurrency.iso_code }})
</div> </div>
<div v-else class="rate-date"> <div v-else class="rate-date">
{{ $t('form.pos.collect.noDayRate') }} {{ currentPointOfSales.displayCurrency.description }} {{ $t('form.pos.collect.noDayRate') }} {{ currentPointOfSales.displayCurrency.description }}

7
src/components/ADempiere/Form/VPOS/Collection/convertAmount/index.vue
View File

@ -33,7 +33,7 @@
label-width="10px" label-width="10px"
style="float: right; display: flex; line-height: 10px;" style="float: right; display: flex; line-height: 10px;"
> >
<el-form-item :label="fieldsList[0].name"> <el-form-item :label="$t('form.pos.collect.Currency')">
<el-select <el-select
v-model="currentFieldCurrency" v-model="currentFieldCurrency"
:placeholder="fieldsList[0].help" :placeholder="fieldsList[0].help"
@ -169,7 +169,10 @@ export default {
} }
}) })
if (!this.isEmptyValue(convert)) { if (!this.isEmptyValue(convert)) {
return convert return {
...convert,
iSOCode: convert.currencyTo.iSOCode
}
} }
return { return {
currencyTo: this.currentPointOfSales.currentPriceList.currency, currencyTo: this.currentPointOfSales.currentPriceList.currency,

2
src/components/ADempiere/Form/VPOS/Order/orderLineMixin.js
View File

@ -237,7 +237,7 @@ export default {
} else if (columnName === 'GrandTotal') { } else if (columnName === 'GrandTotal') {
return this.formatPrice(row.grandTotal, currency) return this.formatPrice(row.grandTotal, currency)
} else if (columnName === 'ConvertedAmount') { } else if (columnName === 'ConvertedAmount') {
return this.formatPrice(row.grandTotal / this.totalAmountConverted) return this.formatPrice(row.grandTotal / this.totalAmountConverted, this.currentPointOfSales.displayCurrency.iso_code)
} }
}, },
productPrice(price, discount) { productPrice(price, discount) {