From 7af16f32de779ba2360344218f807c9909677ee1 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 08 八月 2024 11:20:20 +0800
Subject: [PATCH] feat:关于产品名称换行样式修改

---
 pages/driver-page/driver-index/driver-index.vue |  374 ++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 323 insertions(+), 51 deletions(-)

diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index 86a6c78..369347c 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -2,14 +2,14 @@
 	<view class="">
 		<view class="driver-index">
 			<view class="driver-index-body">
-				<!-- 寰呴鍙栨彁鐓ゅ崟 -->
+				<!-- 寰呴鍙栨敹鍙戝崟 -->
 				<view class="wait-collection"
 					style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/diverbanner.png') no-repeat;background-size:contain">
 				</view>
 				<!-- 寮曞椤� -->
 				<noob-tour></noob-tour>
 				<!-- 鑷富閰嶉�佺晫闈� -->
-				<view class="self-deliver">
+				<!-- <view class="self-deliver">
 					<view class="self-deliver_text">
 						鍒涘缓鑷富閰嶉�佸崟
 					</view>
@@ -19,7 +19,7 @@
 							shape="cirle"
 							@click="selfDeliver"></u-button>
 					</view>
-				</view>
+				</view> -->
 				<view class="collection-form">
 					<view class="collection-form-item"
 						v-for="(item, index) in driverBillOfLoadingData.list1"
@@ -30,9 +30,9 @@
 								<view class="sign">瑁�</view>
 								<view class="filedname exceedHide">
 									<text
-										v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢'  ">{{ item.deptName|| ''  }}</text>
+										v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢'||item.orderType == '澶栭攢閫�'  ">{{ item.deptName|| ''  }}</text>
 									<text
-										v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' ">{{ item.customerId?item.customerName:item.customerNameCopy|| ''  }}</text>
+										v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘'||item.orderType == '澶栬喘閫�'  ">{{ item.customerId?item.customerName:item.customerNameCopy|| ''  }}</text>
 									<text v-else-if="item.orderType == '杞嚭'|| item.orderType == '杞叆'">{{item.filedName}}
 
 									</text>
@@ -47,11 +47,11 @@
 							<view class="main-information">
 								<view class="sign">鍗�</view>
 								<view class="filedname exceedHide">
-									<text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' ">
+									<text v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢'||item.orderType == '澶栭攢閫�' ">
 										{{ item.customerNameCopy ? item.customerNameCopy : item.customerName|| ''  }}
 									</text>
 									<text
-										v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' ">{{ item.deptName|| ''  }}</text>
+										v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘'||item.orderType == '澶栬喘閫�'  ">{{ item.deptName|| ''  }}</text>
 									<text
 										v-else-if="item.orderType == '杞嚭'|| item.orderType == '杞叆'">{{item.toFiledName}}
 
@@ -68,7 +68,7 @@
 									size="40"></u-icon></view>
 							<view class="send-date">{{ item.sendDate }}</view>
 							<view class="type">
-								<view class="coal-name">{{ item.coalName }}</view>
+								<view class="coal-name">{{ item.productNames || item.productName }}</view>
 							</view>
 						</view>
 						<view class="fourth-line"
@@ -89,9 +89,9 @@
 						@confirm="qiangDanConfirm"
 						@cancel="qiangDanCancel"></u-modal>
 				</view>
-				<!-- 寰呴绾︽彁鐓ゅ崟 -->
+				<!-- 寰呴绾︽敹鍙戝崟 -->
 				<view class="wait-appointment">
-					<combined-title title="寰呴绾︽彁鐓ゅ崟"></combined-title>
+					<combined-title title="寰呴绾︽敹鍙戝崟"></combined-title>
 					<u-empty mode="data"
 						icon="http://cdn.uviewui.com/uview/empty/data.png"
 						text="鏆傛棤鏁版嵁"
@@ -109,9 +109,9 @@
 									<view class="sign">瑁�</view>
 									<view class="filedname exceedHide">
 										<text
-											v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' ">{{ item.deptName }}</text>
+											v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢'||item.orderType == '澶栭攢閫�' ">{{ item.deptName }}</text>
 										<text
-											v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' ">{{ item.customerName }}</text>
+											v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘'||item.orderType == '澶栬喘閫�' ">{{ item.customerName }}</text>
 										<text
 											v-else-if="item.orderType == '杞嚭'|| item.orderType == '杞叆'">{{item.filedName}}
 										</text>
