diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue
index d22e7d0..11869a4 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue
@@ -124,26 +124,26 @@
v-model="row.quantity"
:min="0"
:precision="0"
- @change="onRowValueChange(row, $rowIndex)"
+ @change="onQuantityChange(row, $rowIndex)"
/>
-
+
+
+
+
+
+ {{ displayPrice(row.selectedUnitObj?.retailPrice || 0) }}
-
-
- {{ displayPrice(row.selectedUnitObj?.retailPrice || 0) }}
-
-
{{ displayPrice(row.selectedUnitObj?.purchasePrice || 0) }}
-
+
{{ row?.selectedUnitObj?.realPrice || 0 }}
-
+
{{ row?.selectedUnitObj?.totalAmount }}
-
+
{{ total.totalAmount }}元
@@ -253,7 +259,7 @@ const total = computed(() => {
const purchasePrice = displayPrice(
vxeTableData.value.reduce((sum: any, row: any) => sum + Number(row.selectedUnitObj?.purchasePrice || 0), 0),
)
- const realPrice = vxeTableData.value.reduce((sum: any, row: any) => sum + Number(row.selectedUnitObj?.realPrice || 0), 0)
+ const realPrice = vxeTableData.value.reduce((sum: any, row: any) => sum + Number(row.selectedUnitObj?.realPrice || 0), 0).toFixed(2)
const totalAmount = vxeTableData.value.reduce((sum: any, row: any) => sum + Number(row.selectedUnitObj?.totalAmount || 0), 0).toFixed(2)
return { quantity, purchasePrice, realPrice, totalAmount }
})
@@ -355,9 +361,15 @@ const onUnitChange = (row: any) => {
row.selectedUnitObj.totalAmount = Number((row.quantity * Number(row.selectedUnitObj.realPrice || 0)).toFixed(2))
}
-// 数量、进价变动联动
-const onRowValueChange = (row: any, $rowIndex: number) => {
- row.selectedUnitObj.totalAmount = Number((row.quantity * Number(row.selectedUnitObj.realPrice || 0)).toFixed(2))
+// 数量变动
+const onQuantityChange = (row: any, $rowIndex: number) => {
+ row.selectedUnitObj.totalAmount = Number(displayPrice(row.quantity * Number(row.selectedUnitObj.purchasePrice || 0), ""))
+ row.selectedUnitObj.realPrice = (row.selectedUnitObj.totalAmount / row.quantity).toFixed(2)
+}
+
+// 累计总金额变动
+const onTotalAmountChange = (row: any, $rowIndex: number) => {
+ row.selectedUnitObj.realPrice = (row.selectedUnitObj.totalAmount / row.quantity).toFixed(2)
}
// 整理数据
diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgBack/index.vue b/src/views/supermarketerp/purchaseManagement/smErpCgBack/index.vue
index 9a1e7c4..8f50b7d 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgBack/index.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgBack/index.vue
@@ -64,11 +64,11 @@
-
+
-
+
{{ displayPrice(row.totalAmount) }}
diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
index fd3306a..bf29485 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
@@ -157,11 +157,11 @@
-
-
- {{ displayPrice(row.selectedUnitObj?.retailPrice || 0) }}
-
-
+
+
+ {{ displayPrice(row.selectedUnitObj?.retailPrice || 0) }}
+
+
{{ displayPrice(row.selectedUnitObj?.purchasePrice || 0) }}
@@ -392,7 +392,7 @@ const onUnitChange = (row: any) => {
// 数量变动
const onQuantityChange = (row: any, $rowIndex: number) => {
row.selectedUnitObj.totalAmount = Number(displayPrice(row.quantity * Number(row.selectedUnitObj.purchasePrice || 0), ""))
- row.selectedUnitObj.realPrice = row.selectedUnitObj.totalAmount / row.quantity
+ row.selectedUnitObj.realPrice = (row.selectedUnitObj.totalAmount / row.quantity).toFixed(2)
}
// 累计总金额变动