更新

pages/goodSource/index.vue

@@ -46,7 +46,7 @@
 							v-if="good.freightAdvance==1"></image>
 						<view class="flex align-center">
 							<view class="item1">
-								<view class="ssx">{{$helper.getProvinceAbbreviation(good.sendPrivate)}}</view>
+								<view class="ssx">{{$helper.getProvinceAbbreviation(good.sendPrivate?good.sendPrivate:good.sendCity)}}</view>
 								<view class="level2-title">{{$helper.filterUrban(good.sendCity)}}
 									{{$helper.filterArea(good.sendArea)}}
 								</view>
@@ -55,7 +55,7 @@
 							<image class="jt-icon item2" src="@/static/images/goodSource/jt.png" mode='widthFix'>
 							</image>
 							<view class="item3">
-								<view class="ssx">{{$helper.getProvinceAbbreviation(good.unloadPrivate)}}</view>
+								<view class="ssx">{{$helper.getProvinceAbbreviation(good.unloadPrivate?good.unloadPrivate:good.unloadCity)}}</view>
 								<view class="level2-title">{{$helper.filterUrban(good.unloadCity)}}
 									{{$helper.filterArea(good.unloadArea)}}
 								</view>
@@ -278,7 +278,6 @@
 				this.mescroll = mescroll;
 			},
 			confirmClick() {
-		
 				let item = this.ObjSelect
 				let _obj = {
 					driverCommonId: this.firstAuthentication.commonId,
@@ -299,7 +298,8 @@
 					driverName: this.firstAuthentication.driverName,
 					driverPhone: this.firstAuthentication.driverPhone,
 					cargoOwnerPhone: item.cargoOwnerPhone,
-					id:item.id
+					id:item.id,
+					billingMethod:item.billingMethod
 				}
 
 				this.$request.baseRequest('post', '/publishTaskInfo/api/addOrder', _obj).then(res => {
@@ -390,7 +390,9 @@
 			},
 			confirmSelectType(val) {
 				this.pickerSelect = val.value[0]
+				
 				this.show = false
+				this.upCallback({size:10,num:1})
 			},
 			selectTypeClose() {
 				this.show = false
@@ -489,13 +491,11 @@
 					// unLoadingPlaceCity: this.endPlace.schoosecity
 
 				}
-				if (this.tabIndex == 2) {
-					// #ifdef APP-PLUS
+				// if (this.tabIndex == 2) {
 					this.getLngLat();
-					// #endif
 					_data.driverLongitude = this.lng
 					_data.driverLatitude = this.lat
-				}
+				// }
 				console.log('------')
 				console.log(_data)
 				if (uni.getStorageSync('fPlaceObj')) {

pages/order/addEvaluation.vue

@@ -3,11 +3,11 @@
 		<view class="kuang">
 			<view class="order-row flex flex-space-between">
 				<view class="flex">
-					<view>{{objData.orderNo}}</view>
-					<view>{{objData.goodsName}}</view>
+					<view>订单：{{objData.orderNo}}</view>
+					<!-- <view>{{objData.goodsName}}</view> -->
 				</view>
 				<view class="flex align-center">
-					<image src="../../static/ITkoala-amap/start.png" mode="widthFix" class="tx-img"></image>
+					<image :src="objData.cargoOwnerPortrait" mode="widthFix" class="tx-img"></image>
 					<view>{{objData.cargoOwner}}</view>
 				</view>
 			</view>
@@ -80,19 +80,19 @@
 				rate: [{
 						name: "货主信用",
 						count: "5",
-						value1: '5',
+						value1: '0',
 						level: '非常好'
 					},
 					{
 						name: "运费支付",
 						count: "5",
-						value1: '5',
+						value1: '0',
 						level: '非常好'
 					},
 					{
 						name: "综合满意度",
 						count: "5",
-						value1: '5',
+						value1: '0',
 						level: '非常满意'
 					}
 				],
@@ -282,5 +282,7 @@
 
 	.tx-img {
 		width: 40rpx;
+		height: 40rpx;
+		// border-radius: 20rpx;
 	}
 </style>

pages/order/bankCard.vue

@@ -150,7 +150,6 @@
 								let _obj = this.bankList[i]
 								_obj.bankNo = this.bankList[i].bankCard
 								_obj.bankCard = this.number(_obj.bankCard)
-								debugger
 								switch (_obj.bankDeposit) {
 									case "建设银行":
 										this.bankList[i].imgLogo = "../../../static/images/mine/bank/jiansheogo.png"

pages/order/confirmLoading.vue

@@ -107,10 +107,10 @@
 	export default {
 		data() {
 			return {
-				cyId:'',
-				localtion:{
-					city:'',
-					sendArea:''
+				cyId: '',
+				localtion: {
+					city: '',
+					sendArea: ''
 				},
 				imgList: [],
 				fileList1: [],
@@ -133,7 +133,7 @@
 				gjList: [],
 			}
 		},
-		onLoad(options) {debugger
+		onLoad(options) {
 			that = this
 			// #ifdef APP-PLUS
 			this.getLngLat();
@@ -276,18 +276,12 @@
 					type: 'gcj02',
 					geocode: true,
 					success: res => {
-						console.log('定位地址')
-						console.log(res)
 						if (res.latitude) {
-							console.log('11111111111111111111111111111')
-							console.log(that.detailData)
 							that.detailData.hyCarrierInfo.loadingAreaLongitude = res.longitude;
 							that.detailData.hyCarrierInfo.loadingAreaLatitude = res.latitude;
 							that.detailData.hyCarrierInfo.sendCity = that.$helper.filterUrban(res.address.city)
 							that.localtion.city = that.$helper.filterUrban(res.address.city)
 							that.localtion.sendArea = that.$helper.filterUrban(res.address.district)
-							console.log(that.detailData.hyCarrierInfo.sendCity)
-							console.log(that.detailData.hyCarrierInfo.sendArea)
 							that.$forceUpdate()
 							uni.hideLoading()
 						} else {
@@ -383,9 +377,8 @@
 				console.log(e)
 			},
 			submit(type) {
-				console.log(type)
 				if (type == 1) {
-					if (!this.detailData.contractNo) {
+					if (this.detailData.driverContract != 1) { //合同签订标识
 						this.$refs.uToast.show({
 							type: 'error',
 							message: "合同未签订不能暂存！"
@@ -394,7 +387,7 @@
 					}
 					this.alertTitle = '确定暂存装车信息？'
 				} else {
-					if (!this.detailData.contractNo) {
+					if (this.detailData.driverContract != 1) {
 						this.$refs.uToast.show({
 							type: 'error',
 							message: "合同未签订不能提交！"
@@ -460,7 +453,7 @@
 				// 	return true
 				// }
 			},
-			confirmClick() {debugger
+			confirmClick() {
 				this.isShowAlert = false
 				if (this.validate()) return
 				//1暂存
@@ -470,10 +463,25 @@
 					delete this.detailData.hyCarrierInfo.sendCity;
 					delete this.detailData.hyCarrierInfo.sendArea;
 				}
-				this.detailData.hyCarrierInfo = {}
 				uni.showLoading({
 					title: '加载中'
 				})
+				let time = new Date() //装车时间   去当前时间的时分秒
+				let h = time.getHours();
+				if (h < 10) {
+					h = "0" + h
+				}
+				let f = time.getMinutes();
+				if (f < 10) {
+					f = "0" + f
+				}
+				let m = time.getSeconds();
+				if (m < 10) {
+					m = "0" + m
+				}
+				if(this.detailData.hyCarrierInfo.loadingDate){
+					this.detailData.hyCarrierInfo.loadingDate = this.detailData.hyCarrierInfo.loadingDate.split(" ")[0] + " " + h + ":" + f + ":" + m
+				}
 				this.detailData.hyCarrierInfo.statusFlag = this.detailData.statusFlag
 				this.detailData.hyCarrierInfo.id = this.cyId
 				this.detailData.hyCarrierInfo.loadingImg = this.imgList.toString()
@@ -486,7 +494,6 @@
 							} else {
 								_title = '提交成功！'
 							}
-							console.log(111111111111111111111111111111111111111111111)
 							that.$helper.fUN_AmapLocation.start({
 									// intervalTime: 1000 * 60,
 									intervalTime: 5000,
@@ -518,7 +525,7 @@
 									uni.setStorageSync('mapGJ', this.$helper.gjList);
 									console.log('this.$helper.gjList')
 									console.log(this.$helper.gjList)
-									console.log("条数",uni.getStorageSync('mapGJ').length)
+									console.log("条数", uni.getStorageSync('mapGJ').length)
 									if (uni.getStorageSync('mapGJ').length > 100) {
 										console.log(uni.getStorageSync('mapGJ'))
 										this.$request.baseRequest('post', '/hyOrderTravelPath/api/addInfo', {

pages/order/confirmUnloading.vue

@@ -33,7 +33,7 @@
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text">运费</view>
-				<view class="row-right-text">{{detailData.freightInfo.freight}}{{detailData.billingMethod==0?'元/吨':'元/车'}}</view>
+				<view class="row-right-text">{{detailData.freight}}{{detailData.billingMethod==0?'元/吨':'元/车'}}</view>
 			</view>
 
 		</view>
@@ -41,7 +41,7 @@
 			<view class="level2-title">卸车信息</view>
 			<view class='row-between'>
 				<view class="row-left-text">车牌号</view>
-				<view class="row-right-text">{{detailData.carrierInfo.carNo}}</view>
+				<view class="row-right-text">{{detailData.carNumber}}</view>
 			</view>
 			<!-- 	<view class='row-between'>
 				<view class="row-left-text">卸车日期</view>
@@ -54,12 +54,9 @@
 				</view>
 			</view>
 			<view class='row-between'>
-				<view class="row-left-text">合计应付运费（元）</view>
-				
-				<input class="totalFreight-input" placeholder="输入合计应付运费" v-model="detailData.freightInfo.freight"
-					type="number" v-if="detailData.billingMethod==1"/>
-					<input class="totalFreight-input" placeholder="输入合计应付运费" v-model="detailData.carrierInfo.totalFreight"
-						type="number" v-if="detailData.billingMethod==0"/>
+				<view class="row-left-text">合计运费（元）</view>
+				<input class="totalFreight-input" placeholder="输入合计运费" v-model="detailData.totalFreight"
+					type="number" />
 			</view>
 			<view class='row-between'>
 				<view class="row-left-text">定位</view>
@@ -112,21 +109,18 @@
 			}
 		},
 		onLoad(options) {
-			console.log('------------')
-			console.log(options)
 			this.detailData = JSON.parse(options.obj)
+			console.log(this.detailData)
 			this.detailData.carrierInfo = {
-				carNo: '',
-				unloadingDate: '',
-				estimatedFreight: '',
-				unloadingAreaLongitude: '',
-				unloadingAreaLatitude: '',
-				unloadCity: '',
-				unloadArea: '',
-				unloadingImg: '',
-				totalFreight: '',
+				// unloadingDate: '',
+				// estimatedFreight: '',
+				// unloadingAreaLongitude: '',
+				// unloadingAreaLatitude: '',
+				// unloadCity: '',
+				// unloadArea: '',
+				// unloadingImg: '',
+				// totalFreight: '',
 				id: this.detailData.carrierId,
-
 			}
 			this.validityPeriod = this.$helper.makeValidityPeriod()
 			// #ifdef APP-PLUS
@@ -327,7 +321,24 @@
 				uni.showLoading({
 					title:'加载中'
 				})
-				
+				let time = new Date() //卸车时间   去当前时间的时分秒
+				let h = time.getHours();
+				if (h < 10) {
+					h = "0" + h
+				}
+				let f = time.getMinutes();
+				if (f < 10) {
+					f = "0" + f
+				}
+				let m = time.getSeconds();
+				if (m < 10) {
+					m = "0" + m
+				}
+				if(this.detailData.carrierInfo.unloadingDate){//卸车时间   去当前时间的时分秒
+					this.detailData.carrierInfo.unloadingDate= this.detailData.carrierInfo.unloadingDate.split(" ")[0] + " " + h + ":" + f + ":" + m
+				}
+				this.detailData.carrierInfo.totalFreight = this.detailData.totalFreight
+				this.detailData.carrierInfo.carNo = this.detailData.carNumber
 				this.$request.baseRequest('post', '/carrierInfo/unLoadingAdd', this.detailData.carrierInfo).then(res => {
 						if (res.code == 200) {
 							let _title = ''
@@ -352,12 +363,9 @@
 					.catch(res => {
 						uni.$u.toast(res.message);
 					});
-				console.log('提交')
 			},
 			confirmValidityPeriod(e) {
-				console.log('confirm', e)
 				this.detailData.carrierInfo.unloadingDate = e.value[0] + '-' + e.value[1] + '-' + e.value[2]
-
 				this.isShowValidity = false
 			},
 		},

pages/order/index.vue

@@ -58,7 +58,7 @@
 						</view>
 						<view class="flex row2">
 							<view class="left flex flex-space-between">
-								<view class="ssx">{{$helper.getProvinceAbbreviation(good.sendPrivate)}}</view>
+								<view class="ssx">{{$helper.getProvinceAbbreviation(good.sendPrivate?good.sendPrivate:good.sendCity)}}</view>
 								<view class="level2-title">{{$helper.filterUrban(good.sendCity)}}
 									{{$helper.filterArea(good.sendArea)}}
 								</view>
@@ -67,7 +67,7 @@
 									</image>
 								</view>
 								<view class="ssx">
-									{{$helper.getProvinceAbbreviation(good.unloadPrivate)}}
+									{{$helper.getProvinceAbbreviation(good.unloadPrivate?good.unloadPrivate:good.unloadCity)}}
 								</view>
 								<view class="level2-title">{{$helper.filterUrban(good.unloadCity)}}
 									{{$helper.filterArea(good.unloadArea)}}
@@ -91,24 +91,23 @@
 						</view>
 						<view class="row4 flex flex-end align-center">
 							<view class="time">{{good.updateDate}}</view>
-							<!-- {{good.freight}} -->
 							<!-- 货主装车确认前运费 -->
 							<view class="car"
 								v-if="good.orderStatus=='待货主确认'||good.orderStatus=='未装车'||good.orderStatus=='待货主确认装车'||good.orderStatus=='货主驳回装车信息'||good.orderStatus=='已终止'">
 								<!-- {{good.billingMethod==0?good.freightInfo.freight?good.freightInfo.freight:good.freight:good.freightCar}}{{good.billingMethod==0?'元/吨':'元/车'}} -->
-								{{good.freightInfo?good.freightInfo.freight:good.freight}}{{good.illingMethod==0?'元/吨':'元/车'}}
+								{{good.freight}}{{good.billingMethod==0?'元/吨':'元/车'}}
 							</view>
 							<!-- 货主装车确认后卸车确认前运费 -->
 							<view class="car"
 								v-if="good.orderStatus=='待平台确认装车'||good.orderStatus=='平台驳回装车信息'||good.orderStatus=='运输中'||good.orderStatus=='待货主确认卸车'||good.orderStatus=='货主驳回卸车信息'">
 								<!-- {{good.estimatedFreight}}{{good.illingMethod==0?'元/吨':'元/车'}} -->
-								{{good.freightInfo.freight}}{{good.billingMethod==0?'元/吨':'元/车'}}
+								{{good.freight}}{{good.billingMethod==0?'元/吨':'元/车'}}
 							</view>
 							<!-- 货主装车卸车确认后 -->
 							<view class="car"
 								v-if="good.orderStatus=='待平台确认卸车'||good.orderStatus=='平台驳回卸车信息'||good.orderStatus=='待结算'||good.orderStatus=='已完结'||good.orderStatus=='结算中'||good.orderStatus=='待结算'">
 								<!-- {{good.totalFreight}}{{good.illingMethod==0?'元/吨':'元/车'}} -->
-								{{good.freightInfo.freight}}{{good.billingMethod==0?'元/吨':'元/车'}}
+								{{good.freight}}{{good.billingMethod==0?'元/吨':'元/车'}}
 							</view>
 							<!-- <view class='pay flex'
 								v-if="good.orderStatus=='运输中'||good.orderStatus=='待货主确认卸车'||good.orderStatus=='待平台确认卸车'||good.orderStatus=='货主驳回卸车信息'||good.orderStatus=='平台驳回卸车信息'||good.orderStatus=='结算中'||good.orderStatus=='待结算'">
@@ -133,12 +132,10 @@
 							<view class="start normal" @click.stop="confirmUnLoading(good)"
 								v-if="good.orderStatus=='运输中'||good.orderStatus=='货主驳回卸车信息'||good.orderStatus=='平台驳回卸车信息'">
 								确认卸车</view>
-							<!-- 				<view class="start">评价</view>
-							-->
 							<view class="start normal" @click.stop="closed(good)" v-if="good.orderStatus=='结算中'">完结
 							</view>
 							<!-- <view class="start normal" @click.stop="addevaluation(good)" v-if="good.orderStatus=='已完结'">评价</view> -->
-							<view class="start normal" @click.stop="addevaluation(good)" v-if="good.orderStatus=='待结算'">
+							<view class="start normal" @click.stop="addevaluation(good)" v-if="good.orderStatus=='已完结' && good.driverEvaluated != 1"><!-- driverEvaluated 为1是已评价过-->
 								评价</view>
 						</view>
 					</view>

pages/order/orderDetails.vue

@@ -135,7 +135,7 @@
 			</view>
 			<view class='row-between'>
 				<view class=" gray">装车时间</view>
-				<view class=" gray">{{carrierInfo.loadingDate}}</view>
+				<view class="">{{carrierInfo.loadingDate}}</view>
 			</view>
 			<view class='row-between'>
 				<view class=" gray">装车照片</view>
@@ -150,7 +150,7 @@
 				</view>
 				<view class='row-between'>
 					<view class=" gray">卸车时间</view>
-					<view class=" gray">{{carrierInfo.loadingDate}}</view>
+					<view class="">{{carrierInfo.loadingDate}}</view>
 				</view>
 				<view class='row-between'>
 					<view class=" gray">卸车照片</view>
@@ -162,21 +162,22 @@
 	
 		</view>
 		<!-- v-if="status2 -->
-		<view class="content4" v-if='dataObj.orderStatus!="待货主确认"&&dataObj.orderStatus!="未装车"&&dataObj.orderStatus!="待货主确认装车"&&dataObj.orderStatus!="货主驳回装车信息"&&dataObj.orderStatus!="待平台确认装车"&&dataObj.orderStatus!="平台驳回装车信息"&&dataObj.orderStatus!="已终止"'>
+		<!-- dataObj.orderStatus!="待货主确认"&&dataObj.orderStatus!="未装车"&&dataObj.orderStatus!="待货主确认装车"&&dataObj.orderStatus!="货主驳回装车信息"&&dataObj.orderStatus!="待平台确认装车"&&dataObj.orderStatus!="平台驳回装车信息"&&dataObj.orderStatus!="已终止" -->
+		<view class="content4" v-if='status2'>
 			<view class="level2-title gray">运费信息（单位：元）</view>
 			<view class='row-between'>
 				<view class=" gray">预付运费</view>
 				<view class="">{{freightInfo.prepaidFreight}}</view>
 			</view>
 			<view class='flex flex-end'>
-				<view class="gray ">{{freightInfo.prepaidFreightDate}}</view>
+				<view class="">{{freightInfo.prepaidFreightDate}}</view>
 			</view>
 			<view class='row-between'>
 				<view class=" gray">运费尾款</view>
 				<view class="">{{freightInfo.freightBalance?freightInfo.freightBalance:'未支付'}}</view>
 			</view>
-			<view class='row-between mx  gray'>
-				明细：预付{{freightInfo.prepaidFreight}}元，扣款{{freightInfo.deduction}}元，服务费{{freightInfo.serviceCharge}}元，尾款{{freightInfo.freightBalance}}元，合计收款{{freightInfo.totalCollection}}元。
+			<view class='row-between mx ' v-if="freightInfo.freightBalance">
+				明细：预付{{freightInfo.prepaidFreight}}元，服务费{{freightInfo.driverServiceCharge}}元，尾款{{freightInfo.freightBalance}}元，合计收款{{freightInfo.totalCollection}}元。
 			</view>
 		</view>
 		<u-modal :show="isShowAlert" :title="alertTitle" :content='alertContent' :confirmText='confirmText'
@@ -394,11 +395,10 @@
 			getList(){
 				this.$request.baseRequest('get', '/orderInfo/getOrderInfo', {
 						id: this.id,
-						
 					}).then(res => {
 						if(res.code==200){
 							this.dataObj = res.data
-							this.carrierInfo = res.data.carrierInfo
+							this.carrierInfo = res.data.hyCarrierInfo
 							this.freightInfo =  res.data.freightInfo
 							if(this.carrierInfo.loadingImg&&this.carrierInfo.loadingImg.length>0){
 								this.zcPhoneList = this.carrierInfo.loadingImg.split(',')
@@ -407,9 +407,13 @@
 							// if(res.data.orderStatus!="待货主确认"&&res.data.orderStatus!="未装车"&&res.data.orderStatus!="已终止"){
 							// 	this.status1 = true
 							// }
-							// if(res.data.orderStatus!="已终止"&&res.data.orderStatus!="平台驳回装车信息"&&res.data.orderStatus!="待平台确认装车"&&res.data.orderStatus!="待货主确认"&&res.data.orderStatus!="未装车"&&res.data.orderStatus!="待货主确认装车"&&res.data.orderStatus!="货主驳回装车信息"){
-							// 	this.status2 = true
-							// }
+							// 运费信息
+							if (res.data.cargoOwnerStatus != "待接单" && res.data.cargoOwnerStatus != "未装车" && res.data
+								.cargoOwnerStatus != "待确认装车" && res.data.cargoOwnerStatus != "已驳回装车信息" && res.data
+								.cargoOwnerStatus != "待平台确认装车" && res.data.cargoOwnerStatus != "平台驳回装车信息"  && res.data.cargoOwnerStatus != "待结算" && res.data
+								.cargoOwnerStatus != "已终止") {
+								this.status2 = true
+							}
 						}
 						
 					})

pages/order/signContract.vue

@@ -10,8 +10,9 @@
 
 		</view> -->
 		<view class="content2">
-			<view class="title">
-				合同摘要
+			<view class="flex">
+				<view class="title">合同摘要</view>
+			     <view class="preview" @click="submit(1)">预览合同</view>
 			</view>
 			<view class='row-between'>
 				<view class="gray">发货单位</view>
@@ -121,6 +122,8 @@
 			<view class='row-between'>
 				<view class="gray">装车后预付款</view>
 				<view class="">
+					
+					
 					<u--input placeholder="请输入装车后预付款" v-if="dataDetails.freightAdvance == 1" border="none"
 						v-model="dataDetails.loadingAdvancePayment" inputAlign='right' clearable disabled></u--input>
 					<u--input placeholder="请输入装车后预付款" v-else border="none" v-model="dataDetails.loadingAdvancePayment"
@@ -216,6 +219,7 @@
 				],
 				startShow: false,
 				endShow: false,
+				contractCheck:false,//判断合同是否提交
 
 
 			};
@@ -349,8 +353,16 @@
 				this.dataDetails.endDates = e[0]
 				this.endShow = false
 			},
-			submit() {
-				if (!that.isScaleStart) {
+			submit(num) {
+				let _obj = {}
+				if(num == 1){//预览合同
+					_obj.submitFlag = 1
+					this.contractCheck = false
+				}else{//提交合同
+				this.contractCheck = true
+					_obj.submitFlag = 2
+					}
+					if (!that.isScaleStart) {
 					that.$refs.uToast.show({
 						type: 'error',
 						message: "手写签名不能为空！",
@@ -399,7 +411,9 @@
 					})
 					return
 				}
-				let _obj = {}
+				
+				
+				
 				_obj.trailerNumber = that.dataDetails.trailerNumber
 				_obj.startDates = that.dataDetails.startDates
 				_obj.endDates = that.dataDetails.endDates
@@ -445,7 +459,8 @@
 														});
 													}
 												});
-												that.$refs.uToast.show({
+												if(that.contractCheck){//提交
+														that.$refs.uToast.show({
 													type: 'success',
 													message: "提交成功",
 													complete() {
@@ -460,6 +475,7 @@
 														// })
 													}
 												})
+												}
 											}
 										})
 									.catch(res => {
@@ -627,6 +643,13 @@
 			font-size: 36rpx;
 			font-weight: 700;
 			margin-bottom: 20rpx;
+			width: 50%;
+		}
+		.preview{
+			width: 50%;
+			text-align: right;
+			color: #2772FB;
+			font-size: 26rpx;
 		}
 
 		.row-between {