入库单货名统计显示

pages/task/audit/warehouse_warrant.vue

@@ -359,21 +359,34 @@
 					if (res1.data.code == 200) {
 						this.auditInfo = res1.data.data
 						var arr=[]
-						for (var i = 0; i < this.auditInfo.warehousingOrderList.length; i++) {
+						if(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(this.auditInfo.warehousingOrderList[i])
+								arr.push(datalist[i])
 							}else{
-								for (var q = 0; q < arr.length; q++) {
-									if(arr[q].goodsName==this.auditInfo.warehousingOrderList[i].goodName){
-										arr[q].inWarehouseWeight+=this.auditInfo.warehousingOrderList[i].inWarehouseWeight
-										arr[q].requestFunds+=this.auditInfo.warehousingOrderList[i].requestFunds
-									}else{
-										arr.push(this.auditInfo.warehousingOrderList[i])
+								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])
 								}
 							}
 							
 						}
+						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)
 						this.auditInfo.goodNameList=arr
 						if(this.auditInfo.inWarehouseWeightTotal){

pages/task/audit/warehouse_warrant_detail.vue

@@ -356,22 +356,34 @@
 				}).then(res1 => {
 					if (res1.data.code == 200) {
 						this.auditInfo = res1.data.data
+						if(res1.data.data.warehousingOrderList){
+							var datalist=JSON.parse(JSON.stringify(res1.data.data.warehousingOrderList))
+						}
 						var arr=[]
-						for (var i = 0; i < this.auditInfo.warehousingOrderList.length; i++) {
+						for (var i = 0; i < datalist.length; i++) {
 							if(arr.length==0){
-								arr.push(this.auditInfo.warehousingOrderList[i])
+								arr.push(datalist[i])
 							}else{
-								for (var q = 0; q < arr.length; q++) {
-									if(arr[q].goodsName==this.auditInfo.warehousingOrderList[i].goodName){
-										arr[q].inWarehouseWeight+=this.auditInfo.warehousingOrderList[i].inWarehouseWeight
-										arr[q].requestFunds+=this.auditInfo.warehousingOrderList[i].requestFunds
-									}else{
-										arr.push(this.auditInfo.warehousingOrderList[i])
+								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])
 								}
 							}
 							
 						}
+						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)
 						this.auditInfo.goodNameList=arr
 						if(this.auditInfo.inWarehouseWeightTotal){