Merge branch 'master' of http://47.100.3.209:3000/gongdecai/wangluohuoyun-app

pages/goodSource/index.vue

@@ -307,7 +307,8 @@
 					freightPrice: item.freightPrice,
 					driverName: this.firstAuthentication.driverName,
 					driverPhone: this.firstAuthentication.driverPhone,
-					cargoOwnerPhone: item.cargoOwnerPhone
+					cargoOwnerPhone: item.cargoOwnerPhone,
+					id:item.id
 				}
 
 				this.$request.baseRequest('post', '/publishTaskInfo/api/addOrder', _obj).then(res => {

pages/mine/editDriverCertification.vue

@@ -323,7 +323,7 @@
 						sourceType: this.$helper.chooseImage.sourceType,
 						success: function(res) {
 							console.log(JSON.stringify(res.tempFilePaths));
-							uploadImage(res.tempFilePaths[0], 'appData/',
+							uploadImage('image',res.tempFilePaths[0], 'appData/',
 								result => {
 									// 上传成功回调函数
 									console.log('图片地址', result)

pages/order/confirmLoading.vue

@@ -5,7 +5,7 @@
 			<view class="level2-title">承运合同</view>
 			<view class='row-between'>
 				<view class="">合同编号</view>
-				<view class="">{{detailData.contractNo?detailData.contractNo:'未签订'}}</view>
+				<view class="" @click="toSignContract">{{detailData.contractNo?detailData.contractNo:'去签订合同'}}</view>
 			</view>
 		</div>
 		<view class="content2">
@@ -48,8 +48,9 @@
 			<view class="level2-title">装车信息</view>
 			<view class='row-between'>
 				<view class="">车牌号</view>
-				<input class="car-uumber input" v-model='detailData.carrierInfo.carNo' @click.stop="handleShowKeyboard"
-					:disabled="true" placeholder="输入车牌号" name="input"></input>
+				{{detailData.carrierInfo.carNo}}
+				<!-- <input class="car-uumber input" v-model='detailData.carrierInfo.carNo'
+					:disabled="true" placeholder="输入车牌号" name="input" disabled="true"></input> -->
 			</view>
 			<view class='row-between' @click="selectDate">
 				<view class="">装车日期</view>
@@ -59,9 +60,9 @@
 			</view>
 			<view class='row-between'>
 				<view class="">运费总额（元）</view>
-				<!-- {{detailData.carrierInfo.estimatedFreight}} -->
-				<view class=""><input class="input" type="text" value="" v-model="detailData.carrierInfo.freight"
-						placeholder="请输入运费"></view>
+				{{detailData.freightInfo.freight}}
+			<!-- 	<view class=""><input class="input" type="text" value="" v-model="detailData.carrierInfo.freight"
+						placeholder="请输入运费"></view> -->
 			</view>
 			<view class='row-between'>
 				<view class="">定位</view>
@@ -93,7 +94,7 @@
 		<master-keyboard ref="keyboard" keyboardtype="car" :show="keyShow" :randomNumber="true" :newCar="false"
 			:defaultValue="carNumber" @keyboardClick="handleClick"></master-keyboard>
 		<u-toast ref="uToast"></u-toast>
-		<u-calendar :show="showDate" :mode="mode" @confirm="confirmDate"></u-calendar>
+		<u-calendar :show="showDate" :mode="mode" @confirm="confirmDate" @close="showDate= false"></u-calendar>
 	</view>
 </template>
 
@@ -124,14 +125,14 @@
 				gjList: []
 			}
 		},
-		onLoad(options) {
+		onLoad(options) {debugger
 			that = this
 			// debugger
 			// #ifdef APP-PLUS
 			this.getLngLat();
 			// #endif
 			console.log(options)
-			this.id = options.id
+			this.id = JSON.parse(decodeURIComponent(options.obj)).id
 			this.getInfo()
 			// this.detailData = options;
 			// CYHT20220317000001
@@ -139,6 +140,12 @@
 
 		},
 		methods: {
+			toSignContract(){
+				debugger
+				uni.$u.route('/pages/order/signContract', {
+					obj: JSON.stringify(this.detailData),
+				});
+			},
 			selectDate() {
 				this.showDate = true
 			},
@@ -153,15 +160,15 @@
 				}).then(res => {
 					if (res.code == 200) {
 						this.detailData = res.data
-						this.detailData.contractNo = 'CYHT20220317000001'
-						this.detailData.id = this.detailData.carrierId
-						this.detailData.carrierInfo.loadingDate = ''
-						this.detailData.carrierInfo.carNo = ''
-						this.detailData.carrierInfo.loadingAreaLongitude = ''
-						this.detailData.carrierInfo.loadingAreaLatitude = ''
-						this.detailData.carrierInfo.sendCity = '营口'
-						this.detailData.carrierInfo.sendArea = '鲅鱼圈'
-						this.detailData.carrierInfo.loadingImg = ''
+						// this.detailData.contractNo = ''
+						// this.detailData.id = this.detailData.carrierId
+						// this.detailData.carrierInfo.loadingDate = ''
+						// this.detailData.carrierInfo.carNo = ''
+						// this.detailData.carrierInfo.loadingAreaLongitude = ''
+						// this.detailData.carrierInfo.loadingAreaLatitude = ''
+						// this.detailData.carrierInfo.sendCity = '营口'
+						// this.detailData.carrierInfo.sendArea = '鲅鱼圈'
+						// this.detailData.carrierInfo.loadingImg = ''
 						// this.carrierInfo = res.data.carrierInfo
 						// this.freightInfo = res.data.freightInfo
 						// this.zcPhoneList = this.carrierInfo.loadingImg.split(',')
@@ -375,27 +382,27 @@
 					})
 					return true
 				}
-				if (uni.$u.test.isEmpty(this.detailData.carrierInfo.freight)) {
+				if (uni.$u.test.isEmpty(this.detailData.freightInfo.freight)) {
 					this.$refs.uToast.show({
 						type: 'error',
 						message: "运费总额不能为空！",
 					})
 					return true
 				}
-				if (uni.$u.test.isEmpty(this.detailData.carrierInfo.sendCity)) {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: "定位不能为空！",
-					})
-					return true
-				}
-				if (uni.$u.test.isEmpty(this.detailData.carrierInfo.sendArea)) {
-					this.$refs.uToast.show({
-						type: 'error',
-						message: "定位不能为空！",
-					})
-					return true
-				}
+				// if (uni.$u.test.isEmpty(this.detailData.carrierInfo.sendCity)) {
+				// 	this.$refs.uToast.show({
+				// 		type: 'error',
+				// 		message: "定位不能为空！",
+				// 	})
+				// 	return true
+				// }
+				// if (uni.$u.test.isEmpty(this.detailData.carrierInfo.sendArea)) {
+				// 	this.$refs.uToast.show({
+				// 		type: 'error',
+				// 		message: "定位不能为空！",
+				// 	})
+				// 	return true
+				// }
 				if (uni.$u.test.isEmpty(this.detailData.carrierInfo.loadingImg)) {
 					this.$refs.uToast.show({
 						type: 'error',
@@ -405,9 +412,10 @@
 				}
 			},
 			confirmClick() {
-				this.validate()
-				debugger
+				
 				this.isShowAlert = false
+				 if(this.validate()) return 
+				debugger
 				//1暂存
 				if (this.detailData.statusFlag == 1) {
 					delete this.detailData.carrierInfo.loadingAreaLongitude;

pages/order/orderDetails.vue

@@ -16,13 +16,12 @@
 			</view>
 			<!-- flex flex-space-between -->
 			<view class="item2">
-				<u-button class="btn" text="查看合同" @click="lookContract"></u-button>
-				<u-button class="btn" text="签订合同" @click="signContract" ></u-button>
-			     <u-button class="btn" text="签订合同" @click="signContract" v-if="dataObj.cargoOwnerStatus=='未装车'&&dataObj.driverContract!='1'"></u-button>
+				<u-button class="btn" text="查看合同" @click="lookContract" v-if="dataObj.driverContract=='1'"></u-button>
+			     <!-- <u-button class="btn" text="签订合同" @click="signContract" v-if="dataObj.cargoOwnerStatus=='未装车'&&dataObj.driverContract!='1'"></u-button> -->
 				<u-button class="btn" text="终止" @click="stop"  v-if="dataObj.orderStatus=='待货主确认'||dataObj.orderStatus=='未装车'"></u-button>
-				<!-- <u-button class="btn" text="联系客服"  @click="$helper.contactCustomerService"></u-button> -->
-				<!-- <u-button class="btn" text="确认装车" @click="confirmLoading" v-if="dataObj.orderStatus=='未装车'&&dataObj.driverContract=='1'"></u-button> -->
-				<u-button class="btn" text="确认装车" @click="confirmLoading"></u-button>
+				<u-button class="btn" text="联系客服"  @click="$helper.contactCustomerService"></u-button>
+				<u-button class="btn" text="确认装车" @click="confirmLoading" v-if="dataObj.orderStatus=='未装车'"></u-button>
+				<!-- <u-button class="btn" text="确认装车" @click="confirmLoading"></u-button> -->
 				<u-button class="btn" text="修改装车信息"  @click="confirmLoading" v-if="dataObj.orderStatus=='货主驳回装车信息'||dataObj.orderStatus=='平台驳回装车信息'"></u-button>
 				<u-button class="btn" text="确认卸车" @click="confirmUnLoading" v-if="dataObj.orderStatus=='运输中'"></u-button>
 				<u-button class="btn" text="修改卸车信息" @click="confirmUnLoading" v-if="dataObj.orderStatus=='货主驳回卸车信息'||dataObj.orderStatus=='平台驳回卸车信息'"></u-button>
@@ -322,7 +321,10 @@
 					});
 			},
 			confirmLoading() {
-				uni.$u.route('/pages/order/confirmLoading', {id:this.id});
+				uni.$u.route('/pages/order/confirmLoading', {
+					obj: JSON.stringify({id:this.id}),
+				});
+				// uni.$u.route('/pages/order/confirmLoading', {id:this.id});
 			},
 			confirmUnLoading() {
 				let item = this.dataDetails
@@ -399,7 +401,10 @@
 							this.dataObj = res.data
 							this.carrierInfo = res.data.carrierInfo
 							this.freightInfo =  res.data.freightInfo
-							this.zcPhoneList = this.carrierInfo.loadingImg.split(',')
+							if(this.carrierInfo.loadingImg&&this.carrierInfo.loadingImg.length>0){
+								this.zcPhoneList = this.carrierInfo.loadingImg.split(',')
+							}
+							
 							// if(res.data.orderStatus!="待货主确认"&&res.data.orderStatus!="未装车"&&res.data.orderStatus!="已终止"){
 							// 	this.status1 = true
 							// }
@@ -410,9 +415,9 @@
 						
 					})
 			},
-			goConfirmLoading(id) {
+			goConfirmLoading(id) {debugger
 				uni.$u.route('/pages/order/confirmLoading', {
-					id: this.id,
+					obj: JSON.stringify({id:this.id}),
 				});
 			},
 		}

pages/order/signContract.vue

@@ -47,14 +47,26 @@
 				<!-- 				<view class="flex"><input type="text" placeholder="请输入运费" v-model="dataDetails.freight"
 						class="text-align-right yf-input">{{dataDetails.freight}}元/车</view> -->
 				<view class="flex">
-					<u--input placeholder="请输入运费" border="none" type="number" v-model="dataDetails.freightCars" inputAlign='right'
-						clearable></u--input>
+					<u--input placeholder="请输入运费" border="none" type="number" v-model="dataDetails.freight"
+						inputAlign='right' clearable></u--input>
 					<!-- <span>元/车</span> -->
 				</view>
 			</view>
+			<view class='row-between'>
+				<view class="gray">车牌号</view>
+				<view class="" style="color:#BBBBBB;" @click="carClick">
+					{{dataDetails.carrierInfo.carNo?dataDetails.carrierInfo.carNo:'请选择车牌号'}}
+				</view>
+
+				<!-- <view class="flex">
+					<input class="" v-model='dataDetails.carrierInfo.carNo' @click.stop="handleShowKeyboard"
+						:disabled="true" placeholder="输入车牌号" name="input" style="text-align: right;"></input>
+				</view> -->
+
+			</view>
 			<view class='row-between'>
 				<view class="gray">挂车号（选填）</view>
-				<view class="">
+				<view class="flex">
 					<u--input placeholder="请输入挂车号" border="none" v-model="dataDetails.trailerNumber" inputAlign='right'
 						clearable></u--input>
 				</view>
@@ -64,38 +76,40 @@
 				<view class="">
 					<view @click="dateShow">{{dataDetails.startDates?dataDetails.startDates:'请选择运输开始日期'}}
 					</view>
-					<u-datetime-picker :show="startShow" mode="date"
-						@cancel="removeStart" @confirm="startDate" @close="removeStart"></u-datetime-picker>
+					<u-datetime-picker :show="startShow" mode="date" @cancel="removeStart" @confirm="startDate"
+						@close="removeStart"></u-datetime-picker>
 				</view>
 			</view>
 			<view class='row-between'>
 				<view class="gray">运输截止日期</view>
 				<view class="">
-				<!-- 	<u--input placeholder="请输入内容" border="none" v-model="dataDetails.value" inputAlign='right'
+					<!-- 	<u--input placeholder="请输入内容" border="none" v-model="dataDetails.value" inputAlign='right'
 						clearable></u--input> -->
-						<view class="" @click="endShow = true">{{dataDetails.endDates?dataDetails.endDates:'请选择运输截止日期'}}</view>
-					<u-datetime-picker :show="endShow"  mode="date" @cancel="removeEnd" @confirm="endDate" @close="removeEnd"></u-datetime-picker>
+					<view class="" @click="endShow = true">{{dataDetails.endDates?dataDetails.endDates:'请选择运输截止日期'}}
+					</view>
+					<u-datetime-picker :show="endShow" mode="date" @cancel="removeEnd" @confirm="endDate"
+						@close="removeEnd"></u-datetime-picker>
 				</view>
 			</view>
 			<view class='row-between'>
 				<view class="gray">联络人姓名</view>
 				<view class="">
-					<u--input placeholder="请输入联络人姓名" border="none" v-model="dataDetails.contactPersonName" inputAlign='right'
-						clearable></u--input>
+					<u--input placeholder="请输入联络人姓名" border="none" v-model="dataDetails.contactPersonName"
+						inputAlign='right' clearable></u--input>
 				</view>
 			</view>
 			<view class='row-between'>
 				<view class="gray">联络人电话</view>
 				<view class="">
-					<u--input placeholder="请输入联络人电话" border="none" type="number" maxlength="11" v-model="dataDetails.contactPersonPhone" inputAlign='right'
-						clearable></u--input>
+					<u--input placeholder="请输入联络人电话" border="none" type="number" maxlength="11"
+						v-model="dataDetails.contactPersonPhone" inputAlign='right' clearable></u--input>
 				</view>
 			</view>
 			<view class='row-between'>
 				<view class="gray">装车后预付款</view>
 				<view class="">
-					<u--input placeholder="请输入装车后预付款" border="none" v-model="dataDetails.advanceCharge" inputAlign='right'
-						clearable></u--input>
+					<u--input placeholder="请输入装车后预付款" border="none" v-model="dataDetails.advanceCharge"
+						inputAlign='right' clearable></u--input>
 				</view>
 			</view>
 
@@ -128,16 +142,28 @@
 				<!-- <button @click="subCanvas" class="subBtn">完成</button> -->
 			</view>
 		</view>
+		<u-picker :show="showCarList" :columns="carList" :closeOnClickOverlay='true' @close='selectTypeClose'
+			@cancel='selectTypeClose' @confirm='confirmBtn'></u-picker>
+		<master-keyboard ref="keyboard" keyboardtype="car" :show="keyShow" :randomNumber="true" :newCar="false"
+			:defaultValue="carNumber" @keyboardClick="handleClick"></master-keyboard>
+		<u-toast ref="uToast"></u-toast>
 		<u-toast ref="uToast"></u-toast>
 	</view>
 </template>
 
 <script>
+	import {
+		mapState
+	} from 'vuex';
 	var that;
 	import uploadImage from '@/components/ossutil/uploadFile.js';
 	export default {
 		data() {
 			return {
+				showCarList: false,
+				carList: [],
+				keyShow: false,
+				carNumber: '',
 				isScaleStart: false,
 				radioCustomStyle: {
 					margin: '0 0 0 10rpx'
@@ -163,12 +189,16 @@
 					},
 				],
 				startShow: false,
-				endShow:false,
-				
-			
+				endShow: false,
+
+
 			};
 		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo', 'firstAuthentication']),
+		},
 		onLoad(options) {
+			this.carList = []
 			that = this
 			console.log(JSON.parse(options.obj))
 			// this.dataDetails = JSON.parse(options.obj)
@@ -184,25 +214,86 @@
 					})
 					.exec();
 			});