@@ -129,9 +129,9 @@
 									<view class="sign">鍗�</view>
 									<view class="filedname exceedHide">
 										<text
-											v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' ">{{ item.customerName }}</text>
+											v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢'||item.orderType == '澶栭攢閫�' ">{{ item.customerName }}</text>
 										<text
-											v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' ">{{ item.deptName }}</text>
+											v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘'||item.orderType == '澶栬喘閫�'  ">{{ item.deptName }}</text>
 										<text
 											v-else-if="item.orderType == '杞嚭'|| item.orderType == '杞叆'">{{item.toFiledName}}</text>
 									</view>
@@ -151,11 +151,16 @@
 									<view class="send-date">{{ item.sendDate }}</view>
 								</view>
 								<view class="type">
-									<view class="coal-name">{{ item.coalName }}</view>
+									<view class="coal-name">{{ item.productNames || item.productName }}</view>
 									<!-- <view class="order-type">{{ item.orderType }}</view> -->
 								</view>
 							</view>
-							<view class="fourth-line">
+							<view class="fifth-line">
+								<view class="button-img"
+								    v-if="item.isDanger === 1 && !item.idCardEscort"
+									@click.stop="cancelCerifCate(item)">
+									閬撹矾杩愯緭璇�
+								</view>
 								<view class="button-img"
 									@click.stop="cancelAppoint(item)">
 									璇锋眰閫�鍗�
@@ -175,9 +180,37 @@
 						@confirm="cancelAppointConfirm"
 						@cancel="cancelAppointCancel"></u-modal>
 				</view>
-				<!-- 宸查绾︽彁鐓ゅ崟 -->
+				<!-- 鍦哄唴鎺ュ崟寮圭獥 -->
+				<view class="">
+					<u-modal :show="insideConnectShow"
+						title="鎺ュ崟閫夋嫨"
+						showCancelButton
+						cancel-text="姝e父鎺ュ崟"
+						confirm-text="鍦哄唴鎺ュ崟"
+						content="鍦哄唴鎺ュ崟鏃犻渶绉扮毊,鏄惁纭鎺ュ崟"
+						@confirm="insideConnectConfirm"
+						@cancel="insideConnectCancel"></u-modal>
+				</view>
+				<!-- 宸查绾︽敹鍙戝崟 -->
+				<!-- 濉啓闆嗚绠卞彿 -->
+					<view class="">
+					<u-modal :show="enterCode"
+						title="闆嗚绠卞彿"
+						showCancelButton
+						content="璇峰~鍐欓泦瑁呯鍙�"
+						@confirm="cancelCodeEnter"
+						@cancel="cancelCodeCancel">
+						<view style="    display: flex; align-items: center;">
+							 <text>璇疯緭鍏ワ細</text>	<u--input 
+						style="border: 1px solid black"
+						v-model="enterCodeStr"
+								placeholder="璇疯緭鍏ラ泦瑁呯鍙�"></u--input>
+						</view>
+					
+						</u-modal>
+				</view>
 				<view class="Reserved">
-					<combined-title title="宸查绾︽彁鐓ゅ崟"></combined-title>
+					<combined-title title="宸查绾︽敹鍙戝崟"></combined-title>
 					<u-empty mode="data"
 						icon="http://cdn.uviewui.com/uview/empty/data.png"
 						textSize="30"
@@ -195,9 +228,9 @@
 									<view class="sign">瑁�</view>
 									<view class="filedname exceedHide">
 										<text
-											v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' ">{{ item.deptName }}</text>
+											v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢'||item.orderType == '澶栭攢閫�' ">{{ item.deptName }}</text>
 										<text
-											v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘' ">{{ item.customerName }}</text>
+											v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘'||item.orderType == '澶栬喘閫�'  ">{{ item.customerName }}</text>
 										<text v-else-if="item.orderType == '杞嚭'||item.orderType == '杞叆'">
 											{{item.filedName}}
 
@@ -216,9 +249,9 @@
 									<view class="sign">鍗�</view>
 									<view class="filedname exceedHide">
 										<text
-											v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢' ">{{ item.customerName }}</text>
+											v-if="item.orderType == '澶栭攢' || item.orderType == '鍐呴攢'||item.orderType == '澶栭攢閫�' ">{{ item.customerName }}</text>
 										<text
-											v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘'">{{ item.deptName }}</text>
+											v-else-if="item.orderType == '澶栬喘' || item.orderType == '鍐呰喘'||item.orderType == '澶栬喘閫�' ">{{ item.deptName }}</text>
 										<text v-else-if="item.orderType == '杞嚭'||item.orderType == '杞叆'">
 											{{item.toFiledName}}
 
