|
@@ -361,31 +361,30 @@
|
|
var arr=[]
|
|
var arr=[]
|
|
if(res1.data.data.warehousingOrderList){
|
|
if(res1.data.data.warehousingOrderList){
|
|
var datalist=JSON.parse(JSON.stringify(res1.data.data.warehousingOrderList))
|
|
var datalist=JSON.parse(JSON.stringify(res1.data.data.warehousingOrderList))
|
|
- }
|
|
|
|
- var arr=[]
|
|
|
|
- for (var i = 0; i < datalist.length; i++) {
|
|
|
|
- if(arr.length==0){
|
|
|
|
- arr.push(datalist[i])
|
|
|
|
- }else{
|
|
|
|
- var arr1=arr.filter((item)=>{return item.goodsName==datalist[i].goodsName})
|
|
|
|
- if(arr1.length>0){
|
|
|
|
- for (var q = 0; q < arr.length; q++) {
|
|
|
|
-
|
|
|
|
- if(arr[q].goodsName==datalist[i].goodsName){console.log(22222)
|
|
|
|
- console.log(arr[q].inWarehouseWeight,datalist[i].inWarehouseWeight)
|
|
|
|
- arr[q].inWarehouseWeight+=datalist[i].inWarehouseWeight
|
|
|
|
- arr[q].requestFunds+=datalist[i].requestFunds
|
|
|
|
|
|
+ for (var i = 0; i < datalist.length; i++) {
|
|
|
|
+ if(arr.length==0){
|
|
|
|
+ arr.push(datalist[i])
|
|
|
|
+ }else{
|
|
|
|
+ var arr1=arr.filter((item)=>{return item.goodsName==datalist[i].goodsName})
|
|
|
|
+ if(arr1.length>0){
|
|
|
|
+ for (var q = 0; q < arr.length; q++) {
|
|
|
|
+
|
|
|
|
+ if(arr[q].goodsName==datalist[i].goodsName){console.log(22222)
|
|
|
|
+ console.log(arr[q].inWarehouseWeight,datalist[i].inWarehouseWeight)
|
|
|
|
+ arr[q].inWarehouseWeight+=datalist[i].inWarehouseWeight
|
|
|
|
+ arr[q].requestFunds+=datalist[i].requestFunds
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
+ }else{
|
|
|
|
+ arr.push(datalist[i])
|
|
}
|
|
}
|
|
- }else{
|
|
|
|
- arr.push(datalist[i])
|
|
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ for (var q = 0; q < arr.length; q++) {
|
|
|
|
+ arr[q].inWarehouseWeight=arr[q].inWarehouseWeight.toFixed(2)
|
|
|
|
+ arr[q].requestFunds=arr[q].requestFunds.toFixed(2)
|
|
}
|
|
}
|
|
-
|
|
|
|
- }
|
|
|
|
- for (var q = 0; q < arr.length; q++) {
|
|
|
|
- arr[q].inWarehouseWeight=arr[q].inWarehouseWeight.toFixed(2)
|
|
|
|
- arr[q].requestFunds=arr[q].requestFunds.toFixed(2)
|
|
|
|
}
|
|
}
|
|
console.log(arr,1111111)
|
|
console.log(arr,1111111)
|
|
this.auditInfo.goodNameList=arr
|
|
this.auditInfo.goodNameList=arr
|