Compare commits

..

No commits in common. "845cf8cc7732e39251309477a16f26c1a062e2fe" and "7c96dde5614c15d3d48cdcc5a00dd1e3ca5f24fd" have entirely different histories.

1 changed files with 8 additions and 9 deletions

View File

@ -862,7 +862,7 @@ export default {
}
if(row.totalQualifiedNum&&row.totalQualifiedNum>0){
setTimeout(()=>{
if(Number(row.deliveryNum)>=(Number(row.orderNum)-Number(row.totalQualifiedNum))){
if(Number(row.deliveryNum)>(Number(row.orderNum)-Number(row.totalQualifiedNum))){
// row.deliveryNum = Number(row.orderNum)-Number(row.totalQualifiedNum)
row.deliveryNum = Number(row.deliveryNum)
row.qualifiedNum = Number(row.orderNum)-Number(row.totalQualifiedNum)
@ -870,13 +870,10 @@ export default {
},200)
}else{
setTimeout(()=>{
if(Number(row.deliveryNum)>=Number(row.orderNum)){
if(Number(row.deliveryNum)>Number(row.orderNum)){
// row.deliveryNum = Number(row.orderNum)
row.deliveryNum = Number(row.deliveryNum)
row.qualifiedNum = Number(row.orderNum)
}else{
row.deliveryNum = Number(row.deliveryNum)
row.qualifiedNum = Number(row.deliveryNum)
}
},200)
}
@ -887,12 +884,14 @@ export default {
}else{
row.qualifiedNum = row.qualifiedNum.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1')
}
if(Number(row.deliveryNum)>=(Number(row.orderNum)-Number(row.totalQualifiedNum))){
setTimeout(()=>{
row.qualifiedNum = Number(row.orderNum)-Number(row.totalQualifiedNum)
if(Number(row.deliveryNum)>=Number(row.orderNum)){
setTimeout(()=>{
if(Number(row.qualifiedNum)>=Number(row.orderNum)){
row.qualifiedNum = Number(row.orderNum)
}
},200)
}
if(Number(row.deliveryNum)<(Number(row.orderNum)-Number(row.totalQualifiedNum))){
if(Number(row.deliveryNum)<Number(row.orderNum)){
setTimeout(()=>{
if(Number(row.qualifiedNum)>=Number(row.deliveryNum)){
row.qualifiedNum = Number(row.deliveryNum)