@@ -240,11 +273,16 @@
 									<view class="send-date">{{ item.yuYueSection|| ''  }}</view>
 								</view>
 								<view class="type">
-									<view class="coal-name">{{ item.coalName || '' }}</view>
+									<view class="coal-name">{{ item.productNames || item.productName }}</view>
 									<!-- <view class="order-type">{{ item.orderType }}</view> -->
 								</view>
 							</view>
-							<view class="fourth-line">
+							<view class="fourth-line"
+								v-if="item.isDanger === 1">
+									<view class="button-img"
+										@click.stop="cancelCerifCate(item)">
+										閬撹矾杩愯緭璇�
+									</view>
 								<view class="button-img"
 									@click.stop="cancelAppoint(item)">
 									璇锋眰閫�鍗�
@@ -256,6 +294,48 @@
 				</view>
 			</view>
 		</view>
+		<u-popup :show="show"
+			@close="close"
+			@open="open"
+			mode="center"
+			round="10">
+			<view class="receiverPopup">
+				<view class="image">
+					<u--image 
+						:src="previewImageSrc != null ? BaseUrl + previewImageSrc : ''"
+						width="80px"
+						height="80px"
+						>
+						<view slot="error"
+							style="font-size: 24rpx;">鍔犺浇澶辫触</view>
+					</u--image>
+				</view>
+				<view class="tables">
+					<uni-table border
+						stripe
+						type="selection" 
+						@selection-change="selectionChange"
+						emptyText="鏆傛棤鏇村鏁版嵁">
+						<uni-tr>
+							<uni-th align="center">鎶艰繍鍛�</uni-th>
+							<uni-th align="center">韬唤璇佸彿</uni-th>
+							<uni-th align="center">鎵嬫満鍙�</uni-th>
+						</uni-tr>
+						<uni-tr v-for="(item, index) in inspectData"
+							:key="item.id">
+							<uni-td align="center">{{ item.name.split("|")[0]  }}</uni-td>
+							<uni-td align="center">{{ item.name.split("|")[1]  }}</uni-td>
+							<uni-td align="center">{{ item.name.split("|")[2]  }}</uni-td>
+						</uni-tr>
+					</uni-table>
+				</view>
+				
+				<view class="receiverPopup__btn"><u-button text="纭畾"
+						type="primary"
+						@click="popClick"
+						:loading="ClickLoading"></u-button></view>
+			</view>
+		</u-popup>
 	</view>
 </template>
 
@@ -263,14 +343,13 @@
 	import { customerId } from '@/utils/status';
 	import combinedTitle from '@/components/combined-title/combined-title.vue';
 	import previewImage from '@/components/kxj-previewImage/kxj-previewImage.vue';
