Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

pages/task/audit/freight_settlement_details.vue

@@ -4,63 +4,67 @@
 			<view class="topInfo-item">
 				<view class="flex info">
 					<view class="logo">
-						<image src="../../../static/img/reject.png" mode="" v-if="list.status == '已驳回'"
+						<image src="../../../static/img/reject.png" mode="" v-if="list[0].status == '已驳回'"
 							style="height: 40rpx;"></image><!-- 驳回 -->
-						<image src="../../../static/img/tongguo.png" mode="" v-if="list.status == '已通过'"
+						<image src="../../../static/img/tongguo.png" mode="" v-if="list[0].status == '已通过'"
 							style="height: 40rpx;"></image><!-- 通过 -->
 					</view>
-					<view class="infoText">{{list.status}}</view>
+					<view class="infoText">{{list[0].status}}</view>
 				</view>
-				<view class="infoData">{{list.updateDate}}</view>
+				<view class="infoData">{{list[0].updateDate}}</view>
 			</view>
 		</view>
 		<view class="content">
 			<view class="top">
 				<view>合同编号</view>
-				<view>{{list.contractNo}}</view>
+				<view>{{list[0].contractNo}}</view>
 			</view>
 			<view class="person-info">
-					<view class="top1" style="display: flex;">
-						<view>客户</view>
-						<view>{{customerName}}</view>
-					</view>
-					<view class="top1">
-						<view>发货地址</view>
-						<view class="top_info">{{shippingAddress ? shippingAddress : "暂无发货地址"}}</view>
-					</view>
-					<view class="top1">
-						<view>收货地址</view>
-						<view class="top_info">{{receivingAddress ? receivingAddress : "暂无收货地址"}}</view>
-					</view>
-			</view>
-			<view class="car-container">
-				<view class="car-num title" v-if="list.tranTypeKey== '1'">{{list.carNo}} ({{list.tranCarNo}})</view>
-				<view class="car-num title" v-if="list.tranTypeKey== '2'">车厢号{{list.boxNo}}</view>
-				<view class="car-num title" v-if="list.tranTypeKey== '3'&&list.shipType== '散船'">仓位号{{list.boxNo}}</view>
-				<view class="car-num title" v-if="list.tranTypeKey== '3'&&list.shipType== '集装箱'">箱号{{list.boxNo}}</view>
-				<view class="car-type-item">
-					<view class="left">装</view>
-					<view class="textInfo">{{list.loadingWeight}}吨</view>
-				</view>
-				<view class="car-type-item">
-					<view class="center">卸</view>
-					<view class="textInfo">{{list.unloadingWeight}}吨</view>
+				<view class="top1" style="display: flex;">
+					<view>客户</view>
+					<view>{{list[0].customer}}</view>
 				</view>
-				<view class="car-type-item">
-					<view class="right">结</view>
-					<view class="textInfo">{{list.settlementWeight}}吨</view>
+				<view class="top1">
+					<view>发货地址</view>
+					<view class="top_info">{{list[0].send ? list[0].send : "暂无发货地址"}}</view>
 				</view>
-				<view class="car-type-item">
-					<view class="left">运</view>
-					<view class="textInfo">{{list.transportPrice}}元/吨</view>
+				<view class="top1">
+					<view>收货地址</view>
+					<view class="top_info">{{list[0].receive ? list[0].receive : "暂无收货地址"}}</view>
 				</view>
