From 4c042a90276f51b2f01a405d723756eee92a9795 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 20 二月 2025 14:13:10 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 2a25300..7ff78dd 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
@@ -630,7 +630,7 @@
const val = getNestedProperty(dataList[result.start],result.cell)+""
if(!/\d$/.test(val)){
const matches = val.match(/\D/g);
- const a= val.lastIndexOf(matches[matches.length - 1])
+ const b= val.lastIndexOf(matches[matches.length-1])
const numbersArr = []
const regex = /\d+/g
@@ -640,8 +640,10 @@
}
let numbers=numbersArr[numbersArr.length-1]
var subStr1 = val.substring(numbers.index);
+ const matche = subStr1.match(/(\d+)([^0-9]|$)/);
+ const a= val.lastIndexOf(matche[2])
var subStr2 = val.substring(0, numbers.index);
- var subStr3 = val.substring(a);
+ var subStr3 = val.substring(a,b+1);
let number = parseInt(subStr1)
var reg =new RegExp(number,"g")
dataList.forEach((item,index) =>{
@@ -649,8 +651,11 @@
let newStr = subStr1.replace(reg, number);
if(parseInt(newStr)>9){
newStr=parseInt(newStr)
+ if(!/\d$/.test(val)){
+ newStr=newStr+subStr3
+ }
}
- setNestedValue(item,result.cell,subStr2+newStr+subStr3)
+ setNestedValue(item,result.cell,subStr2+newStr)
number=number+1
}
@@ -692,7 +697,7 @@
const val = getNestedProperty(dataList[result.start], result.cell)+""
if(!/\d$/.test(val)){
const matches = val.match(/\D/g);
- const a= val.lastIndexOf(matches[matches.length - 1])
+ const b= val.lastIndexOf(matches[matches.length-1])
const numbersArr = []
const regex = /\d+/g
@@ -702,8 +707,10 @@
}
let numbers=numbersArr[numbersArr.length-1]
var subStr1 = val.substring(numbers.index);
+ const matche = subStr1.match(/(\d+)([^0-9]|$)/);
+ const a= val.lastIndexOf(matche[2])
var subStr2 = val.substring(0, numbers.index);
- var subStr3 = val.substring(a);
+ var subStr3 = val.substring(a,b+1);
let number = parseInt(subStr1)
var reg =new RegExp(number,"g")
dataList.forEach((item,index) =>{
@@ -711,8 +718,9 @@
let newStr = subStr1.replace(reg, number);
if(parseInt(newStr)>9){
newStr=parseInt(newStr)
+ newStr=newStr+subStr3
}
- setNestedValue(item,result.cell,subStr2+newStr+subStr3)
+ setNestedValue(item,result.cell,subStr2+newStr)
number=number+1
}
--
Gitblit v1.8.0