zhongtianhaoyuan 2 سال پیش
والد
کامیت
62657e226c

+ 15 - 12
pages.json

@@ -426,37 +426,40 @@
 		},{
 			"path": "pages/mine/fleet/bindingCarCaptain",
 			"style": {
-				"navigationStyle": "custom",
 				"navigationBarTitleText": "绑定车队长",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "white"
+				"enablePullDownRefresh": false
 				
 			}
 		},{
 			"path": "pages/mine/fleet/addBinding",
 			"style": {
-				"navigationStyle": "custom",
 				"navigationBarTitleText": "绑定",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "white"
+				"enablePullDownRefresh": false
 				
 			}
 		},{
 			"path": "pages/mine/fleet/fleetManage",
 			"style": {
-				"navigationStyle": "custom",
 				"navigationBarTitleText": "管理车队",
 				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "white"
-				
+				"navigationBarBackgroundColor": "white",
+				"app-plus": {
+					"titleNView": {
+						"buttons": [{
+							"text": "账单",
+							"fontSrc": "/static/addfleet/iconfont.ttf",
+							"fontSize": "18"
+							 // "redDot": "true"
+						}]
+					}
+				}
 			}
+			
 		},{
 			"path": "pages/mine/fleet/carCaptainAuthentication",
 			"style": {
-				"navigationStyle": "custom",
 				"navigationBarTitleText": "车队长认证",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "white"
+				"enablePullDownRefresh": false
 				
 			}
 		},{

+ 3 - 4
pages/mine/driverCertification.vue

@@ -634,9 +634,7 @@
 				this.isShowBank = false
 			},
 			manualInput(val) {
-				console.log(1111111111111)
 				this.index = val
-
 				if (this.isShowManualInput) {
 					if (!this.dataDetails.hyDriverPayeeInfoList[this.index].payeeAddressUrl) {
 						this.$refs.uToast.show({
@@ -747,7 +745,8 @@
 												if (res.data) {
 													_this.dataDetails.cardAddress = res.data
 														.recPersonAddr
-													_this.dataDetails.numberCard = res.data.recPersonNo
+													_this.dataDetails.numberCard = res.data.recPersonNo.replace(/\s*/g,"")
+													
 													if(res.data.recPersonNo && res.data.recPersonNo.length == 18){  //自动获取性别
 														let sex = res.data.recPersonNo.substr(-2,1)
 														if(sex % 2 == 0){
@@ -809,7 +808,7 @@
 												if (res.data) {
 													if (res.data.bankNo) {
 														_this.dataDetails.hyDriverPayeeInfoList[_this
-															.index].bankCard = res.data.bankNo
+															.index].bankCard = res.data.bankNo.replace(/\s*/g,"")
 													}
 													if (res.data.bankName) {
 														_this.dataDetails.hyDriverPayeeInfoList[_this

+ 1 - 1
pages/mine/driverCertificationNext.vue

@@ -346,7 +346,7 @@
 														// 	res.data.driverEndDate
 													}
 													if(res.data&&res.data.qualificationCertificateNum){
-														_this.dataDetails.qualificationCertificateNumber = res.data.qualificationCertificateNum
+														_this.dataDetails.qualificationCertificateNumber = res.data.qualificationCertificateNum.replace(/\s*/g,"")
 													}
 													_this.$forceUpdate()
 												})

+ 1 - 1
pages/mine/editDriverCertificationNext.vue

@@ -368,7 +368,7 @@
 														_this.dataDetails.qualificationCertificateValidityDate = res.data.qualificationCertificate
 													}
 													if(res.data&&res.data.qualificationCertificateNum){
-														_this.dataDetails.qualificationCertificateNumber = res.data.qualificationCertificateNum
+														_this.dataDetails.qualificationCertificateNumber = res.data.qualificationCertificateNum.replace(/\s*/g,"")
 													}
 													_this.$forceUpdate()
 												})

+ 181 - 5
pages/mine/fleet/carCaptainAuthentication.vue

@@ -42,12 +42,103 @@
 				</view>
 
 				<view class="flex row flex-space-between">
-					<view class="left-text">身份证截止日期</view>
+					<view class="left-text">身份证有效期</view>
 					<view class="" @click="selectValidityPeriod">
 						{{dataDetails.cardValidityDate?dataDetails.cardValidityDate:'选择身份证截止日期>'}}
 					</view>
 				</view>
+			</view>
+			<view class="content3 flex s-row" v-for="(item,index) in dataDetails.hyDriverPayeeInfoList" :key='index'>
+				<view class="flex">
+					银行卡-{{index+1}}
+				</view>
+				<view @click="delBankNumber(dataDetails.hyDriverPayeeInfoList,index)" class="" v-if="index!=0">
+					<image class='del-bank' src="@/static/images/common/quxiao@2x.png">
+					</image>
+				</view>
+				<view class="title">上传银行卡卡号页</view>
+				<view @click="uploadImg(3,index)" class="picture picture3" v-if="!item.payeeAddressUrl">
+					<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
+					<view class="text">上传银行卡卡号页</view>
+				</view>
+			
+				<view v-if="item.payeeAddressUrl" @click.stop="uploadImg(3,index)" class="preview-card-img picture">
+					<!-- <image class="card-img" :src="dataDetails.cardAddressUrl"></image> -->
+					<view @click.stop="delCard(3)">
+						<image class='del-card' src="@/static/images/common/quxiao@2x.png">
+						</image>
+					</view>
+					<image class="" :src="item.payeeAddressUrl" mode="aspectFit"></image>
+				</view>
+				<view class="flex row flex-space-between">
+					<view class="left-text">银行卡卡号</view>
+					<view class="flex">
+						<u--input placeholder="输入银行卡号码" inputAlign='right' border="none" v-model="item.bankCard" maxlength="19">
+						</u--input>
+					</view>
+				</view>
+				<view class="flex row">
+					<view class="left-text">开户行</view>
+					<u--input placeholder="输入开户行" inputAlign='right' border="none" v-model="item.bankDeposit">
+					</u--input>
+				</view>
+				<view class="flex row">
+					<view class="left-text khzh-styel">开户支行</view>
+					<view class="flex" v-if="isShowManualInput">
+						<u--input class="select-bankzh" placeholder="输入开户支行" inputAlign='right' border="none"
+							v-model="item.bankDepositBranch">
+						</u--input>
+						<view @click="manualInput(index)" class="type">选择支行</view>
+					</view>
+					<view class="flex align-center" v-if="!isShowManualInput">
+						<view 
+						 :style="{'color':item.bankDepositBranch?'#000':'#C6CBD5'}" style='font-size:15px;text-align:right;' class="select-bankzh point" @click="selectZhbank">
+							{{item.bankDepositBranch?item.bankDepositBranch:'选择开户支行'}}
+						</view>
+						<view @click="manualInput" class="type">手动输入</view>
+					</view>
+				</view>
+				<view class="flex row flex-space-between">
+					<view class="left-text">收款人</view>
+					<view class="flex">
+						<u--input placeholder="自动获取,不可编辑" inputAlign='right' border="none" v-model="item.payeeName" readonly>
+						</u--input>
+					</view>
+				</view>
+				<u-picker :show="isShowBank" :columns="bankType[index]" :closeOnClickOverlay='true' @close='zhBankClose'
+					@cancel='zhBankClose' @confirm='confirmBank'></u-picker>
+				</u-picker>
 				
+				
+			</view>
+			<view class="content3 flex s-row">
+				<view class="title">道路运输证</view>
+				<view @click="uploadImg(4)" class="picture picture8" v-if="!dataDetails.operationCertificate">
+					<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
+					<view class="text">上传道路运输证</view>
+				</view>
+				<view v-if="dataDetails.operationCertificate" @click.stop="uploadImg(8)" class="preview-card-img picture">
+					<view @click.stop="delCard(4)">
+						<image class='del-card' src="@/static/images/common/quxiao@2x.png">
+						</image>
+					</view>
+					<image class="" :src="dataDetails.operationCertificate" mode="aspectFit"></image>
+				</view>
+				<view class="flex row">
+					<view class="left-text">道路运输证号</view>
+					<u--input maxlength='12' placeholder="输入道路运输证号" inputAlign='right' border="none"
+						v-model="dataDetails.operationCertificateNumber">
+					</u--input>
+				</view>
+				<view class="flex row flex-space-between">
+					<view class="left-text">道路运输证有效期</view>
+					<view class="" @click="selectValidityPeriod(4)">
+						<view :style="{'color':dataDetails.operationCertificateValidityDate?'#000':'rgb(192, 196, 204)'}">
+							{{dataDetails.operationCertificateValidityDate?dataDetails.operationCertificateValidityDate:'选择有效期'}}
+							<image v-if='!dataDetails.operationCertificateValidityDate' style='width:12px;height:12px;' src="../../../static/right.png" mode=""></image>
+						</view>
+					</view>
+				</view>
 			</view>
 			<u-picker :show="isShowcardValidity" ref="uPicker" :columns="validityPeriod"
 				@confirm="confirmValidityPeriod" @change="changeHandler" @cancel='isShowcardValidity= false'>
@@ -63,9 +154,7 @@
 			<u-toast ref="uToast"></u-toast>
 		</view>
 		<view class="content4">
-			<view class="next-btn" @click="next()">
-				下一步
-			</view>
+			<view class="next-btn" @click="next()">提交</view>
 		</view>
 	</view>
 </template>
@@ -135,12 +224,22 @@
 					operationCertificateValidityDate: '',
 					trailerOperationCertificate: '',
 					trailerOperationCertificateValidityDate: '',
+					hyDriverPayeeInfoList: [{
+						payeeAddressUrl: '',
+						bankCard: '',
+						bankDeposit: '',
+						bankDepositBranch: '',
+						payeeName: '',
+					}],
 
 				},
 				action: this.$helper.ossUploadUrl,
 				// maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				// isAdd: true,
-				imagesrc: null
+				imagesrc: null,
+				isShowBank:false,
+				isShowManualInput: false,
+				bankType: [],
 			};
 		},
 		onLoad() {
@@ -156,6 +255,49 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
+			confirmBank(e) {
+				console.log(e)
+				this.dataDetails.hyDriverPayeeInfoList[this.index].bankDepositBranch = e.value[0]
+				this.isShowBank = false
+			},
+			zhBankClose() {
+				this.isShowBank = false
+			},
+			// 选择支行
+			selectZhbank() {
+				if (uni.$u.test.isEmpty(this.bankType[this.index])) {
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "请选择手动输入!",
+					})
+					return true
+				}
+			
+				this.isShowBank = true
+			},
+			manualInput(val) {
+				this.index = val
+				if (this.isShowManualInput) {
+					if (!this.dataDetails.hyDriverPayeeInfoList[this.index].payeeAddressUrl) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "请先上传银行卡!",
+						})
+						return true
+					} else if (this.dataDetails.hyDriverPayeeInfoList[this.index].payeeAddressUrl && uni.$u.test.isEmpty(
+							this.bankType[this.index])) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "请选择手动输入开户支行!",
+						})
+						return true
+					}
+					this.isShowBank = true
+				} else {
+					this.isShowBank = false
+				}
+				this.isShowManualInput = !this.isShowManualInput
+			},
 			async get_camera_permission() {
 				var photol=await permision.requestAndroidPermission("android.permission.CAMERA")
 				if(photol == false){
@@ -247,6 +389,13 @@
 					}).then(res => {
 						if (res.code == 200) {
 							this.dataDetails = res.data
+							this.dataDetails.hyDriverPayeeInfoList = [{
+								payeeAddressUrl: '',
+								bankCard: '',
+								bankDeposit: '',
+								bankDepositBranch: '',
+								payeeName: '',
+							}]
 							// this.dataDetails.driverName = res.data.driverName
 							// this.dataDetails.driverSex = res.data.driverSex
 							// this.dataDetails.driverCall = res.data.driverCall
@@ -379,6 +528,33 @@
 												});
 											break
 										case 3:
+										_this.bankType[_this.index] = []
+										_this.$request.baseRequest('get',
+												'/driverInfo/bankShibie', {
+													bankImg: result,
+												}).then(res => {
+												_this.dataDetails.hyDriverPayeeInfoList[_this.index]
+													.payeeAddressUrl = result
+												if (res.data) {
+													if (res.data.bankNo) {
+														_this.dataDetails.hyDriverPayeeInfoList[_this
+															.index].bankCard = res.data.bankNo.replace(/\s*/g,"")
+													}
+													if (res.data.bankName) {
+														_this.dataDetails.hyDriverPayeeInfoList[_this
+															.index].bankDeposit = res.data.bankName
+													}
+													// 开户支行LIst
+													if (res.data.bankNameZhihang) {
+														_this.bankType[_this.index].push(res.data
+															.bankNameZhihang)
+													}
+												}
+												_this.$forceUpdate()
+											})
+											.catch(res => {
+												uni.$u.toast(res.message);
+											});
 											break;
 									}
 								}

