PanJiaChen#2903

solop-develop · Nov 14, 2024 · aff0764 · aff0764
1 parent 4c74b25
commit aff0764
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/components/ADempiere/Form/VPOS2/MainOrder/OptionLine/editLine/fieldAmount.vue b/src/components/ADempiere/Form/VPOS2/MainOrder/OptionLine/editLine/fieldAmount.vue
@@ -50,6 +50,7 @@ import store from '@/store'
 // import { displayLineProductPriceValue } from '@/utils/ADempiere/dictionary/form/VPOS'
 // import { copyToClipboard } from '@/utils/ADempiere/coreUtils.js'
 import { formatPrice } from '@/utils/ADempiere/formatValue/numberFormat'
+import { isEmptyValue } from '@/utils/ADempiere'
 
 export default defineComponent({
   name: 'fieldAmount',
@@ -96,6 +97,7 @@ export default defineComponent({
     // Methods
     const displayValue = computed(() => {
       const currency = store.getters.getAvailableCurrencies.currencie
+      if (!isEmptyValue(props.valueDisplay)) return props.valueDisplay
       return formatPrice({ value: Number(totalAmount.value), currency: currency.iso_code })
     })
     function customFocusGained(event) {

diff --git a/src/components/ADempiere/Form/VPOS2/Options/cashManagement/cashOpening/panel.vue b/src/components/ADempiere/Form/VPOS2/Options/cashManagement/cashOpening/panel.vue
@@ -201,7 +201,7 @@ export default defineComponent({
     })
 
     const amountDisplay = computed(() => {
-      return formatPrice({ value: Number(amount), currency: currencyPayment.iso_code })
+      return formatPrice({ value: Number(amount.value), currency: currencyPayment.value.iso_code })
     })
 
     const listPaymentsOpenst = computed(() => {

diff --git a/src/components/ADempiere/Form/VPOS2/Options/cashManagement/cashWithdrawal/panel.vue b/src/components/ADempiere/Form/VPOS2/Options/cashManagement/cashWithdrawal/panel.vue
@@ -38,7 +38,7 @@
             >
               <field-amount
                 :value-amount="amount"
-                :value-display="amount"
+                :value-display="amountDisplay"
                 :handle-change="updateAmount"
               />
             </el-form-item>
@@ -201,7 +201,7 @@ export default defineComponent({
     })
 
     const amountDisplay = computed(() => {
-      return formatPrice({ value: Number(amount), currency: currencyPayment.iso_code })
+      return formatPrice({ value: Number(amount.value), currency: currencyPayment.value.iso_code })
     })
 
     const listPaymentsOpenst = computed(() => {