Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun-app

pages/mine/driverCertificationNext.vue

@@ -311,6 +311,8 @@
 														if(res.data.allowCar == 'A2' || res.data.allowCar == 'B2'){
 															_this.dataDetails.quasiDrivingVehicle = res.data.allowCar
 														}
+														let sdate = res.data.driverStartDate.substr(0,4)+"-"+res.data.driverStartDate.substr(4,2)+"-"+res.data.driverStartDate.substr(6,2)
+														_this.dataDetails.driverLicenseValidityStartDate = sdate
 														_this.dataDetails.lssuingAuthority = res.data.issuingAuthority
 														_this.$forceUpdate()
 													}

pages/mine/fleet/carCaptainAuthentication.vue

@@ -66,12 +66,12 @@
 					</image>
 				</view> -->
 				<view class="title">上传银行卡卡号页</view>
-				<view @click="uploadImg(3)" class="picture picture3" v-if="!dataDetails.payeeAddressUrl">
+				<view @click="uploadImg(3,0)" class="picture picture3" v-if="!dataDetails.payeeAddressUrl">
 					<image class="xj-image" src="@/static/images/mine/ic_shanchuan@2x.png"></image>
 					<view class="text">上传银行卡卡号页</view>
 				</view>
 
-				<view v-if="dataDetails.payeeAddressUrl" @click.stop="uploadImg(3)" class="preview-card-img picture">
+				<view v-if="dataDetails.payeeAddressUrl" @click.stop="uploadImg(3,0)" 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">

pages/mine/manageVehicles/addVehicle.vue

@@ -101,6 +101,12 @@
 					v-model="dataDetails.vehicleType">
 				</u--input>
 			</view>
+			<view class="flex row flex-space-between">
+				<view class="left-text">行驶证车辆识别代号</view>
+				<u--input maxlength='25' placeholder="输入行驶证车辆识别代号" inputAlign='right' border="none"
+					v-model="dataDetails.carCode">
+				</u--input>
+			</view>
 			<view class="flex row flex-space-between">
 				<view class="left-text">行驶证档案编号</view>
 				<u--input maxlength='12' placeholder="输入行驶证档案编号" inputAlign='right' border="none"
@@ -189,6 +195,19 @@
 					<image class="" :src="dataDetails.trailerLicenseBackPage" mode="aspectFit"></image>
 				</view>
 			</view>
+			
+			<view class="flex row flex-space-between" v-if="sign == '挂车'">
+				<view class="left-text">挂车行驶证车辆类型</view>
+				<u--input maxlength='12' placeholder="输入挂车行驶证车辆类型" inputAlign='right' border="none"
+					v-model="dataDetails.trailerVehicleType">
+				</u--input>
+			</view>
+			<view class="flex row flex-space-between" v-if="sign == '挂车'">
+				<view class="left-text">挂车行驶证车辆识别代号</view>
+				<u--input maxlength='25' placeholder="输入挂车车辆识别代码" inputAlign='right' border="none"
+					v-model="dataDetails.trailerCarCode">
+				</u--input>
+			</view>
 			<view class="flex row flex-space-between" v-if="sign == '挂车'">
 				<view class="left-text">挂车行驶证档案编号</view>
 				<u--input maxlength='12' placeholder="输入挂车行驶证档案编号" inputAlign='right' border="none"
@@ -648,6 +667,19 @@
 														_this.dataDetails.carCode =res.data.carCode
 														_this.dataDetails.owner = res.data
 															.owner //车辆所有人
+															if (res.data.lssuingAuthority) { //行驶证发证机关
+																_this.dataDetails.lssuingAuthority = res
+																	.data.lssuingAuthority
+															}
+															if (res.data.licenseRegistrationDate) { //行驶证注册日期
+																_this.dataDetails
+																	.drivingLicenseRegistrationDate = res
+																	.data.licenseRegistrationDate
+															}
+															if (res.data.licenseIssueDate) { //行驶证发证日期
+																_this.dataDetails.drivingLicenseIssueDate =
+																	res.data.licenseIssueDate
+															}
 														_this.$forceUpdate()
 													}
 												})
@@ -695,8 +727,10 @@
 														if(res.data.approvedLoadMass.indexOf("kg") != -1){
 															res.data.approvedLoadMass = res.data.approvedLoadMass.slice(0, res.data.approvedLoadMass.length - 2)
 														}
-														_this.dataDetails.carApprovedWeight = res.data
-															.approvedLoadMass //核定载质量
+														if(res.data.approvedLoadMass && !isNaN(res.data.approvedLoadMass)){
+															_this.dataDetails.carApprovedWeight = res.data.approvedLoadMass //核定载质量
+														}
+														
 														if (res.data.size && res.data.size.indexOf(
 																"mm") != -1) {
 															res.data.size = res.data.size.slice(0, res
@@ -724,9 +758,9 @@
 														flag: 1
 													}).then(res => {
 													if (res.data) {
-														if (res.data.issuingAuthority) { //行驶证发证机关
+														if (res.data.lssuingAuthority) { //行驶证发证机关
 															_this.dataDetails.guaLssuingAuthority = res
-																.data.issuingAuthority
+																.data.lssuingAuthority
 														}
 														if (res.data.licenseRegistrationDate) { //行驶证注册日期
 															_this.dataDetails
@@ -743,8 +777,9 @@
 															.carNum.substring(0,6)
 															}
 														 //车牌号
-														_this.dataDetails.guaOwner = res.data
-															.owner //车辆所有人
+														_this.dataDetails.guaOwner = res.data.owner //车辆所有人
+														_this.dataDetails.trailerVehicleType = res.data.vehicleType
+														_this.dataDetails.trailerCarCode =res.data.carCode
 														_this.$forceUpdate()
 													}
 												})
@@ -1121,6 +1156,13 @@
 					})
 					return true
 				}
