From 7af24e2656ddae37f03f1ae62b439f1bbf6a9dc4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 06 六月 2025 18:28:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
company/src/components/business/adjustment.vue | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/company/src/components/business/adjustment.vue b/company/src/components/business/adjustment.vue
index 03fef14..4007357 100644
--- a/company/src/components/business/adjustment.vue
+++ b/company/src/components/business/adjustment.vue
@@ -26,7 +26,7 @@
<div class="box_item_list_row" style="width: 50%;" v-for="(item, index) in list2" :key="index">
<el-form-item :label="item.name">
<div style="display: flex; flex-direction: column;">
- <el-input v-model="item.fee" @input="changeFee" type="number" placeholder="璇疯緭鍏ラ噾棰�"></el-input>
+ <el-input v-model="item.fee" @input="changeFee()" type="number" placeholder="璇疯緭鍏ラ噾棰�"></el-input>
<el-input v-model="item.describe" placeholder="璇疯緭鍏ヨ垂鐢ㄨ鏄�"></el-input>
</div>
</el-form-item>
@@ -93,13 +93,21 @@
},
changeFee() {
let arr = [...this.list1, ...this.list2]
+
+ for (let i = 0; i < arr.length; i++) {
+ if (!/^\d+(\.\d{1,2})?$/.test(arr[i].fee)) {
+ arr[i].fee = 0
+ this.$message.warning('鍙兘杈撳叆姝ｆ暟锛屾渶澶氬彧鑳借緭鍏ヤ袱浣嶅皬鏁�')
+ }
+ }
+
let price = 0
arr.forEach(item => {
if (item.fee) {
price += Number(item.fee)
}
})
- this.totalPrice = price
+ this.totalPrice = Math.round(price * 100) / 100;
},
confirm() {
this.$refs.form.validate((valid) => {
--
Gitblit v1.9.3