From de18cca83738bdf6b279046e34b910ccd5b73a84 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 07 三月 2024 08:17:50 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
index e0335aa..cdbf84d 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -141,7 +141,7 @@
price: [
{
validator ({ cellValue }) {
- const regex = /^(0|[1-9][0-9]{0,4}([.][0-9]{1,2})?)$/
+ const regex = /^(0(\.\d{1,2})?|([1-9]\d{0,4})(\.\d{1,2})?|99999(\.9{1,2})?)$/
if ( !regex.test(cellValue) ) {
return new Error('杈撳叆0.00~99999.99鐨勬暟瀛�')
}
@@ -151,7 +151,7 @@
computeArea: [
{
validator ({ cellValue }) {
- const regex = /^(0|[1-9][0-9]{0,4}([.][0-9]{1,2})?)$/
+ const regex = /^(0(\.\d{1,2})?|([1-9]\d{0,4})(\.\d{1,2})?|99999(\.9{1,2})?)$/
if (!regex.test(cellValue)) {
return new Error('杈撳叆0.00~99999.99鐨勬暟瀛�')
}
@@ -171,7 +171,7 @@
width:[
{
validator ({ cellValue }) {
- const regex = /^(0|[1-9][0-9]{0,4}([.][0-9]{1,2})?)$/
+ const regex = /^(0(\.\d{1,2})?|([1-9]\d{0,4})(\.\d{1,2})?|99999(\.9{1,2})?)$/
if (!regex.test(cellValue)) {
return new Error('杈撳叆0.00~99999.99鐨勬暟瀛�')
}
@@ -391,6 +391,11 @@
}
//鑾峰彇瀛愰〉闈骇鍝佹柟娉�
const getProductRow = (row) => {
+ if(row.state!=1){
+ ElMessage.warning('璇ヤ骇鍝佽繕鏈鏍�')
+ return
+ }
+
rowIndex.productName = row.productName
rowIndex.productId = row.id
productVisible.value = false
--
Gitblit v1.8.0