diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue
index 35d3c26..6d33ac8 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue
@@ -88,7 +88,7 @@
-->
商品选择
删除选中
- 清空数据
+ 清空数据
-
-
-
- {{
- row.purchasePrice
- ? displayPrice(row.purchasePrice)
- : displayPrice(row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.purchasePrice)
- }}
-
-
-
-
- {{
- row.real_price
- ? displayPrice(row.real_price)
- : displayPrice(row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.purchasePrice)
- }}
-
-
+
+
+ {{
+ row.purchasePrice
+ ? displayPrice(row.purchasePrice)
+ : displayPrice(row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.purchasePrice)
+ }}
+
+
+
+ {{ row.realPrice }}
+
+
+
+
- {{ displayPrice(row.quantity * parseFloat(row.purchasePrice)) }}
+ {{ Number(row.quantity * parseFloat(row.realPrice)).toFixed(2) }}
- {{ displayPrice(Number(row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.purchasePrice) * row.quantity) }}
+ {{ Number(Number(row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.realPrice) * row.quantity).toFixed(2) }}
@@ -229,7 +225,7 @@ import { VxeTableEvents, VxeTablePropTypes, type VxeTableInstance } from "vxe-ta
import { formatDate } from "/@/utils/formatTime"
import { Search } from "@element-plus/icons-vue"
import linkCodeDialog from "/@/views/supermarketerp/components/linkCodeDialog.vue"
-import { displayPrice } from "/@/utils/formatMoney"
+import { displayPrice, storePrice } from "/@/utils/formatMoney"
import { tablePrint } from "../../supermarketUtils"
const SelectDialog = defineAsyncComponent(() => import("/@/views/supermarketerp/components/erpSpuSelectDialog.vue"))
@@ -309,6 +305,7 @@ const dataRules = ref({
const validRules = ref>({
unitId: [{ required: true, message: "必须选择" }],
quantity: [{ required: true, type: "number", min: 1, message: "必需大于等于0" }],
+ realPrice: [{ required: true, type: "number", min: 0, message: "必填" }],
})
// 初始化数据
@@ -325,8 +322,8 @@ const getInitData = async () => {
if (cgPlanData && cgPlanData.code === 0) {
Object.assign(baseDataForm, cgPlanData.data)
- state.editableTableData = cgPlanData.data.items
- state.erpSpuItemsMemo = cgPlanData.data.items
+ state.editableTableData = cgPlanData.data.items.map((item: any) => ({ ...item, realPrice: displayPrice(item.realPrice, "") }))
+ state.erpSpuItemsMemo = cgPlanData.data.items.map((item: any) => ({ ...item, realPrice: displayPrice(item.realPrice, "") }))
}
} else {
loading.value = true
@@ -353,8 +350,8 @@ const getSelectedLinkCode = (selectionRows: any) => {
console.log("被选择的关联数据", selectionRows)
baseDataForm.linkCode = selectionRows.code
- state.editableTableData = selectionRows.items
- state.erpSpuItemsMemo = selectionRows.items
+ state.editableTableData = selectionRows.items.map((item: any) => ({ ...item, realPrice: displayPrice(item.purchasePrice, "") }))
+ state.erpSpuItemsMemo = selectionRows.items.map((item: any) => ({ ...item, realPrice: displayPrice(item.purchasePrice, "") }))
state.linkCgPlanDialogVisible = false
}
@@ -486,7 +483,8 @@ const cgPlanSpuItems = computed(() => {
erpSpuId: item.erpSpuId,
quantity: item.quantity,
unitPrice: unit.purchasePrice ? Number(unit?.purchasePrice) : 0,
- totalAmount: Number(unit?.purchasePrice || 0) * item.quantity,
+ realPrice: unit.realPrice ? storePrice(unit?.realPrice) : 0,
+ totalAmount: storePrice(Number(unit?.realPrice || 0) * item.quantity),
remark: item.remark,
unitId: item.unitId,
}
@@ -496,7 +494,8 @@ const cgPlanSpuItems = computed(() => {
erpSpuId: item.erpSpuId,
quantity: item.quantity,
unitPrice: item.purchasePrice ? Number(item.purchasePrice) : 0,
- totalAmount: item?.purchasePrice && item.quantity ? Number(item.purchasePrice) * item.quantity : 0,
+ realPrice: item.realPrice ? storePrice(item.realPrice) : 0,
+ totalAmount: item?.realPrice && item.quantity ? storePrice(Number(item.realPrice) * item.quantity) : 0,
remark: item.remark,
unitId: item.unitId,
}