1

pages/task/audit/warehouse_warrant.vue

@@ -41,7 +41,7 @@
 					{{item.goodsName}}
 				</view>
 				<view class="right" style='width:33.3333%;text-align:center;border-right:1px solid #ccc;'>
-					{{item.inWarehouseWeight}}
+					{{item.requestWeight}}
 				</view>
 				<view class="right" style='width:33.3333%;text-align:center;'>{{item.requestFunds}}</view>
 			</view>
@@ -105,7 +105,7 @@
 					</view>
 					<view class="mx-row2">
 						<view class="mx-item">
-							{{item.inWarehouseWeight}}吨
+							{{item.requestWeight}}吨
 
 						</view>
 						<view class="mx-item">
@@ -335,9 +335,9 @@
 										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
+												console.log(arr[q].requestWeight, datalist[i]
+													.requestWeight)
+												arr[q].requestWeight += datalist[i].requestWeight
 												arr[q].requestFunds += datalist[i].requestFunds
 											}
 										}
@@ -347,8 +347,9 @@
 								}
 
 							}
+							console.log(arr, 123)
 							for (var q = 0; q < arr.length; q++) {
-								arr[q].inWarehouseWeight = arr[q].inWarehouseWeight.toFixed(2)
+								arr[q].requestWeight = arr[q].requestWeight.toFixed(2)
 								arr[q].requestFunds = arr[q].requestFunds.toFixed(2)
 							}
 						}

pages/task/audit/warehouse_warrant_detail.vue

@@ -111,7 +111,7 @@
 					</view>
 					<view class="mx-row2">
 						<view class="mx-item">
-							{{item.inWarehouseWeight}}吨
+							{{item.requestWeight}}吨
 
 						</view>
 						<view class="mx-item">
@@ -344,8 +344,9 @@
 							var datalist = JSON.parse(JSON.stringify(res1.data.data.warehousingOrderList))
 						}
 						var arr = []
+					
 						for (var i = 0; i < datalist.length; i++) {
-							datalist[i].cost = datalist[i].requestFunds / datalist[i].inWarehouseWeight
+							datalist[i].cost = datalist[i].requestFunds / datalist[i].requestWeight
 							if (arr.length == 0) {
 								arr.push(datalist[i])
 							} else {
@@ -358,7 +359,7 @@
 										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].requestWeight += datalist[i].requestWeight
 											arr[q].cost += datalist[i].cost
 											arr[q].requestFunds += datalist[i].requestFunds
 										}
@@ -370,7 +371,7 @@
 
 						}
 						for (var q = 0; q < arr.length; q++) {
-							arr[q].inWarehouseWeight = arr[q].inWarehouseWeight.toFixed(2)
+							arr[q].inWarehouseWeight = arr[q].requestWeight.toFixed(2)
 							arr[q].cost = arr[q].cost.toFixed(2)
 							arr[q].requestFunds = arr[q].requestFunds.toFixed(2)
 						}