From d48d302bd1da8047d10af89d42fb34dd9f8cdeb4 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 30 三月 2026 11:05:23 +0800
Subject: [PATCH] fix: 总金额计算缺失额外加工费用
---
src/views/salesManagement/salesLedger/index.vue | 311 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 234 insertions(+), 77 deletions(-)
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 6254645..dae908a 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -35,28 +35,30 @@
:bound-route-name="processFlowSelectBoundRouteName"
@confirm="handleProcessFlowSelectConfirm"
/>
- <div>
- <el-button type="primary" @click="openForm('add')">
- 鏂板鍙拌处
- </el-button>
- <el-button type="primary" @click="handleBulkDelivery">
- 鍙戣揣
- </el-button>
- <el-button type="primary" plain @click="handleImport">瀵煎叆</el-button>
- <el-button @click="handleOut">瀵煎嚭</el-button>
- <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
- <el-dropdown @command="handlePrintCommand">
- <el-button type="primary" plain>
- 鎵撳嵃鍗曟嵁<el-icon class="el-icon--right"><ArrowDown /></el-icon>
- </el-button>
- <template #dropdown>
- <el-dropdown-menu>
- <el-dropdown-item command="finishedProcessCard">鐢熶骇娴佺▼鍗★紙鎴愬搧锛�</el-dropdown-item>
- <el-dropdown-item command="salesOrder">閿�鍞鍗�</el-dropdown-item>
- </el-dropdown-menu>
- </template>
- </el-dropdown>
- </div>
+ <el-space wrap>
+ <el-button type="primary" @click="openForm('add')">鏂板鍙拌处</el-button>
+ <el-button type="primary" @click="handleBulkDelivery">鍙戣揣</el-button>
+ <el-button type="primary" plain @click="handleImport">瀵煎叆</el-button>
+ <el-button @click="handleOut">瀵煎嚭</el-button>
+
+ <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
+
+ <el-dropdown @command="handlePrintCommand">
+ <el-button type="primary" plain>
+ 鎵撳嵃鍗曟嵁<el-icon class="el-icon--right">
+ <ArrowDown />
+ </el-icon>
+ </el-button>
+ <template #dropdown>
+ <el-dropdown-menu>
+ <el-dropdown-item command="finishedProcessCard">鐢熶骇娴佺▼鍗★紙鎴愬搧锛�</el-dropdown-item>
+ <el-dropdown-item command="salesOrder">閿�鍞鍗�</el-dropdown-item>
+ <el-dropdown-item command="salesDeliveryNote">閿�鍞彂璐у崟</el-dropdown-item>
+ </el-dropdown-menu>
+ </template>
+ </el-dropdown>
+ <el-button type="primary" plain @click="handlePrintLabel">鎵撳嵃鏍囩</el-button>
+ </el-space>
</div>
<el-table :data="tableData" border v-loading="tableLoading" @selection-change="handleSelectionChange"
:expand-row-keys="expandedRowKeys" :row-key="(row) => row.id" :row-class-name="tableRowClassName" show-summary style="width: 100%"
@@ -66,6 +68,7 @@
<template #default="props">
<el-table :data="props.row.children" border show-summary :summary-method="summarizeChildrenTable">
<el-table-column align="center" label="搴忓彿" type="index"/>
+ <el-table-column label="妤煎眰缂栧彿" prop="floorCode" min-width="100" show-overflow-tooltip />
<el-table-column label="浜у搧澶х被" prop="productCategory" />
<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" />
<el-table-column label="鍘氬害" prop="thickness" min-width="90">
@@ -73,6 +76,34 @@
{{ scope.row.thickness ?? "" }}
</template>
</el-table-column>
+ <el-table-column label="瀹�(mm)" prop="width" min-width="80">
+ <template #default="scope">
+ {{ scope.row.width ?? "" }}
+ </template>
+ </el-table-column>
+ <el-table-column label="楂�(mm)" prop="height" min-width="80">
+ <template #default="scope">
+ {{ scope.row.height ?? "" }}
+ </template>
+ </el-table-column>
+ <el-table-column label="鍛ㄩ暱(cm)" prop="perimeter" min-width="90">
+ <template #default="scope">
+ {{ scope.row.perimeter ?? "" }}
+ </template>
+ </el-table-column>
+ <el-table-column label="鎬婚潰绉�(cm虏)" prop="actualTotalArea" min-width="100">
+ <template #default="scope">
+ {{ scope.row.actualTotalArea ?? "" }}
+ </template>
+ </el-table-column>
+ <el-table-column label="鍔犲伐瑕佹眰" prop="processRequirement" min-width="120"
+ show-overflow-tooltip />
+ <el-table-column label="澶囨敞" prop="remark" min-width="120" show-overflow-tooltip />
+ <el-table-column label="閲嶇" prop="heavyBox" min-width="80">
+ <template #default="scope">
+ {{ scope.row.heavyBox ?? "" }}
+ </template>
+ </el-table-column>
<el-table-column label="浜у搧鐘舵��"
width="100px"
align="center">
@@ -256,6 +287,21 @@
<el-table-column label="鍘氬害" prop="thickness" min-width="90">
<template #default="scope">
{{ scope.row.thickness ?? "" }}
+ </template>
+ </el-table-column>
+ <el-table-column label="瀹�(mm)" prop="width" min-width="80">
+ <template #default="scope">
+ {{ scope.row.width ?? "" }}
+ </template>
+ </el-table-column>
+ <el-table-column label="楂�(mm)" prop="height" min-width="80">
+ <template #default="scope">
+ {{ scope.row.height ?? "" }}
+ </template>
+ </el-table-column>
+ <el-table-column label="闈㈢Н(m虏)" prop="actualTotalArea" min-width="100">
+ <template #default="scope">
+ {{ scope.row.actualTotalArea ?? "" }}
</template>
</el-table-column>
<el-table-column label="鏁伴噺" prop="quantity" />
@@ -578,7 +624,7 @@
style="width: 100%"
placeholder="璇疯緭鍏�"
clearable
- @change="recalcAreaTotals"
+ @change="() => { recalcAreaTotals(); calculateFromUnitPrice(true); }"
/>
</el-form-item>
</el-col>
@@ -675,11 +721,12 @@
<el-input-number
v-model="item.quantity"
:min="0"
- :step="0.1"
- :precision="2"
+ :step="1"
+ :precision="0"
style="width: 100%;"
placeholder="璇疯緭鍏ユ暟閲�"
:disabled="operationType === 'view'"
+ @change="calculateFromUnitPrice(true)"
/>
</div>
<el-button
@@ -891,6 +938,9 @@
saleProcessBind,
getSaleProcessBindInfo,
getProcessCard,
+ getSalesOrder,
+ getSalesInvoices,
+ getSalesLabel,
} from "@/api/salesManagement/salesLedger.js";
import { modelList, productTreeList } from "@/api/basicData/product.js";
import useFormData from "@/hooks/useFormData.js";
@@ -898,6 +948,8 @@
import { getCurrentDate } from "@/utils/index.js";
import { printFinishedProcessCard } from "./components/processCardPrint.js";
import { printSalesOrder } from "./components/salesOrderPrint.js";
+import { printSalesDeliveryNote } from "./components/salesDeliveryPrint.js";
+import { printSalesLabel } from "./components/salesLabelPrint.js";
// import { salesLedgerProductSetProcessFlowConfig } from "@/api/salesManagement/salesProcessFlowConfig.js";
const userStore = useUserStore();
@@ -1042,7 +1094,7 @@
type: "璐ц溅", // 璐ц溅, 蹇��
},
deliveryRules: {
- type: [
+ type: [
{ required: true, message: "璇烽�夋嫨鍙戣揣绫诲瀷", trigger: "change" }
]
},
@@ -1068,6 +1120,7 @@
otherAmountSelectOptions.value = records.map((item) => ({
id: item.id,
processName: item.processName ?? "",
+ unitPrice: item.unitPrice ?? 0,
}));
} finally {
otherAmountSelectOptionsLoading.value = false;
@@ -1139,6 +1192,7 @@
return {
id: s.id,
processName: opt?.processName ?? s.processName ?? "",
+ unitPrice: opt?.unitPrice ?? s.unitPrice ?? 0,
quantity: Number(s.quantity ?? 0) || 0,
};
});
@@ -1194,8 +1248,10 @@
productForm.value.salesProductProcessList.push({
id: opt.id,
processName: opt.processName,
+ unitPrice: opt.unitPrice ?? 0,
quantity: 0,
});
+ calculateFromUnitPrice(true);
// 閫夋嫨瀹屾垚鍚庡叧闂脊绐楋紝涓嬩竴娆″彲鍐嶆鐐瑰嚮鈥滄柊澧炩�濈户缁坊鍔�
otherAmountAddDialogVisible.value = false;
@@ -1210,6 +1266,7 @@
if (operationType.value === "view") return;
if (!Array.isArray(productForm.value?.salesProductProcessList)) return;
productForm.value.salesProductProcessList.splice(index, 1);
+ calculateFromUnitPrice(true);
};
// 鍙戣揣瀹℃壒浜鸿妭鐐癸紙浠垮崗鍚屽鎵� infoFormDia.vue锛�
@@ -1642,8 +1699,9 @@
productData.value = products.map((p) => {
const quantity = Number(p.quantity ?? 0) || 0;
const unitPrice = Number(p.unitPrice ?? 0) || 0;
+ const settlePieceArea = Number(p.settlePieceArea ?? 0) || 1;
const taxRate = "13"; // 榛樿 13%锛屼究浜庣洿鎺ユ彁浜わ紙濡傞渶鍙湪浜у搧涓嚜琛屼慨鏀癸級
- const taxInclusiveTotalPrice = (unitPrice * quantity).toFixed(2);
+ const taxInclusiveTotalPrice = (unitPrice * settlePieceArea * quantity).toFixed(2);
const taxExclusiveTotalPrice = proxy.calculateTaxExclusiveTotalPrice(taxInclusiveTotalPrice, taxRate);
return {
// 鍙拌处瀛楁
@@ -1835,15 +1893,16 @@
recalcAreaTotals();
// 鍏朵粬閲戦鍙彁浜� {id, processName, quantity}锛堝悗绔瓧娈碉細salesProductProcessList锛�
productForm.value.salesProductProcessList = (Array.isArray(productForm.value.salesProductProcessList)
- ? productForm.value.salesProductProcessList
- : []
- )
- .map((it) => ({
- id: it?.id,
- processName: it?.processName ?? "",
- quantity: Number(it?.quantity ?? 0) || 0,
- }))
- .filter((it) => it.id !== null && it.id !== undefined && it.id !== "");
+ ? productForm.value.salesProductProcessList
+ : []
+ )
+ .map((it) => ({
+ id: it?.id,
+ processName: it?.processName ?? "",
+ unitPrice: Number(it?.unitPrice ?? 0) || 0,
+ quantity: Number(it?.quantity ?? 0) || 0,
+ }))
+ .filter((it) => it.id !== null && it.id !== undefined && it.id !== "");
if (operationType.value === "edit") {
submitProductEdit();
@@ -2025,14 +2084,53 @@
};
const handlePrintCommand = async (command) => {
- if (command !== "finishedProcessCard" && command !== "salesOrder") return;
- if (selectedRows.value.length !== 1) {
+ if (command !== "finishedProcessCard" && command !== "salesOrder" && command !== "salesDeliveryNote") return;
+ if (command === "salesDeliveryNote") {
+ if (selectedRows.value.length === 0) {
+ proxy.$modal.msgWarning("璇疯嚦灏戦�夋嫨涓�鏉￠攢鍞彴璐︽暟鎹繘琛屾墦鍗�");
+ return;
+ }
+ const customerNames = Array.from(
+ new Set(selectedRows.value.map((item) => String(item?.customerName ?? "").trim()))
+ );
+ if (customerNames.length > 1) {
+ proxy.$modal.msgWarning("浠呮敮鎸佺浉鍚屽鎴峰悕绉扮殑閿�鍞彴璐﹀悎骞跺彂璐ф墦鍗�");
+ return;
+ }
+ } else if (selectedRows.value.length !== 1) {
proxy.$modal.msgWarning("璇烽�夋嫨涓�鏉￠攢鍞彴璐︽暟鎹繘琛屾墦鍗�");
return;
}
const selectedRow = selectedRows.value[0];
const selectedId = selectedRow?.id;
+ if (command === "salesDeliveryNote") {
+ const selectedIds = selectedRows.value
+ .map((item) => item?.id)
+ .filter((id) => id !== null && id !== undefined && id !== "");
+ if (selectedIds.length !== selectedRows.value.length) {
+ proxy.$modal.msgWarning("褰撳墠閫夋嫨鏁版嵁瀛樺湪缂哄皯ID鐨勮褰曪紝鏃犳硶鎵撳嵃");
+ return;
+ }
+ const loadingText =
+ command === "salesOrder"
+ ? "姝ｅ湪鑾峰彇閿�鍞鍗曟暟鎹紝璇风◢鍊�..."
+ : command === "salesDeliveryNote"
+ ? "姝ｅ湪鑾峰彇閿�鍞彂璐у崟鏁版嵁锛岃绋嶅��..."
+ : "姝ｅ湪鑾峰彇鐢熶骇娴佺▼鍗℃暟鎹紝璇风◢鍊�...";
+ proxy.$modal.loading(loadingText);
+ try {
+ const res = await getSalesInvoices(selectedIds);
+ const salesInvoiceData = res?.data ?? {};
+ printSalesDeliveryNote(salesInvoiceData, selectedRow);
+ } catch (error) {
+ console.error("鎵撳嵃閿�鍞彂璐у崟澶辫触:", error);
+ proxy.$modal.msgError("鎵撳嵃澶辫触锛岃绋嶅悗閲嶈瘯");
+ } finally {
+ proxy.$modal.closeLoading();
+ }
+ return;
+ }
if (!selectedId) {
proxy.$modal.msgWarning("褰撳墠閫夋嫨鏁版嵁缂哄皯ID锛屾棤娉曟墦鍗�");
return;
@@ -2041,19 +2139,59 @@
const loadingText =
command === "salesOrder"
? "姝ｅ湪鑾峰彇閿�鍞鍗曟暟鎹紝璇风◢鍊�..."
- : "姝ｅ湪鑾峰彇鐢熶骇娴佺▼鍗℃暟鎹紝璇风◢鍊�...";
+ : command === "salesDeliveryNote"
+ ? "姝ｅ湪鑾峰彇閿�鍞彂璐у崟鏁版嵁锛岃绋嶅��..."
+ : "姝ｅ湪鑾峰彇鐢熶骇娴佺▼鍗℃暟鎹紝璇风◢鍊�...";
proxy.$modal.loading(loadingText);
try {
- const res = await getProcessCard(selectedId);
- const processCardData = res?.data ?? {};
if (command === "salesOrder") {
- printSalesOrder(processCardData);
+ const res = await getSalesOrder(selectedId);
+ const salesOrderData = res?.data ?? {};
+ printSalesOrder(salesOrderData);
} else {
+ const res = await getProcessCard(selectedId);
+ const processCardData = res?.data ?? {};
printFinishedProcessCard(processCardData);
}
} catch (error) {
- console.error(command === "salesOrder" ? "鎵撳嵃閿�鍞鍗曞け璐�:" : "鎵撳嵃鐢熶骇娴佺▼鍗″け璐�:", error);
+ console.error(
+ command === "salesOrder"
+ ? "鎵撳嵃閿�鍞鍗曞け璐�:"
+ : command === "salesDeliveryNote"
+ ? "鎵撳嵃閿�鍞彂璐у崟澶辫触:"
+ : "鎵撳嵃鐢熶骇娴佺▼鍗″け璐�:",
+ error
+ );
proxy.$modal.msgError("鎵撳嵃澶辫触锛岃绋嶅悗閲嶈瘯");
+ } finally {
+ proxy.$modal.closeLoading();
+ }
+};
+
+const handlePrintLabel = async () => {
+ if (selectedRows.value.length !== 1) {
+ proxy.$modal.msgWarning("璇烽�夋嫨涓�鏉￠攢鍞彴璐︽暟鎹繘琛屾爣绛炬墦鍗�");
+ return;
+ }
+
+ const selectedId = selectedRows.value[0]?.id;
+ if (!selectedId) {
+ proxy.$modal.msgWarning("褰撳墠閫夋嫨鏁版嵁缂哄皯ID锛屾棤娉曟墦鍗版爣绛�");
+ return;
+ }
+
+ proxy.$modal.loading("姝ｅ湪鑾峰彇鏍囩鏁版嵁锛岃绋嶅��...");
+ try {
+ const res = await getSalesLabel(selectedId);
+ const labelList = res?.data ?? [];
+ if (!Array.isArray(labelList) || labelList.length === 0) {
+ proxy.$modal.msgWarning("鏆傛棤鍙墦鍗版爣绛炬暟鎹�");
+ return;
+ }
+ printSalesLabel(labelList);
+ } catch (error) {
+ console.error("鎵撳嵃鏍囩澶辫触:", error);
+ proxy.$modal.msgError("鎵撳嵃鏍囩澶辫触锛岃绋嶅悗閲嶈瘯");
} finally {
proxy.$modal.closeLoading();
}
@@ -2067,12 +2205,16 @@
if (!productForm.value.quantity) {
return;
}
- // 鍚◣鎬讳环璁＄畻
- productForm.value.taxInclusiveTotalPrice =
- proxy.calculateTaxIncludeTotalPrice(
- productForm.value.taxInclusiveUnitPrice,
- productForm.value.quantity
- );
+ const settlePieceArea = parseFloat(productForm.value.settlePieceArea) || 1;
+ // 鍚◣鎬讳环璁＄畻 = 鍗曚环 * 缁撶畻闈㈢Н * 鏁伴噺 + 鍏朵粬閲戦鎬诲拰
+ const basePrice = proxy.calculateTaxIncludeTotalPrice(
+ productForm.value.taxInclusiveUnitPrice * settlePieceArea,
+ productForm.value.quantity
+ );
+ const otherAmountTotal = (productForm.value.salesProductProcessList || []).reduce((total, item) => {
+ return total + (Number(item.unitPrice) || 0) * (Number(item.quantity) || 0);
+ }, 0);
+ productForm.value.taxInclusiveTotalPrice = (parseFloat(basePrice) + otherAmountTotal).toFixed(2);
if (productForm.value.taxRate) {
// 涓嶅惈绋庢�讳环璁＄畻
productForm.value.taxExclusiveTotalPrice =
@@ -2133,15 +2275,12 @@
const computed = Number(computedPieceArea.toFixed(5));
productForm.value.actualPieceArea = computed;
-
- // settlePieceArea锛氳嫢鐢ㄦ埛鏈～鍐�/涓�0锛屽垯榛樿浣跨敤瀹介珮璁＄畻鍊�
- const settlePieceRaw = Number(productForm.value.settlePieceArea ?? 0) || 0;
- if (!settlePieceRaw) {
- productForm.value.settlePieceArea = computed;
- }
+ productForm.value.settlePieceArea = computed;
recalcPerimeterFromWidthHeight();
recalcAreaTotals();
+ // 闈㈢Н鏇存柊鍚庯紝閲嶆柊璁＄畻鍚◣鎬讳环 = 鍗曚环 * 缁撶畻闈㈢Н * 鏁伴噺
+ calculateFromUnitPrice(true);
};
// 鏍规嵁鍚◣鎬讳环璁＄畻鍚◣鍗曚环鍜屾暟閲�
@@ -2157,8 +2296,12 @@
isCalculating.value = true;
- // 璁＄畻鍚◣鍗曚环 = 鍚◣鎬讳环 / 鏁伴噺
- productForm.value.taxInclusiveUnitPrice = (totalPrice / quantity).toFixed(2);
+ // 璁＄畻鍚◣鍗曚环 = (鍚◣鎬讳环 - 鍏朵粬閲戦鎬诲拰) / 鏁伴噺
+ const otherAmountTotal = (productForm.value.salesProductProcessList || []).reduce((total, item) => {
+ return total + (Number(item.unitPrice) || 0) * (Number(item.quantity) || 0);
+ }, 0);
+ const basePrice = totalPrice - otherAmountTotal;
+ productForm.value.taxInclusiveUnitPrice = (basePrice / quantity).toFixed(2);
// 濡傛灉鏈夌◣鐜囷紝璁＄畻涓嶅惈绋庢�讳环
if (productForm.value.taxRate) {
@@ -2195,8 +2338,12 @@
const inclusiveTotalPrice = exclusiveTotalPrice / (1 - taxRateDecimal);
productForm.value.taxInclusiveTotalPrice = inclusiveTotalPrice.toFixed(2);
- // 璁＄畻鍚◣鍗曚环 = 鍚◣鎬讳环 / 鏁伴噺
- productForm.value.taxInclusiveUnitPrice = (inclusiveTotalPrice / quantity).toFixed(2);
+ // 璁＄畻鍚◣鍗曚环 = (鍚◣鎬讳环 - 鍏朵粬閲戦鎬诲拰) / 鏁伴噺
+ const otherAmountTotal = (productForm.value.salesProductProcessList || []).reduce((total, item) => {
+ return total + (Number(item.unitPrice) || 0) * (Number(item.quantity) || 0);
+ }, 0);
+ const basePrice = inclusiveTotalPrice - otherAmountTotal;
+ productForm.value.taxInclusiveUnitPrice = (basePrice / quantity).toFixed(2);
isCalculating.value = false;
};
@@ -2208,19 +2355,24 @@
return;
}
if (isCalculating.value) return;
-
+
const quantity = parseFloat(productForm.value.quantity);
const unitPrice = parseFloat(productForm.value.taxInclusiveUnitPrice);
-
+ const settlePieceArea = parseFloat(productForm.value.settlePieceArea) || 1;
+
if (!quantity || quantity <= 0 || !unitPrice) {
return;
}
-
+
isCalculating.value = true;
-
- // 璁＄畻鍚◣鎬讳环
- productForm.value.taxInclusiveTotalPrice = (unitPrice * quantity).toFixed(2);
-
+
+ // 璁＄畻鍚◣鎬讳环 = 鍗曚环 * 缁撶畻闈㈢Н * 鏁伴噺 + 鍏朵粬閲戦鎬诲拰
+ const basePrice = unitPrice * settlePieceArea * quantity;
+ const otherAmountTotal = (productForm.value.salesProductProcessList || []).reduce((total, item) => {
+ return total + (Number(item.unitPrice) || 0) * (Number(item.quantity) || 0);
+ }, 0);
+ productForm.value.taxInclusiveTotalPrice = (basePrice + otherAmountTotal).toFixed(2);
+
// 濡傛灉鏈夌◣鐜囷紝璁＄畻涓嶅惈绋庢�讳环
if (productForm.value.taxRate) {
productForm.value.taxExclusiveTotalPrice =
@@ -2229,30 +2381,35 @@
productForm.value.taxRate
);
}
-
+
isCalculating.value = false;
};
// 鏍规嵁鍚◣鍗曚环鍙樺寲璁＄畻鎬讳环
-const calculateFromUnitPrice = () => {
+const calculateFromUnitPrice = (silent = false) => {
if (!productForm.value.taxRate) {
- proxy.$modal.msgWarning("璇峰厛閫夋嫨绋庣巼");
+ if (!silent) proxy.$modal.msgWarning("璇峰厛閫夋嫨绋庣巼");
return;
}
if (isCalculating.value) return;
-
+
const quantity = parseFloat(productForm.value.quantity);
const unitPrice = parseFloat(productForm.value.taxInclusiveUnitPrice);
-
+ const settlePieceArea = parseFloat(productForm.value.settlePieceArea) || 1;
+
if (!quantity || quantity <= 0 || !unitPrice) {
return;
}
-
+
isCalculating.value = true;
-
- // 璁＄畻鍚◣鎬讳环
- productForm.value.taxInclusiveTotalPrice = (unitPrice * quantity).toFixed(2);
-
+
+ // 璁＄畻鍚◣鎬讳环 = 鍗曚环 * 缁撶畻闈㈢Н * 鏁伴噺 + 鍏朵粬閲戦鎬诲拰
+ const basePrice = unitPrice * settlePieceArea * quantity;
+ const otherAmountTotal = (productForm.value.salesProductProcessList || []).reduce((total, item) => {
+ return total + (Number(item.unitPrice) || 0) * (Number(item.quantity) || 0);
+ }, 0);
+ productForm.value.taxInclusiveTotalPrice = (basePrice + otherAmountTotal).toFixed(2);
+
// 濡傛灉鏈夌◣鐜囷紝璁＄畻涓嶅惈绋庢�讳环
if (productForm.value.taxRate) {
productForm.value.taxExclusiveTotalPrice =
@@ -2261,7 +2418,7 @@
productForm.value.taxRate
);
}
-
+
isCalculating.value = false;
};
--
Gitblit v1.9.3