From 2f894921e5cf74910805f08a5e3180b68ac09e18 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 23 四月 2024 15:50:32 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override
---
north-glass-erp/northglass-erp/src/components/sd/order/OrderOtherMoney.vue | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/OrderOtherMoney.vue b/north-glass-erp/northglass-erp/src/components/sd/order/OrderOtherMoney.vue
index 3217d84..6120ba2 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/OrderOtherMoney.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/OrderOtherMoney.vue
@@ -54,9 +54,9 @@
quantity: [
{
validator ({ cellValue }) {
- const regex = /^[1-9]\d*$|^0$/
+ const regex = /^(0(\.\d{1,2})?|([1-9]\d{0,4})(\.\d{1,2})?|99999(\.9{1,2})?)$/
if (cellValue && !regex.test(cellValue) ) {
- return new Error('璇疯緭鍏ュぇ浜庣瓑浜�0鐨勬暣鏁�')
+ return new Error(t('basicData.msg.range99999Dec2') )
}
}
}
@@ -139,6 +139,7 @@
return count.toFixed(2)==='NaN' ? null : parseFloat(count.toFixed(2))
}
+//鐢ㄤ簬鎺ユ敹鐖剁粍浠跺弬鏁�
let prop = defineProps({
otherMoney:{}
})
@@ -149,11 +150,11 @@
xGrid.value.reloadData(prop.otherMoney)
})
-const countAmount = computed(() => (row) => {
+const countAmount = (row) => {
const price = row.price===null?0:row.price
const quantity = row.quantity===null?0:row.quantity
return parseFloat((row.price * row.quantity).toFixed(2))
-})
+}
const validate = async () => {
--
Gitblit v1.8.0