From fde27654b1b21a8d2c149d3d12f86c3c7314c091 Mon Sep 17 00:00:00 2001
From: lishenao <3065849776@qq.com>
Date: 星期四, 03 七月 2025 15:00:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/equipmentManagement/ledger/Form.vue | 62 +++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 3 deletions(-)
diff --git a/src/views/equipmentManagement/ledger/Form.vue b/src/views/equipmentManagement/ledger/Form.vue
index f6cc2cb..b6d9229 100644
--- a/src/views/equipmentManagement/ledger/Form.vue
+++ b/src/views/equipmentManagement/ledger/Form.vue
@@ -27,6 +27,7 @@
v-model="form.number"
placeholder="璇疯緭鍏ユ暟閲�"
type="number"
+ @change="mathNum"
/>
</el-form-item>
</el-col>
@@ -36,6 +37,9 @@
v-model="form.taxIncludingPriceUnit"
placeholder="璇疯緭鍏ュ惈绋庡崟浠�"
type="number"
+ maxlength="10"
+ @change="mathNum"
+ @input="handleNumberInput"
/>
</el-form-item>
</el-col>
@@ -45,18 +49,29 @@
v-model="form.taxIncludingPriceTotal"
placeholder="璇疯緭鍏ュ惈绋庢�讳环"
type="number"
+ disabled
/>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="绋庣巼" prop="taxRate">
- <el-input
+ <el-form-item label="绋庣巼(%)" prop="taxRate">
+ <!-- <el-input
v-model="form.taxRate"
placeholder="璇疯緭鍏ョ◣鐜�"
type="number"
>
<template #append> % </template>
- </el-input>
+ </el-input> -->
+ <el-select
+ v-model="form.taxRate"
+ placeholder="璇烽�夋嫨"
+ clearable
+ @change="mathNum"
+ >
+ <el-option label="1" :value="1" />
+ <el-option label="6" :value="6" />
+ <el-option label="13" :value="13" />
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -65,6 +80,7 @@
v-model="form.unTaxIncludingPriceTotal"
placeholder="璇疯緭鍏ヤ笉鍚◣鎬讳环"
type="number"
+ disabled
/>
</el-form-item>
</el-col>
@@ -95,6 +111,11 @@
// import useUserStore from "@/store/modules/user";
import { getLedgerById } from "@/api/equipmentManagement/ledger";
import dayjs from "dayjs";
+import {
+ calculateTaxIncludeTotalPrice,
+ calculateTaxExclusiveTotalPrice,
+} from "@/utils/summarizeTable";
+import { ElMessage } from "element-plus";
defineOptions({
name: "璁惧鍙拌处琛ㄥ崟",
@@ -130,8 +151,43 @@
}
};
+const mathNum = () => {
+ if (!form.taxIncludingPriceUnit) {
+ ElMessage.error("璇疯緭鍏ュ崟浠�");
+ return;
+ }
+ if (!form.number) {
+ ElMessage.error("璇疯緭鍏ユ暟閲�");
+ return;
+ }
+ form.taxIncludingPriceTotal = calculateTaxIncludeTotalPrice(
+ form.taxIncludingPriceUnit,
+ form.number
+ );
+ if (form.taxRate) {
+ form.unTaxIncludingPriceTotal = calculateTaxExclusiveTotalPrice(
+ form.taxIncludingPriceTotal,
+ form.taxRate
+ );
+ }
+};
+
+const handleNumberInput = (value) => {
+ // 绉婚櫎鎵�鏈夐潪鏁板瓧瀛楃
+ let num = value.replace(/[^\d.]/g, "");
+
+ // 闄愬埗闀垮害涓�10
+ if (num.length > 10) {
+ num = num.slice(0, 10);
+ }
+
+ // 鏇存柊鍊�
+ form.taxIncludingPriceUnit = num;
+};
+
defineExpose({
form,
loadForm,
+ resetForm,
});
</script>
--
Gitblit v1.9.3