From d841a8ea6dc2f7fdedbf0ea2b1e539842f5f3e37 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 12 十月 2026 19:45:36 +0800
Subject: [PATCH] 宁夏-九鸿 1.发版配置文件修改
---
src/views/erp/purchase/order/modules/item-form.vue | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/src/views/erp/purchase/order/modules/item-form.vue b/src/views/erp/purchase/order/modules/item-form.vue
index f4565b5..fac9041 100644
--- a/src/views/erp/purchase/order/modules/item-form.vue
+++ b/src/views/erp/purchase/order/modules/item-form.vue
@@ -14,7 +14,6 @@
import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
import { getItemPage } from '#/api/mdm/item';
-import { getStockCount } from '#/api/erp/stock/stock';
import { useFormItemColumns } from '../data';
@@ -124,10 +123,8 @@
const newRow = {
id: undefined,
productId: undefined,
- productUnitName: undefined, // 浜у搧鍗曚綅
- productBarCode: undefined, // 浜у搧鏉＄爜
+ productUnitName: undefined,
productPrice: undefined,
- stockCount: undefined,
count: 1,
totalProductPrice: undefined,
taxPercent: 0,
@@ -160,10 +157,8 @@
}
row.productId = productId;
row.productUnitId = product.unitMeasureId;
- row.productBarCode = product.barCode;
row.productUnitName = product.unitMeasureName;
row.productName = product.name;
- row.stockCount = (await getStockCount(productId)) || 0;
row.productPrice = product.purchasePrice || 0;
row.count = row.count || 1;
handleRowChange(row);
@@ -171,6 +166,7 @@
/** 澶勭悊琛屾暟鎹彉鏇� */
function handleRowChange(row: any) {
+ recalcRow(row);
const index = tableData.value.findIndex((item) => item.seq === row.seq);
if (index === -1) {
tableData.value.push(row);
@@ -180,13 +176,28 @@
emit('update:items', [...tableData.value]);
}
-/** 鍒濆鍖栬鏁版嵁 */
-function initRow(row: ErpPurchaseOrderApi.PurchaseOrderItem) {
+/**
+ * 閲嶇畻琛岄噾棰濓紙鍗曚环涓�**鍚◣**鍗曚环锛�
+ * 鍚◣閲戦 = 鍚◣鍗曚环 脳 鏁伴噺锛涚◣棰� = 鍚◣閲戦 脳 绋庣巼锛涗笉鍚◣閲戦 = 鍚◣閲戦 - 绋庨
+ */
+function recalcRow(row: ErpPurchaseOrderApi.PurchaseOrderItem) {
if (row.productPrice && row.count) {
- row.totalProductPrice = erpPriceMultiply(row.productPrice, row.count) ?? 0;
+ const taxInclusivePrice = erpPriceMultiply(row.productPrice, row.count) ?? 0;
row.taxPrice =
- erpPriceMultiply(row.totalProductPrice, (row.taxPercent || 0) / 100) ?? 0;
- row.totalPrice = row.totalProductPrice + row.taxPrice;
+ erpPriceMultiply(taxInclusivePrice, (row.taxPercent || 0) / 100) ?? 0;
+ row.totalProductPrice = taxInclusivePrice - row.taxPrice;
+ row.totalPrice = taxInclusivePrice;
+ }
+}
+
+/**
+ * 鍒濆鍖栬鏁版嵁
+ * 宸叉湁鍗曟嵁鐨勬槑缁嗚锛堝甫 id锛夋部鐢ㄥ悗绔繑鍥炵殑閲戦锛岄伩鍏嶅巻鍙插崟鎹鏂板彛寰勮鐩栵紱
+ * 鍙湁鏈繚瀛樼殑鏂板琛屾墠鎸夋柊鍙ｅ緞閲嶇畻銆�
+ */
+function initRow(row: ErpPurchaseOrderApi.PurchaseOrderItem) {
+ if (!row.id) {
+ recalcRow(row);
}
}
@@ -306,11 +317,11 @@
<div class="flex space-x-4">
<span>鏁伴噺锛歿{ erpCountInputFormatter(summaries.count) }}</span>
<span>
- 閲戦锛歿{ erpPriceInputFormatter(summaries.totalProductPrice) }}
+ 涓嶅惈绋庨噾棰濓細{{ erpPriceInputFormatter(summaries.totalProductPrice) }}
</span>
<span>绋庨锛歿{ erpPriceInputFormatter(summaries.taxPrice) }}</span>
<span>
- 绋庨鍚堣锛歿{ erpPriceInputFormatter(summaries.totalPrice) }}
+ 鍚◣鍚堣锛歿{ erpPriceInputFormatter(summaries.totalPrice) }}
</span>
</div>
</div>
--
Gitblit v1.9.3