-	import noobTour from '@/components/noobTour/noobTour.vue'
 	import { mapState } from 'vuex'
 	import { BaseUrl } from '@/api/publicInterface.js'
 	export default {
 		components: {
 			combinedTitle,
 			previewImage,
-			noobTour
+			
 		},
 		props: {
 			indexdriverBillOfLoadingData: {
@@ -295,6 +374,11 @@
 		},
 		data() {
 			return {
+				show: false,
+				BaseUrl,
+				yaList:[],
+				inspectData:[],
+				activeObj:{},
 				driverBillOfLoadingData: {
 					list1: [],
 					list2: [],
@@ -302,23 +386,56 @@
 				},
 				// 鎺ュ崟妯℃�佹
 				qiangDanShow: false,
+				enterCode:false,
+				enterCodeStr:'',
 				qiangDanTitle: '鎺ュ崟鎻愮ず',
 				qiangDanContent: '',
 				qiangDanOrderPlanId: null,
-				fleetId: '',
-				xsUserId: '',
-				customerId: '',
 				isFirstLogin: true, //鏄惁鏄涓�娆$櫥褰�
 				phone: "",
 				isFirstTime: false, //鏄惁鏄櫥褰曡繘鍏ラ椤碉紝杩樻槸鍒殑椤甸潰杩斿洖 false鏄櫥褰� true鏄埆鐨勯〉闈�
 				cancelAppointShow: false, //纭閫�鍗曞脊绐楁帶鍒�
-				cancelAppointId: ''
+				cancelAppointId: '',
+				insideConnectShow: false,
+				orderPlanId: '',
+				fleetId: '',
+				customerId: '',
+				xsUserId: '',
+				filedId: '',
+				previewImageSrc:"",
 			};
 		},
 		onShow() {
 			this.init();
 		},
 		methods: {
+			open() {},
+			close() {
+				this.show = false;
+			},
+			selectionChange(e) {
+				this.yaList= e.detail.index.map(item=>{
+					return this.inspectData[item]
+				})
+			},
+			popClick(){
+				let data=this.yaList.map(item=>{
+					return  item.name
+				})
+				let paramsData={
+					idCardEscort:data.join(','),roadTransportId:this.yaList[0].roadTransportId,id: this.yaList[0].Id
+				}
+				this.$reqPut('saveMyEscort', paramsData, 'json')
+					.then(res => {
+						if (res.code == 0) {
+							this.$u.toast('娣诲姞鎴愬姛');
+							this.qiangDanList();
+							this.show=false
+						} else {
+							this.$u.toast(res.msg ? res.msg : '娣诲姞澶辫触');
+						}
+					})
+			},
 			// 璺宠浆鍦板浘
 			skipMap(val) {
 				uni.navigateTo({
@@ -328,6 +445,7 @@
 				});
 			},
 			init() {
+				this.inspectData=[]
 				this.qiangDanList();
 			},
 			// 鍙告満棣栭〉鍒楄〃
@@ -342,16 +460,26 @@
 			},
 			// 鎺ュ崟鎸夐挳
 			qiangDanBtn(value) {
-				if (value.tmcCount == '0') {
-					this.qiangDan(value.orderPlanId, value.fleetId, value.customerId === null ? '0' : value.customerId,
-						value.xsUserId === null ? '0' : value.xsUserId);
+				//鏄惁鍙互鍦哄唴鎺ュ崟锛�1 鍙互2涓嶅彲浠�
+				if (value.isInsideConnect === 1) {
+					this.insideConnectShow = true
+					this.orderPlanId = value.orderPlanId
+					this.fleetId = value.fleetId
+					this.customerId = !value.customerId ? '0' : value.customerId
+					this.xsUserId = !value.xsUserId ? '0' : value.xsUserId
+					this.filedId = value.filedId
 				} else {
-					this.qiangDanOrderPlanId = value.orderPlanId;
-					this.fleetId = value.fleetId;
-					this.customerId = value.customerId === null ? '0' : value.customerId;
-					this.xsUserId = value.xsUserId === null ? '0' : value.xsUserId;
-					this.qiangDanShow = true;
-					this.qiangDanContent = `宸叉帴${value.tmcCount}鍗曪紝纭畾鎺ュ崟锛焋;
+					if (value.tmcCount == '0') {
+						this.qiangDan(value.orderPlanId, value.fleetId, !value.customerId ? '0' : value.customerId,
+							!value.xsUserId ? '0' : value.xsUserId);
+					} else {
+						this.qiangDanOrderPlanId = value.orderPlanId;
+						this.fleetId = value.fleetId;
+						this.customerId = !value.customerId ? '0' : value.customerId;
+						this.xsUserId = !value.xsUserId ? '0' : value.xsUserId;
+						this.qiangDanShow = true;
+						this.qiangDanContent = `宸叉帴${value.tmcCount}鍗曪紝纭畾鎺ュ崟锛焋;
+					}
 				}
 			},
 			// 鎺ュ崟妯℃�佹
@@ -378,6 +506,7 @@
 						uni.hideLoading()
 						if (res.code == 0) {
 							this.$u.toast('鎺ュ崟鎴愬姛');
+							
 						} else {
 							this.$u.toast(res.msg ? res.msg : '鎺ュ崟澶辫触');
 						}
@@ -390,25 +519,61 @@
 						uni.hideLoading()
 					})
 			},
+			insideConnectHandle(orderPlanId, fleetId, customerId, xsUserId, filedId) {
+				uni.showLoading({
+					title: '鍔犺浇涓�'
+				})
+				this.$reqPost('insideConnect', {
+					orderPlanId,
+					fleetId,
+					customerId,
+					xsUserId,
+					filedId
+				}, 'params').then(res => {
+					uni.hideLoading()
+					if (res.code == 0) {
+						this.$u.toast('鍦哄唴鎺ュ崟鎴愬姛');
+					} else {
+						this.$u.toast(res.msg ? res.msg : '鍦哄唴鎺ュ崟澶辫触');
+					}
+				})
+			},
 			list3CardIconClick(value) {
 				uni.navigateTo({
-					url: `/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details?orderPlanId=${value.id}&yyId=${value.yyId}&orderType=${value.orderType}`
+					url: `/subPages/bill-of-lading-details/bill-of-lading-details?orderPlanId=${value.id}&yyId=${value.yyId}&orderType=${value.orderType}`
 				});
 			},
