From 475b0fb972744546a3709ee771053febe5e7c725 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期五, 26 十二月 2025 15:43:37 +0800
Subject: [PATCH] 还原其他金额界面
---
north-glass-erp/northglass-erp/src/components/sd/order/OrderOtherMoney.vue | 9 ++++-----
1 files changed, 4 insertions(+), 5 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 dfd2977..cae176c 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
@@ -10,7 +10,6 @@
const route = useRoute()
let rowClickIndex = ref(null)
const xGrid = ref()
-import {multiply,multiplyAuto,divideAuto} from '@/utils/decimal'
const gridOptions = reactive({
border: "full",//琛ㄦ牸鍔犺竟妗�
keepSource: true,//淇濇寔婧愭暟鎹�
@@ -41,7 +40,7 @@
// {field: 'buildingNumber',width:120, title: '妤煎彿',editRender: { name: 'input'},filters:[{ data: '' }],slots: { filter: 'num1_filter'}, sortable: true,filterMethod:filterChanged},
{field: 'alias', title:t('components.otherProcessing'),minWith:'130'},
{field: 'price', title:t('order.price'),editRender: { name: 'input'}},
- {field: 'quantity', title:t('order.quantity'),editRender: { name: 'input'}},
+ {field: 'quantity', title:t('order.quantity')},
{field: 'money', slots:{default:'default'}, title:t('delivery.money')}
],
//琛ㄥ崟楠岃瘉
@@ -59,9 +58,9 @@
quantity: [
{
validator ({ cellValue }) {
- const regex = /^(0|[1-9]\d*)$/
+ 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(t('basicData.msg.greater0') )
+ return new Error(t('basicData.msg.range99999Dec2') )
}
}
}
@@ -160,7 +159,7 @@
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)) || 0
+ return parseFloat((row.price * row.quantity).toFixed(2))
}
--
Gitblit v1.8.0