审核

pages/task/audit/freight_settlement_approval.vue

@@ -4,71 +4,76 @@
 			<view class="topInfo-item">
 				<view class="flex info">
 					<view class="logo">
-						<image src="../../../static/img/reject.png" mode="" v-if="list.approveStatus == '已驳回'"
+						<image src="../../../static/img/reject.png" mode="" v-if="list[0].approveStatus == '已驳回'"
 							style="height: 40rpx;"></image><!-- 驳回 -->
-						<image src="../../../static/img/tongguo.png" mode="" v-if="list.approveStatus == '已通过'"
+						<image src="../../../static/img/tongguo.png" mode="" v-if="list[0].approveStatus == '已通过'"
 							style="height: 40rpx;"></image><!-- 通过 -->
 						<image src="../../../static/img/daishenhe.png" mode=""
-							v-if="list.approveStatus == '待决策人审核'|| list.approveStatus == '待财务审核'"
+							v-if="list[0].approveStatus == '待决策人审核'|| list[0].approveStatus == '待财务审核'"
 							style="height: 40rpx;"></image><!-- 待审核 -->
 					</view>
-					<view class="infoText">{{list.approveStatus}}</view>
+					<view class="infoText">{{list[0].approveStatus}}</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 class="top1" style="display: flex;">
+					<view>客户</view>
+					<view>{{list[0].customer}}</view>
 				</view>
-				<view class="car-type-item">
-					<view class="center">卸</view>
-					<view class="textInfo">{{list.unloadingWeight}}吨</view>
-				</view>
-				<view class="car-type-item">
-					<view class="right">结</view>
-					<view class="textInfo">{{list.settlementWeight}}吨</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].send ? list[0].send : "暂无发货地址"}}</view>
 				</view>
-				<view class="car-type-item">
-					<view class="center">扣</view>
-					<view class="textInfo">{{list.deductionAmount}}元</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="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>
 		<view v-if='show' class="shade">
@@ -112,21 +117,21 @@
 				title: '',
 				show: false,
 				height: 200,
-				auditMind:'',
+				auditMind: '',
 				autoHeight: true,
 				border: false,
 				everyCheck: '',
-				customerName:"",//客户
-				shippingAddress:"",//发货地址
-				receivingAddress:"",//收货地址
+				customerName: "", //客户
+				shippingAddress: "", //发货地址
+				receivingAddress: "", //收货地址
 			}
 		},
 		onBackPress(e) {
-			if(this.everyCheck){
-			uni.navigateTo({
-				url: "/pages/task/my_task"
-			})
-			return true;
+			if (this.everyCheck) {
+				uni.navigateTo({
+					url: "/pages/task/my_task"
+				})
+				return true;
 			}
 		},
 		onLoad(options) {
@@ -137,29 +142,38 @@
 		},
 		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]
-								console.log(this.list, 124)
-							}
-						})
+						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/getTranSettlementReport', {
+				// 			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]
+				// 				console.log(this.list, 124)
+				// 			}
+				// 		})
+				// 	}
+				// })
 			},
 			close() {
 				this.show = false
@@ -185,7 +199,7 @@
 						confirmText: '确定',
 						success: function(res) {
 							if (res.confirm) {
-								that.audit(that.list, 0, false, true, that.rejectInfo)
+								that.audit(that.list[0], 0, false, true, that.rejectInfo)
 							}
 						}
 					})
@@ -205,7 +219,7 @@
 						confirmText: '确定',
 						success: function(res) {
 							if (res.confirm) {
-								that.audit(that.list, 0, true, 2, that.rejectInfo1)
+								that.audit(that.list[0], 0, true, 2, that.rejectInfo1)
 							}
 						}
 					})
@@ -231,7 +245,7 @@
 						}
 						setTimeout(function() {
 							if (that.everyCheck) {
-								helper.setAudit(that.list)
+								helper.setAudit(that.list[0])
 							} else {
 								uni.navigateBack()
 							}
@@ -259,7 +273,8 @@
 			font-size: 36rpx;
 			margin-top: 20rpx;
 		}
-		.top1{
+
+		.top1 {
 			// display: flex;
 			justify-content: space-between;
 			border-radius: 20rpx;
@@ -268,8 +283,9 @@
 			font-size: 30rpx;
 			margin-top: 20rpx;
 		}
-		.top_info{
-		margin: 10rpx 0;
+
+		.top_info {
+			margin: 10rpx 0;
 		}
 
 		.title {
@@ -281,11 +297,15 @@
 		}
 
 		.car-container {
+
+			// border-bottom: 2rpx solid #EEEEEE;
+		}
+
+		.car-container-item {
+			background: white;
 			padding: 10rpx 20rpx;
 			border-radius: 20rpx;
-			background: white;
-			margin: 30rpx 0;
-			// border-bottom: 2rpx solid #EEEEEE;
+			margin: 20rpx 0;
 		}
 
 		.car-type-item {
@@ -453,6 +473,7 @@
 		right: 0;
 		color: #22C572;
 	}
+
 	.u-textarea-style {
 		margin: 20rpx;
 		background: #F9F9FA;
@@ -460,7 +481,7 @@
 		border: 1px solid #EEEEEE;
 		padding: 10rpx 20rpx;
 		position: relative;
-	
+
 		.right-bottom {
 			position: absolute;
 			right: 20rpx;
@@ -472,16 +493,19 @@
 	/deep/.u-input__textarea {
 		height: 300rpx !important;
 	}
-	.person-info{
+
+	.person-info {
 		background: white;
 		padding: 20rpx 0;
 		border-radius: 20rpx;
 		// margin-bottom: 50rpx;
 		margin: 20rpx 0;
-		.tit{
+
+		.tit {
 			font-size: 36rpx;
 		}
 	}
+
 	.c-row {
 		display: -webkit-box;
 		display: -webkit-flex;
@@ -492,6 +516,7 @@
 		padding: 20rpx 30rpx;
 		position: relative;
 	}
+
 	.c-row1 {
 		// display: -webkit-box;
 		// display: -webkit-flex;

pages/task/my_task.vue

@@ -479,6 +479,7 @@
 				this.getIndexBuyData(statusFlag)
 			},
 			navToDetailPage(item) {
+				debugger
 				if (item.businessCode == 'PROCUREMENT-ORDER-APPROVE') {
 					uni.navigateTo({
 						url: '/pages/task/procurement_details?id=' + item.businessId + "&isShowbtn=true"