From ed3ce5c8f6e1f7ac1aad3218ab5e518fc95cdb0f Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 10 九月 2024 10:26:54 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 fcfaf67..09bd8df 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
@@ -364,7 +364,7 @@
item=>item.grossArea === 0
)
const errorAreaList = $grid.getTableData().fullData.filter(
- item=>item.width*item.height/1000000 < errorArea.value*1
+ item=>(item.width*item.height/1000000 < errorArea.value*1)
)
if(grossAreaList.length>0){
alert(t('order.msg.grossAreaIsNot0'))
@@ -638,6 +638,9 @@
dataList.forEach((item,index) =>{
if(index>=result.start ){
let newStr = subStr1.replace(reg, number);
+ if(parseInt(newStr)>9){
+ newStr=parseInt(newStr)
+ }
setNestedValue(item,result.cell,subStr2+newStr)
number=number+1
}
@@ -668,6 +671,9 @@
dataList.forEach((item,index) =>{
if(index >= result.start && index <= result.end){
let newStr = subStr1.replace(reg, number);
+ if(parseInt(newStr)>9){
+ newStr=parseInt(newStr)
+ }
setNestedValue(item,result.cell,subStr2+newStr)
number=number+1
}
--
Gitblit v1.8.0