+ 9 - 0
pages/mine/fleet/fleetBill.vue

@@ -0,0 +1,9 @@
+//车队账单
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

+ 3 - 0
pages/mine/fleet/fleetManage.vue

@@ -37,6 +37,9 @@
 		},
 		onShow() {
 
+		},
+		onNavigationBarButtonTap(e) {
+			this.$u.route("")
 		},
 		methods: {
 			operation(){

+ 4 - 4
pages/mine/manageVehicles/addVehicle.vue

@@ -675,7 +675,7 @@
 														_this.dataDetails.drivingLicenseValidityDate =
 															res.data.driveringEndDate //行驶证有效期
 														_this.dataDetails.drivingLicenseNumber = res
-															.data.driveringNum //行驶证档案编号
+															.data.driveringNum.replace(/\s*/g,"") //行驶证档案编号
 														if (_this.sign == "非挂车") {
 															if (res.data.servicingMass && res.data
 																.servicingMass.indexOf("kg") != -1) {
@@ -757,7 +757,7 @@
 														_this.dataDetails.trailerLicenseValidityDate =
 															res.data.driveringEndDate //挂车行驶证有效期
 														_this.dataDetails.trailerLicenseNumber = res
-															.data.driveringNum //挂车行驶证档案编号
+															.data.driveringNum.replace(/\s*/g,"")//挂车行驶证档案编号
 														if (res.data.servicingMass && res.data
 															.servicingMass.indexOf("kg") != -1) {
 															res.data.servicingMass = res.data
@@ -798,7 +798,7 @@
 													}).then(res => {
 													if (res.data) {
 														_this.dataDetails.operationCertificateNumber =
-															res.data.tranNumber
+															res.data.tranNumber.replace(/\s*/g,"")
 														_this.dataDetails
 															.operationCertificateValidityDate = res
 															.data.tranEndDate
@@ -819,7 +819,7 @@
 													if (res.data) {
 														_this.dataDetails
 															.trailerOperationCertificateNumber = res
-															.data.tranNumber
+															.data.tranNumber.replace(/\s*/g,"")
 														_this.dataDetails
 															.trailerOperationCertificateValidityDate =
 															res.data.tranEndDate

+ 4 - 4
pages/mine/manageVehicles/editVehicle.vue

@@ -705,7 +705,7 @@
 														_this.dataDetails.drivingLicenseValidityDate =
 															res.data.driveringEndDate //行驶证有效期
 														_this.dataDetails.drivingLicenseNumber = res
-															.data.driveringNum //行驶证档案编号
+															.data.driveringNum.replace(/\s*/g,"") //行驶证档案编号
 														if (_this.sign == "非挂车") {
 															if (res.data.servicingMass && res.data
 																.servicingMass.indexOf("kg") != -1) {
@@ -786,7 +786,7 @@
 														_this.dataDetails.trailerLicenseValidityDate =
 															res.data.driveringEndDate //挂车行驶证有效期
 														_this.dataDetails.trailerLicenseNumber = res
-															.data.driveringNum //挂车行驶证档案编号
+															.data.driveringNum.replace(/\s*/g,"") //挂车行驶证档案编号
 														if (res.data.servicingMass && res.data
 															.servicingMass.indexOf("kg") != -1) {
 															res.data.servicingMass = res.data
@@ -832,7 +832,7 @@
 													}).then(res => {
 													if (res.data) {
 														_this.dataDetails.operationCertificateNumber =
-															res.data.tranNumber
+															res.data.tranNumber.replace(/\s*/g,"")
 														_this.dataDetails
 															.operationCertificateValidityDate = res
 															.data.tranEndDate
@@ -853,7 +853,7 @@
 													if (res.data) {
 														_this.dataDetails
 															.trailerOperationCertificateNumber = res
-															.data.tranNumber
+															.data.tranNumber.replace(/\s*/g,"")
 														_this.dataDetails
 															.trailerOperationCertificateValidityDate =
 															res.data.tranEndDate