-				<view class="car-type-item">
-					<view class="center">扣</view>
-					<view class="textInfo">{{list.deductionAmount}}元</view>
-				</view>
-				<view class="car-type-item">
-					<view class="right">付</view>
-					<view class="textInfo">{{list.amountIngPayable}}元</view>
+			</view>
+			<view class="car-container">
+				<view v-for="item in list" class="car-container-item">
+					<view class="car-num title" v-if="item.tranTypeKey== '1'">{{item.carNo}} ({{item.tranCarNo}})</view>
+					<view class="car-num title" v-if="item.tranTypeKey== '2'">车厢号{{item.boxNo}}</view>
+					<view class="car-num title" v-if="item.tranTypeKey== '3'&&item.shipType== '散船'">仓位号{{item.boxNo}}
+					</view>
+					<view class="car-num title" v-if="item.tranTypeKey== '3'&&item.shipType== '集装箱'">箱号{{item.boxNo}}
+					</view>
+					<view class="car-type-item">
+						<view class="left">装</view>
+						<view class="textInfo">{{item.loadingWeight}}吨</view>
+					</view>
+					<view class="car-type-item">
+						<view class="center">卸</view>
+						<view class="textInfo">{{item.unloadingWeight}}吨</view>
+					</view>
+					<view class="car-type-item">
+						<view class="right">结</view>
+						<view class="textInfo">{{item.settlementWeight}}吨</view>
+					</view>
+					<view class="car-type-item">
+						<view class="left">运</view>
+						<view class="textInfo">{{item.transportPrice}}元/吨</view>
+					</view>
+					<view class="car-type-item">
+						<view class="center">扣</view>
+						<view class="textInfo">{{item.deductionAmount}}元</view>
+					</view>
+					<view class="car-type-item">
+						<view class="right">付</view>
+						<view class="textInfo">{{item.amountIngPayable}}元</view>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -80,9 +84,9 @@
 				list: {
 					approveStatus: "",
 				},
-				customerName:"",//客户
-				shippingAddress:"",//发货地址
-				receivingAddress:"",//收货地址
+				customerName: "", //客户
+				shippingAddress: "", //发货地址
+				receivingAddress: "", //收货地址
 			}
 		},
 		onLoad(options) {
@@ -91,28 +95,37 @@
 		},
 		methods: {
 			getList() {
-				this.$api.doRequest('get', '/tranSettlementReport/getInfo', {
-					id: this.id
+				this.$api.doRequest('get', '/tranSettlementReport/getTranSettlementReport', {
+					batchId: this.id
 				}).then(res => {
-					this.contractNo = res.data.data.contractNo
-					this.carId = res.data.data.carId
-					this.customerName =  res.data.data.customer
-					this.shippingAddress = res.data.data.send
-					this.receivingAddress = res.data.data.receive
 					if (res.data.code == 200) {
-						this.$api.doRequest('get', '/tranSettlementReport/selectTranSettlementReport', {
-							compId: "2710b21efc1e4393930c5dc800010dc4",
-							currentPage: this.currentPage,
-							pageSize: this.pageSize,
-							contractNo: this.contractNo,
-							carId: this.carId,
-						}).then(res => {
-							if (res.data.code == 200) {
-								this.list = res.data.data.records[0]
-							}
-						})
+						debugger
+						this.list = res.data.data
+						// console.log(this.list, 124)
 					}
 				})
+				// this.$api.doRequest('get', '/tranSettlementReport/getInfo', {
+				// 	id: this.id
+				// }).then(res => {
+				// 	this.contractNo = res.data.data.contractNo
+				// 	this.carId = res.data.data.carId
+				// 	this.customerName =  res.data.data.customer
+				// 	this.shippingAddress = res.data.data.send
+				// 	this.receivingAddress = res.data.data.receive
+				// 	if (res.data.code == 200) {
+				// 		this.$api.doRequest('get', '/tranSettlementReport/selectTranSettlementReport', {
+				// 			compId: "2710b21efc1e4393930c5dc800010dc4",
+				// 			currentPage: this.currentPage,
+				// 			pageSize: this.pageSize,
+				// 			contractNo: this.contractNo,
+				// 			carId: this.carId,
+				// 		}).then(res => {
+				// 			if (res.data.code == 200) {
+				// 				this.list = res.data.data.records[0]
+				// 			}
+				// 		})
+				// 	}
+				// })
 			},
 			fanHui() {
 				uni.navigateBack()
@@ -137,7 +150,8 @@
 			font-size: 36rpx;
 			margin-top: 30rpx;
 		}
-		.top1{
+
+		.top1 {
 			// display: flex;
 			justify-content: space-between;
 			border-radius: 20rpx;
@@ -174,16 +188,19 @@
 			font-size: 36rpx;
 		}
 	}
-	.person-info{
+
+	.person-info {
 		background: white;
 		padding: 20rpx 0;
 		border-radius: 20rpx;
 		// margin-bottom: 50rpx;
 		margin: 20rpx 0;
-		.tit{
+
+		.tit {
 			font-size: 36rpx;
 		}
 	}
+
 	.bottom-btn {
 		width: 100%;
 		position: fixed;