-			// 鎻愮叅鍗曡鎯�
+			// 鏀跺彂鍗曡鎯�
 			cardBodyClick(name) {
 				uni.navigateTo({
-					url: `/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details?orderPlanId=${name}`
+					url: `/subPages/bill-of-lading-details/bill-of-lading-details?orderPlanId=${name}`
 				});
 			},
 			// 璇锋眰閫�鍗�
 			cancelAppoint(item) {
 				if (item.status >= 3) {
-					this.$uy.toast('褰撳墠鐘舵�佷笉鍙��鍗�')
+					this.$u.toast('褰撳墠鐘舵�佷笉鍙��鍗�')
 					return
 				}
 				this.cancelAppointShow = true
 				this.cancelAppointId = item.id
+			},
+			cancelCerifCate(value){
+				this.$reqGet('getMyEscortList', { customerId: value.customerId }).then(res => {
+					this.inspectData=[]
+					if (res.code == 0) {
+						this.previewImageSrc=res.data.certificateImg
+						this.inspectData=res.data.persons.map(item=>{
+							return {name:item,roadTransportId:res.data.id,Id: value.id}
+						})
+						this.show=true
+					} else {
+						this.$u.toast(res.msg ? res.msg : '璇锋坊鍔犻亾璺繍杈撹瘉');
+						uni.navigateTo({
+							url: '/pages/driver-page/drvier-my/certifiCate/certifiCate'
+						})
+					}
+				})
 			},
 			// 閫�鍗曞脊绐楃‘璁�
 			cancelAppointConfirm() {
@@ -435,25 +600,87 @@
 			cancelAppointCancel() {
 				this.cancelAppointShow = false
 			},
+			insideConnectCancel() {
+				this.insideConnectShow = false
+				this.qiangDan(this.orderPlanId, this.fleetId, this.customerId, this.xsUserId)
+			},
+			// 鍦哄唴鎺ュ崟
+			insideConnectConfirm() {
+				this.insideConnectShow = false
+				this.insideConnectHandle(this.orderPlanId, this.fleetId, this.customerId, this.xsUserId, this.filedId)
+			},
 			// 鍘婚绾�
 			toAppointmentClick(value) {
 				// 鐢变簬鑷富閰嶉�佸崟 鏄璐崟 浣嗘槸涓嶉渶瑕佸~鍐欏師鍙戜负1涓嶉渶瑕佸~鍐欏師鍙�
-				uni.setStorageSync('isNeedOrigin', value.orderType === '澶栬喘' && value.isSpecial === 1 ? 1 : 0)
-				if (value.orderType === '澶栬喘') {
+				uni.setStorageSync('isNeedOrigin', value.orderType === '澶栬喘' && value.isSpecial === 1 ? 1 : 0);
+				//鍒ゆ柇鏄笉鏄泦瑁呯 鏄惁闇�瑕佽緭鍏�
+				this.activeObj = value;
+				if(value.isDanger === 1){
+					if(!value.idCardEscort){
+						this.$u.toast('璇烽�夋嫨閬撹矾杩愯緭璇佸徃鏈猴紒');
+						this.cancelCerifCate(value);
+						return
+					}
+				}
+				if(value.isContainerNum){
+				  this.enterCode = true;
+				}else{
+				  this.enterCode = false;
+				  	if (value.orderType === '澶栬喘') {
 					uni.navigateTo({
-						url: `/pages/driver-page/driver-index/bill-of-lading-details/originInfo/originInfo?orderPlanId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}&isSpecial=${value.isSpecial}`
+						url: `/subPages/bill-of-lading-details/originInfo/originInfo?orderPlanId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}&isSpecial=${value.isSpecial}&isWeight=${value.isWeight}`
 					});
 				} else {
 					uni.navigateTo({
 						url: `/pages/driver-page/appointment/appointment?takeCoalId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}`
 					});
 				}
+				  }
+			
 			},
 			// 鑷富閰嶉��
 			selfDeliver() {
 				uni.navigateTo({
 					url: '/pages/driver-page/driver-index/SelfDelivery/SelfDelivery'
 				})
+			},
+			cancelCodeEnter(){
+				console.log(this.activeObj,'tmid')
+				this.activeObj.containerNumber = this.enterCodeStr;
+			    this.$reqPut('addContainer',{
+					id:this.activeObj.id,
+					containerNumber:this.activeObj.containerNumber
+				}).then(res=>{
+					this.$u.toast('鎿嶄綔鎴愬姛');
+					this.enterCodeStr = '';
+					this.enterCode = false;
+
+				}).catch(err=>{
+
+				}).finally(() => {
+					if (this.activeObj.orderType === '澶栬喘') {
+					uni.navigateTo({
+						url: `/subPages/bill-of-lading-details/originInfo/originInfo?orderPlanId=${this.activeObj.id}&filedId=${this.activeObj.filedId}&deptId=${this.activeObj.deptId}&sendDate=${this.activeObj.sendDate}&isSpecial=${this.activeObj.isSpecial}&isWeight=${this.activeObj.isWeight}`
+					});
+				} else {
+					uni.navigateTo({
+						url: `/pages/driver-page/appointment/appointment?takeCoalId=${this.activeObj.id}&filedId=${this.activeObj.filedId}&deptId=${this.activeObj.deptId}&sendDate=${this.activeObj.sendDate}`
+					});
+				}
+				})
+			},
+			cancelCodeCancel(){
+				this.enterCode = false;
+				this.enterCodeStr = '';
+					if (this.activeObj.orderType === '澶栬喘') {
+					uni.navigateTo({
+						url: `/subPages/bill-of-lading-details/originInfo/originInfo?orderPlanId=${this.activeObj.id}&filedId=${this.activeObj.filedId}&deptId=${this.activeObj.deptId}&sendDate=${this.activeObj.sendDate}&isSpecial=${this.activeObj.isSpecial}&isWeight=${this.activeObj.isWeight}`
+					});
+				} else {
+					uni.navigateTo({
+						url: `/pages/driver-page/appointment/appointment?takeCoalId=${this.activeObj.id}&filedId=${this.activeObj.filedId}&deptId=${this.activeObj.deptId}&sendDate=${this.activeObj.sendDate}`
+					});
+				}
 			}
 		}
 	};