+				if(!this.dataDetails.carCode){
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "行驶证车辆识别代号不能为空！",
+					})
+					return true
+				}
 				if (this.dataDetails.vehicleType.length<2||this.dataDetails.vehicleType.length>10) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -1218,6 +1260,20 @@
 						})
 						return true
 					}
+					if (uni.$u.test.isEmpty(this.dataDetails.trailerVehicleType)) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "挂车行驶证车辆类型不能为空！",
+						})
+						return true
+					}
+					if (uni.$u.test.isEmpty(this.dataDetails.trailerCarCode)) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "挂车行驶证识别代号不能为空！",
+						})
+						return true
+					}
 					if (uni.$u.test.isEmpty(this.dataDetails.trailerLicenseNumber)) {
 						this.$refs.uToast.show({
 							type: 'error',

pages/mine/manageVehicles/editVehicle.vue

@@ -89,6 +89,18 @@
 				</view>
 				<image class="" :src="dataDetails.drivingLicenseBackPage" mode="aspectFit"></image>
 			</view>
+			<view class="flex row flex-space-between">
+				<view class="left-text">行驶证车辆类型</view>
+				<u--input maxlength='10' placeholder="输入行驶证上的车辆类型" inputAlign='right' border="none"
+					v-model="dataDetails.vehicleType">
+				</u--input>
+			</view>
+			<view class="flex row flex-space-between">
+				<view class="left-text">行驶证车辆识别代号</view>
+				<u--input maxlength='25' placeholder="输入行驶证车辆识别代号" inputAlign='right' border="none"
+					v-model="dataDetails.carCode">
+				</u--input>
+			</view>
 			<view class="flex row flex-space-between">
 				<view class="left-text">行驶证档案编号</view>
 				<u--input maxlength='12' placeholder="输入行驶证档案编号" inputAlign='right' border="none"
@@ -163,6 +175,18 @@
 					<image class="" :src="dataDetails.trailerLicenseBackPage" mode="aspectFit"></image>
 				</view>
 			</view>
+			<view class="flex row flex-space-between" v-if="sign == '挂车'">
+				<view class="left-text">挂车行驶证车辆类型</view>
+				<u--input maxlength='15' placeholder="输入挂车行驶证车辆类型" inputAlign='right' border="none"
+					v-model="dataDetails.trailerVehicleType">
+				</u--input>
+			</view>
+			<view class="flex row flex-space-between" v-if="sign == '挂车'">
+				<view class="left-text">挂车行驶证车辆识别代号</view>
+				<u--input maxlength='25' placeholder="输入挂车车辆识别代码" inputAlign='right' border="none"
+					v-model="dataDetails.trailerCarCode">
+				</u--input>
+			</view>
 			<view class="flex row" v-if="sign == '挂车'">
 				<view  class="left-text">挂车行驶证档案编号</view>
 				<u--input maxlength='12' placeholder="输入挂车行驶证档案编号" inputAlign='right' border="none"
@@ -678,6 +702,8 @@
 															.carNum //车牌号
 														_this.dataDetails.owner = res.data
 															.owner //车辆所有人
+															_this.dataDetails.vehicleType = res.data.vehicleType//行驶证车辆类型
+															_this.dataDetails.carCode =res.data.carCode  //行驶证车辆识别代号
 														_this.$forceUpdate()
 													}
 												})
@@ -774,6 +800,8 @@
 															.carNum //车牌号
 														_this.dataDetails.guaOwner = res.data
 															.owner //车辆所有人
+															_this.dataDetails.trailerVehicleType = res.data.vehicleType//挂车行驶证车辆类型
+															_this.dataDetails.trailerCarCode =res.data.carCode  //挂车行驶证车辆识别代号
 														_this.$forceUpdate()
 													}
 												})
@@ -1194,6 +1222,14 @@
 					})
 					return true
 				}
+				
+				if(!this.dataDetails.carCode){
+					this.$refs.uToast.show({
+						type: 'error',
+						message: "行驶证车辆识别代号不能为空！",
+					})
+					return true
+				}
 				if (uni.$u.test.isEmpty(this.dataDetails.drivingLicenseNumber)) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -1276,6 +1312,20 @@
 						})
 						return true
 					}
+					if (uni.$u.test.isEmpty(this.dataDetails.trailerVehicleType)) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "挂车行驶证车辆类型不能为空！",
+						})
+						return true
+					}
+					if (uni.$u.test.isEmpty(this.dataDetails.trailerCarCode)) {
+						this.$refs.uToast.show({
+							type: 'error',
+							message: "挂车行驶证识别代号不能为空！",
+						})
+						return true
+					}
 					if (uni.$u.test.isEmpty(this.dataDetails.trailerLicenseNumber)) {
 						this.$refs.uToast.show({
 							type: 'error',