diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
index ff1aba3..2d5357d 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue
@@ -152,9 +152,9 @@
v-model="row.quantity"
:min="0"
:precision="0"
- @change="onRowValueChange(row, $rowIndex)"
+ @change="onQuantityChange(row, $rowIndex)"
/>
-
+
@@ -162,11 +162,11 @@
{{ displayPrice(row.selectedUnitObj?.purchasePrice || 0) }}
-
+
{{ row?.selectedUnitObj?.realPrice || 0 }}
-
+
{{ row?.selectedUnitObj?.totalAmount }}
-
+
{{ total.totalAmount }}元
@@ -276,7 +282,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 }
})
@@ -378,9 +384,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
+}
+
+// 累计总金额变动
+const onTotalAmountChange = (row: any, $rowIndex: number) => {
+ row.selectedUnitObj.realPrice = (row.selectedUnitObj.totalAmount / row.quantity).toFixed(2)
}
// 整理table数据
diff --git a/src/views/supermarketerp/stockTaking/index.vue b/src/views/supermarketerp/stockTaking/index.vue
index f66a503..dda9afd 100644
--- a/src/views/supermarketerp/stockTaking/index.vue
+++ b/src/views/supermarketerp/stockTaking/index.vue
@@ -15,9 +15,6 @@
value-format="YYYY-MM-DD"
/>
-
查询
重置
@@ -51,8 +48,7 @@
-
-
+