From aaf943ada13005f2b22d01e3d7080b8740d9aa96 Mon Sep 17 00:00:00 2001
From: zhang_12370 <z2864490065@outlook.com>
Date: 星期二, 15 七月 2025 15:09:49 +0800
Subject: [PATCH] 添加待入库功能及优化配煤计算器
---
src/views/procureMent/components/ProductionDialog.vue | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/src/views/procureMent/components/ProductionDialog.vue b/src/views/procureMent/components/ProductionDialog.vue
index 0c720bf..4378006 100644
--- a/src/views/procureMent/components/ProductionDialog.vue
+++ b/src/views/procureMent/components/ProductionDialog.vue
@@ -203,7 +203,7 @@
// 1. 鏍规嵁鍚◣鍗曚环鍜岀◣鐜囪绠椾笉鍚◣鍗曚环
// 涓嶅惈绋庡崟浠� = 鍚◣鍗曚环 / (1 + 绋庣巼/100)
const priceExcludingTax = priceIncludingTax && taxRate
- ? toFixed(priceIncludingTax / (1 + taxRate / 100), 2)
+ ? parseFloat((priceIncludingTax / (1 + taxRate / 100)).toFixed(2))
: 0;
// 2. 璁＄畻涓嶅惈绋庢�讳环 = 涓嶅惈绋庡崟浠� 脳 鏁伴噺
@@ -216,8 +216,8 @@
? toFixed(priceIncludingTax * quantity, 2)
: 0;
- // 鏇存柊琛ㄥ崟鏁版嵁
- form.value.priceExcludingTax = priceExcludingTax;
+ // 淇濊瘉鏄剧ず涓轰袱浣嶅皬鏁帮紙濡�88.5鏄剧ず涓�88.50锛�
+ form.value.priceExcludingTax = priceExcludingTax.toFixed(2);
form.value.totalPriceExcludingTax = totalPriceExcludingTax;
form.value.totalPriceIncludingTax = totalPriceIncludingTax;
};
@@ -282,20 +282,13 @@
priceExcludingTax: [
{required: true, message: "璇疯緭鍏ュ崟浠�", trigger: "blur"},
],
- totalPriceExcludingTax: [
- {required: true, message: "璇疯緭鍏ユ�讳环", trigger: "blur"},
- ],
priceIncludingTax: [
{required: true, message: "璇疯緭鍏ュ惈绋庡崟浠�", trigger: "blur"},
],
- totalPriceIncludingTax: [
- {required: true, message: "璇疯緭鍏ュ惈绋庢�讳环", trigger: "blur"},
- ],
- taxRate: [{required: true, message: "璇疯緭鍏ョ◣鐜�", trigger: "blur"}],
- registrantId: [{required: true, message: "璇疯緭鍏ョ櫥璁颁汉", trigger: "blur"}],
- registrationDate: [
- {required: true, message: "璇烽�夋嫨鐧昏鏃ユ湡", trigger: "change"},
- ],
+ taxRate:[
+ {required: true, message: "璇疯緭鍏ョ◣鐜�", trigger: "blur"},
+ {type: "number", message: "绋庣巼蹇呴』涓烘暟瀛�", trigger: "blur"},
+ ]
};
// 鍏抽棴寮圭獥
const handleClose = () => {
--
Gitblit v1.9.3