+			uni.showLoading({
+				title: '加载中'
+			})
+			this.$request.baseRequest('get', '/driverCarInfo/selectDriverCar', {
+					driverId: that.userInfo.driverId,
+					// driverId:this.firstAuthentication.id
+				}).then(res => {
+					if (res.code == '200') {
+						debugger
+						uni.hideLoading()
+						if (res.data.length > 0) {
+							let _list = []
+							for (let i = 0; i < res.data.length; i++) {
+								if (res.data[i].status == '已通过') {
+									_list.push(res.data[i].carNumber)
+								}
+							}
+							that.carList = [_list]
+						}
+					} else {
+						uni.$u.toast(res.message);
+					}
+
+				})
+				.catch(res => {
+					uni.$u.toast(res.message);
+				});
 		},
 		methods: {
-			dateShow(){
+			confirmBtn(e) {
+				this.dataDetails.carrierInfo.carNo = e.value[0]
+				this.showCarList = false
+			},
+			selectTypeClose() {
+				this.showCarList = false
+			},
+			carClick() {
+				this.showCarList = true
+			},
+			//车牌号弹出键盘
+			handleShowKeyboard() {
+				debugger
+				if (!this.dataDetails.carrierInfo.carNo) {
+					this.carNumber = ''
+				} else {
+					this.carNumber = this.dataDetails.carrierInfo.carNo
+				}
+				if (this.$refs.keyboard.open) {
+					this.$refs.keyboard.open(false) //true 键盘显示 false 键盘隐藏
+				} else {
+					this.$refs.keyboard[0].open(false)
+				}
+				if (this.$refs.keyboard.open) {
+					this.$refs.keyboard.open(true) //true 键盘显示 false 键盘隐藏
+				} else {
+					this.$refs.keyboard[0].open(true)
+				}
+			},
+			//车牌号弹出键盘
+			handleClick(e) {
+				this.carNumber = e.value
+				this.dataDetails.carrierInfo.carNo = e.value //键盘输入值
+			},
+			dateShow() {
 				this.startShow = true
 			},
-			removeStart(){
+			removeStart() {
 				this.startShow = false
 			},
-			removeEnd(){
+			removeEnd() {
 				this.endShow = false
 			},
 			startDate(e) {
 				let timeFormat = uni.$u.timeFormat
-				this.dataDetails.startDates = timeFormat(e.value,"yyyy-mm-dd")
+				this.dataDetails.startDates = timeFormat(e.value, "yyyy-mm-dd")
 				this.startShow = false
 			},
-			endDate(e){
+			endDate(e) {
 				let timeFormat = uni.$u.timeFormat
-				this.dataDetails.endDates = timeFormat(e.value,"yyyy-mm-dd")
+				this.dataDetails.endDates = timeFormat(e.value, "yyyy-mm-dd")
 				this.endShow = false
 			},
 			submit() {
@@ -213,7 +304,7 @@
 					})
 					return
 				}
-				if (uni.$u.test.isEmpty(that.dataDetails.freightCars)) {
+				if (uni.$u.test.isEmpty(that.dataDetails.freight)) {
 					that.$refs.uToast.show({
 						type: 'error',
 						message: "运费不能为空！",
@@ -257,15 +348,17 @@
 				}
 				console.log(that.dataDetails)
 				let _obj = {}
+				debugger
 				_obj.trailerNumber = that.dataDetails.trailerNumber
 				_obj.startDates = that.dataDetails.startDates
 				_obj.endDates = that.dataDetails.endDates
 				_obj.contactPersonName = that.dataDetails.contactPersonName
 				_obj.contactPersonPhone = that.dataDetails.contactPersonPhone
-				_obj.freightCars = that.dataDetails.freightCars
+				_obj.freight = that.dataDetails.freight
 				_obj.advanceCharge = that.dataDetails.advanceCharge
 				_obj.id = that.dataDetails.id
-				
+				_obj.carNumber = that.dataDetails.carrierInfo.carNo
+				_obj.typeFlag = 2
 				uni.canvasToTempFilePath({
 					canvasId: 'handWriting',
 					fileType: 'png',
@@ -291,7 +384,7 @@
 													success: function(res) {
 														var filePath = res.tempFilePath;
 														uni.openDocument({
-												 		filePath: filePath,
+															filePath: filePath,
 															showMenu: true,
 															success: function(res) {
 																console.log('打开文档成功');
@@ -303,10 +396,14 @@
 													type: 'success',
 													message: "提交成功",
 													complete() {
-														that.upCallback({
-															size: 10,
-															num: 1
-														})
+														uni.$u.route('/pages/order/confirmLoading', {
+															obj: JSON.stringify(that
+																.dataDetails),
+														});
+														// that.upCallback({
+														// 	size: 10,
+														// 	num: 1
+														// })
 													}
 												})
 											}