@@ -491,7 +718,7 @@
 		align-items: center;
 
 		.send-date {
-			width: 148rpx;
+			min-width: 170rpx;
 			height: 24rpx;
 			line-height: 24rpx;
 			font-size: 28rpx;
@@ -500,7 +727,7 @@
 		}
 
 		.havedclock {
-			width: 58% !important;
+			width: 70% !important;
 			margin-right: 0 !important;
 
 			.send-date {
@@ -538,7 +765,35 @@
 
 		}
 	}
-
+	.receiverPopup {
+		height: vww(220);
+		width: 700rpx;
+		.image{
+			width: 100%;
+			height: vww(110);
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+		.tables{
+			width: 100%;
+		}
+		.receiverPopup__title {
+			margin: vww(10) auto 0;
+			width: 80%;
+			text-align: center;
+		}
+	
+	
+		&__btn {
+			margin: vww(10) auto;
+			width: 50%;
+	
+			.u-button {
+				height: vww(20);
+			}
+		}
+	}
 	/deep/.u-button {
 		width: 100%;
 		height: 28px !important;
@@ -567,7 +822,7 @@
 		.driver-index-body {
 
 			// margin-bottom: vww(56);
-			// 寰呴鍙栨彁鐓ゅ崟
+			// 寰呴鍙栨敹鍙戝崟
 			.wait-collection {
 				width: 100%;
 				height: 600rpx;
@@ -743,7 +998,7 @@
 						align-items: center;
 
 						.send-date {
-							width: 148rpx;
+							min-width: 146rpx;
 							height: 24rpx;
 							margin-left: vww(14);
 							margin-right: vww(56);
@@ -976,6 +1231,23 @@
 					.fourth-line {
 						@include fourthLine;
 					}
+					.fifth-line {
+						height: vww(68);
+						display: flex;
+						align-items: center;
+						.button-img {
+							width: vww(122);
+							height: vww(41);
+							background: url('https://mx.jzeg.cn:9096/appimg/image/banner/button.png') no-repeat;
+							background-size: cover;
+							font-size: 28rpx;
+							font-weight: 300;
+							color: #ffffff;
+							text-align: center;
+							line-height: vww(40);
+						
+						}
+					}
 				}
 			}
 

--
Gitblit v1.9.1