From 6b35989783d91899169f89e21a7d3734d8cadc1d Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 04 一月 2026 15:19:54 +0800
Subject: [PATCH] 1.海川开心
---
src/views/inventoryManagement/receiptManagement/components/formDia.vue | 46 +++++++++++++++++++++++++---------------------
1 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/src/views/inventoryManagement/receiptManagement/components/formDia.vue b/src/views/inventoryManagement/receiptManagement/components/formDia.vue
index 6bb7b6c..a736b52 100644
--- a/src/views/inventoryManagement/receiptManagement/components/formDia.vue
+++ b/src/views/inventoryManagement/receiptManagement/components/formDia.vue
@@ -46,15 +46,15 @@
</template>
</el-table-column>
<el-table-column label="绋庣巼(%)" prop="taxRate" width="120" />
- <el-table-column label="鍗曚环(鍏�)" prop="unitPrice" width="150">
+ <el-table-column label="鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" width="150">
<template #default="scope">
- <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="scope.row.unitPrice" @change="() => calculateTotalPrice(scope.row)" />
+ <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="scope.row.taxInclusiveUnitPrice" @change="() => calculateTotalPrice(scope.row)" :disabled="operationType === 'edit'"/>
</template>
</el-table-column>
<el-table-column
label="鎬讳环(鍏�)"
:formatter="formattedNumber"
- prop="totalPrice"
+ prop="taxInclusiveTotalPrice"
width="150"
>
</el-table-column>
@@ -78,6 +78,7 @@
selectProductRecordListByPuechaserId
} from "@/api/inventoryManagement/stockIn.js";
import { purchaseListPage } from "@/api/procurementManagement/procurementLedger.js";
+import { getCurrentDate } from "@/utils/index.js";
const userStore = useUserStore()
const { proxy } = getCurrentInstance()
@@ -194,12 +195,12 @@
// 璁＄畻鎬讳环
const calculateTotalPrice = (row) => {
const quantityStock = Number(row?.quantityStock ?? 0);
- const unitPrice = Number(row?.unitPrice ?? 0);
+ const taxInclusiveUnitPrice = Number(row?.taxInclusiveUnitPrice ?? 0);
- if (Number.isFinite(quantityStock) && Number.isFinite(unitPrice)) {
- row.totalPrice = quantityStock * unitPrice;
+ if (Number.isFinite(quantityStock) && Number.isFinite(taxInclusiveUnitPrice)) {
+ row.taxInclusiveTotalPrice = quantityStock * taxInclusiveUnitPrice;
} else {
- row.totalPrice = 0;
+ row.taxInclusiveTotalPrice = 0;
}
};
@@ -218,13 +219,17 @@
productList.value = [];
return
}
- productList.value = productRes.data.map(item => ({
- ...item,
- quantityStock: 0,
- unitPrice: Number(item?.unitPrice ?? 0),
- totalPrice: 0,
- originalQuantityStock: Number(item.quantityStock ?? item.inboundQuantity ?? 0),
- }))
+ productList.value = productRes.data.map(item => {
+ const quantityStock = Number(item?.quantity0 ?? 0);
+ const taxInclusiveUnitPrice = Number(item?.taxInclusiveUnitPrice ?? 0);
+ return {
+ ...item,
+ quantityStock,
+ taxInclusiveUnitPrice,
+ taxInclusiveTotalPrice: quantityStock * taxInclusiveUnitPrice,
+ originalQuantityStock: Number(item.quantityStock ?? item.inboundQuantity ?? 0),
+ };
+ })
} catch (error) {
console.error('鏌ヨ浜у搧璁板綍澶辫触:', error)
proxy.$modal.msgError('鏌ヨ浜у搧璁板綍澶辫触')
@@ -290,8 +295,8 @@
details: selectedRows.value.map(product => ({
id: product.id,
inboundQuantity: Number(product.quantityStock),
- unitPrice: Number(product.unitPrice),
- totalPrice: Number(product.totalPrice)
+ taxInclusiveUnitPrice: Number(product.taxInclusiveUnitPrice),
+ taxInclusiveTotalPrice: Number(product.taxInclusiveTotalPrice)
})),
};
loading.value = true
@@ -338,9 +343,6 @@
return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
}
-function getCurrentDate() {
- return formatDateTime(new Date(), false);
-}
const openDialog = async (type, row) => {
operationType.value = type
@@ -373,8 +375,8 @@
productList.value = res.data.map(item => ({
...item,
quantityStock: Number(item.quantityStock ?? item.inboundQuantity ?? row.inboundNum ?? 0),
- unitPrice: Number(item?.unitPrice ?? 0),
- totalPrice: Number(item?.quantityStock ?? 0) * Number(item?.unitPrice ?? 0),
+ taxInclusiveUnitPrice: Number(item?.taxInclusiveUnitPrice ?? 0),
+ taxInclusiveTotalPrice: Number(item?.quantityStock ?? 0) * Number(item?.taxInclusiveUnitPrice ?? 0),
originalQuantityStock: Number(item.quantityStock ?? item.inboundQuantity ?? row.inboundNum ?? 0),
}))
selectedRows.value = productList.value
@@ -395,3 +397,5 @@
<style scoped lang="scss"></style>
+
+
--
Gitblit v1.9.3