车队长

pages/mine/fleet/addBinding.vue

@@ -59,12 +59,11 @@
 				this.fleet.driverName = this.firstAuthentication.driverName
 				this.fleet.accountNumber = this.userInfo.phone
 				this.$request.baseRequest('post', '/hyBindCarCaptainInfo/api/binding;', this.fleet).then(res => {
-						debugger
 						if (res.code == 200) {
 							uni.hideLoading()
 							this.$refs.uToast.show({
 								type: 'success',
-								message: "绑定成功！",
+								message: "绑定成功,等待队长接受！",
 								complete() {
 									uni.navigateBack({
 										delta: 1

pages/mine/fleet/bindingCarCaptain.vue

@@ -2,12 +2,12 @@
 <template>
 	<view class="center">
 		<view class="fleetInfo">
-			<view class="fleetInfo_name" v-if="fleetInfo.name">{{fleetInfo.name}}({{fleetInfo.phone}})</view>
+			<view class="fleetInfo_name" v-if="fleetInfo.carCaptainName">{{fleetInfo.carCaptainName}}({{fleetInfo.carCaptainAccountNumber}})</view>
 			<view class="fleetInfo_name" v-else>队长名称</view>
 			<view class="fleetInfo_phone">{{fleetInfo.status?fleetInfo.status:"未绑定"}}</view>
 		</view>
-		<view class="btn_css">
-			<view class="btn_item" v-if="!fleetInfo.name">
+		<view class="btn_css" v-if="fleetInfo.status != '待确认'">
+			<view class="btn_item" v-if="!fleetInfo||fleetInfo.status=='已拒绝'">
 				<u-button type="primary" text="去绑定" @click="operation"></u-button>
 			</view>
 			<view class="btn_item" v-else>
@@ -15,6 +15,9 @@
 			</view>
 			
 		</view>
+		<view class="red_char">
+			注：绑定车队长后，运费将自动结算到车队长账户，不再对司机结算，如需对司机本人结算请先解绑车队长。
+		</view>
 		<u-toast ref="uToast"></u-toast>
 		<u-modal :show="tipsShow" :title="alertTitle" :closeOnClickOverlay='true' :showCancelButton='true'
 			confirmColor='#2772FB' @confirm="$u.throttle(confirmClick, 5000)" @close="cancelClick" @cancel="cancelClick"></u-modal>
@@ -56,23 +59,20 @@
 				this.tipsShow = false
 			},
 			confirmClick(){
+				let that = this
 				uni.showLoading({
 					mask: true,
 					title: '加载中'
 				})
 				this.tipsShow = false
-				this.$request.baseRequest('post', '', this.dataDetails).then(res => {
+				this.$request.baseRequest('post', '/hyBindCarCaptainInfo/api/unbinding', {id:this.fleetInfo.id}).then(res => {
 						if (res.code == 200) {
 							uni.hideLoading()
+							that.getInfo()
 							this.$refs.uToast.show({
 								type: 'success',
 								message: "解绑成功！",
-								complete() {
-									// uni.navigateBack({
-									// 	delta: 1
-									// });
-									this.getInfo()
-								}
+								complete() {}
 							})
 						} else {
 							uni.hideLoading()
@@ -88,7 +88,6 @@
 				this.$request.baseRequest('get', '/hyBindCarCaptainInfo/getBindCarCaptain', {
 					commonId:this.userInfo.id
 				}).then(res => {
-					debugger
 						if (res.code == 200) {
 							if(res.data){
 								this.fleetInfo = res.data
@@ -131,4 +130,9 @@
 			margin-right: 20rpx;
 		}
 	}
+	.red_char{
+		color: #f05458;
+		font-size: 28rpx;
+		margin-top: 30rpx;
+	}
 </style>

pages/mine/fleet/fleetBill.vue

@@ -1,9 +1,90 @@
 //车队账单
 <template>
+	<view class="center">
+		<view class="list_css" v-for="(item,index) in dataList">
+			<view class="list_css_item_top">
+				<view class="list_css_left">{{item.orderNo}}</view>
+				<view class="list_css_right">{{item.payeeName}} 承运</view>
+			</view>
+			<view class="list_css_item_middle">
+				<view class="list_css_left">{{item.paymentType}} {{item.amountMoney}}</view>
+				<view class="list_css_right">账号尾号 {{item.bankNo}}</view>
+			</view>
+			<view class="list_css_item_lower">
+				<view class="list_css_left">{{item.paymentDate}}</view>
+			</view>
+			<u-divider t></u-divider>
+		</view>
+	</view>
 </template>
 
 <script>
+	import {
+		mapState
+	} from 'vuex';
+	export default{
+		data(){
+			return{
+				dataList:[]
+				
+			}
+		},
+		onLoad() {
+			this.getList()
+		},
+		onShow() {
+			
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+		},
+		methods:{
+			getList(){
+				this.$request.baseRequest('get', '/hyFreightSettlementInfo/selectFleetCaptainBill', {
+					carCaptainCommonId:this.userInfo.id,
+					pageSize: 10,
+					currentPage: 1
+				}).then(res => {
+						if (res.code == 200) {
+							if(res.data){
+								this.dataList = res.data.records
+								for(let i = 0;i<this.dataList.length;i++){
+									if(this.dataList[i].bankCard){
+										this.dataList[i].bankNo = this.dataList[i].bankCard.substr(this.dataList[i].bankCard.length - 4)
+									}
+								}
+							}
+						} else {
+							uni.$u.toast(res.message);
+						}
+					})
+					.catch(res => {
+						uni.hideLoading()
+						uni.$u.toast(res.message);
+					});
+			},
+			
+			
+		}
+	}
 </script>
 
-<style>
+<style lang="scss" scoped>
+	.center{
+		padding: 20rpx 30rpx;
+		
+	}
+	.list_css{
+		margin-top: 20rpx;
+		.list_css_item_middle,.list_css_item_top,.list_css_item_lower{
+			display: flex;
+			margin-bottom: 20rpx;
+		}
+		.list_css_right,.list_css_left{
+			width: 50%;
+		}
+		.list_css_right{
+			text-align: right;
+		}
+	}
 </style>

pages/mine/fleet/fleetManage.vue

@@ -20,7 +20,7 @@
 			<view class="list_right">
 				<view class="list_text" v-if="item.status == '待确认'" @click="audit(item,1)">拒绝</view>
 				<view class="list_text" v-if="item.status == '待确认'" @click="audit(item,2)">接受</view>
-				<view class="list_text" v-if="item.status == '已绑定'">{{item.status}}</view>
+				<view class="list_text" v-if="item.status == '已绑定'||item.status == '已解绑'||item.status == '已接受'||item.status == '已拒绝'">{{item.status}}</view>
 				<view class="list_text"
 					v-if="item.status == '已绑定'||item.status == '已解绑'||item.status == '已接受'||item.status == '已拒绝'"
 					@click="next(item)">删除</view>

pages/order/signContract.vue

@@ -366,7 +366,9 @@
 				}
 			},
 			collection() {
-				uni.$u.route('/pages/order/bankCard');
+				if(!this.dataDetails.carCaptainCommonId){  //carCaptainCommonId没有值  证明他没有车队  可以选择收款账户
+					uni.$u.route('/pages/order/bankCard');
+				}
 			},
 			confirmBtn(e) {
 				this.dataDetails.carrierInfo.carNo = e.value[0]
@@ -520,8 +522,6 @@
 						})
 						return
 					}
-					
-					
 				}
 				_obj.trailerNumber = that.dataDetails.trailerNumber
 				_obj.tranStartDate = that.dataDetails.tranStartDate
@@ -540,6 +540,8 @@
 				_obj.payeeName = that.dataDetails.payeeName
 				_obj.id = that.dataDetails.id
 				_obj.typeFlag = 2
+				_obj.carCaptainAccountNumber = that.dataDetails.carCaptainAccountNumber
+				_obj.payeeIdCard = that.dataDetails.payeeIdCard
 				uni.canvasToTempFilePath({
 					canvasId: 'handWriting',
 					fileType: 'png',