From fcd9dabadd792a13d22d89cf574d081038c98d32 Mon Sep 17 00:00:00 2001
From: wk
Date: 星期四, 11 七月 2024 17:33:21 +0800
Subject: [PATCH] feat:门卫更改

---
 pages/doorkeeper-page/doorkeeper-index/doorkeeper-index.vue |  166 ++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 103 insertions(+), 63 deletions(-)

diff --git a/pages/doorkeeper-page/doorkeeper-index/doorkeeper-index.vue b/pages/doorkeeper-page/doorkeeper-index/doorkeeper-index.vue
index 7e3f1f2..b61db08 100644
--- a/pages/doorkeeper-page/doorkeeper-index/doorkeeper-index.vue
+++ b/pages/doorkeeper-page/doorkeeper-index/doorkeeper-index.vue
@@ -8,18 +8,18 @@
 				stripe
 				emptyText="鏆傛棤鏇村鏁版嵁">
 				<uni-tr>
-					<uni-th align="center">鍙告満</uni-th>
-					<uni-th align="center">浜у搧</uni-th>
 					<uni-th align="center">杞︾墝鍙�</uni-th>
+					<uni-th align="center">浜у搧</uni-th>
+					<uni-th align="center">鍙告満</uni-th>
 					<uni-th align="center">鎵嬫満鍙�</uni-th>
-					<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 driverBillOfLoadingData"
 					:key="item.id">
-					<uni-td align="center">{{ item.driver  }}</uni-td>
-					<uni-td align="center">{{ item.productName || '' }}</uni-td>
 					<uni-td align="center">{{ item.carNo || '' }}</uni-td>
+					<uni-td align="center">{{ item.productNames || '' }}</uni-td>
+					<uni-td align="center">{{ item.driver  }}</uni-td>
 					<uni-td align="center">{{ item.phone || '' }}</uni-td>
 					<uni-td align="center">{{ item.startTime || '' }}-{{item.endTime || ""}}</uni-td>
 					<uni-td>
@@ -45,12 +45,19 @@
 				<view class="imgrPopup">
 						<u--image :showLoading="true"
 							:src="certificateImg != null ? BaseUrl + certificateImg : ''"
-							width="500rpx"
+							width="700rpx"
 							height="400rpx"
 							@click="imageClick(certificateImg)">
 							<view slot="error"
 								style="font-size: 24rpx;">鍔犺浇澶辫触</view>
 						</u--image>
+						<view class="driveruser">
+							<view>鍙告満锛歿{ysData.driverName}}</view>  
+						</view>
+						<view class="driveruser">
+							<view>鎶艰繍鍛橈細{{ysData.supercargoInfo?ysData.supercargoInfo.split("|")[0]:null}}</view>  
+							<view>鎵嬫満鍙凤細{{ysData.supercargoInfo?ysData.supercargoInfo.split("|")[2]:null}}</view>
+						</view>
 				</view>
 			</u-popup>
 			<view class="previewImage-container">
@@ -89,6 +96,22 @@
 							:loading="ClickLoading"></u-button></view>
 				</view>
 			</u-popup>
+			<view class="logoutModel">
+				<u-modal :show="logoutShow"
+					:title="logoutTitle"
+					showCancelButton
+					:content="logoutContent"
+					@confirm="logoutConfirm"
+					@cancel="logoutCancel"></u-modal>
+			</view>
+			<view class="falseModel">
+				<u-modal :show="falseShow"
+					:title="logoutTitle"
+					showCancelButton
+					:content="logoutContent"
+					@confirm="falseConfirm"
+					@cancel="falseCancel"></u-modal>
+			</view>
 		</view>
 </template>
 
@@ -110,18 +133,77 @@
 				imgshow:false,
 				ClickLoading:false,
 				certificateImg:"",
-				previewImageSrc:""
+				logoutShow: false,
+				falseShow:false,
+				logoutTitle: '鎻愮ず',
+				logoutContent: '鏄惁妫�鏌ュ畬姣�',
+				previewImageSrc:"",
+				ysData:{}
 			}
 		},
 		onShow() {
 			this.init();
 		},
 		methods: {
-			imageClick(data) {
-				this.previewImageSrc = data;
-				this.$nextTick(() => {
-					this.previewImageShow = true;
-				});
+			falseConfirm(){
+				this.inspectData=[]
+				uni.showLoading({ title: '鍔犺浇涓�...' });
+				this.$reqPost('addCheckLog',{
+								carNo:this.form.carNo,
+								taskId:this.form.id,
+								taskcode:this.form.code,
+							}, 'json').then(res => {
+					if (res.code === 0) {
+						uni.$u.toast('妫�鏌ユ垚鍔�')
+						this.form={}
+						this.ClickLoading = false;
+						this.show = false;
+						this.TaskCoalList()
+						this.falseShow = false;
+					} else {
+						uni.$u.toast(res.msg ? res.msg : '妫�鏌ュけ璐�')
+						this.falseShow = false;
+					}
+				})
+			},
+			logoutConfirm() {
+				if(this.isAllSelected==true){
+					this.ClickLoading = true;
+					this.inspectData=this.inspectData.map(item=>{
+						return {
+							...item,
+							valve:"閫氳繃"
+						}
+					})
+					uni.showLoading({ title: '鍔犺浇涓�...' });
+					this.$reqPost('addCheckLog',{
+									carNo:this.form.carNo,
+									taskId:this.form.id,
+									taskcode:this.form.code,
+									inspectedResult:JSON.stringify(this.inspectData)
+								}, 'json').then(res => {
+						if (res.code === 0) {
+							uni.$u.toast('妫�鏌ユ垚鍔�')
+							this.form={}
+							this.ClickLoading = false;
+							this.inspectData=[]
+							this.show = false;
+							this.logoutShow = false;
+							this.TaskCoalList()
+						} else {
+							uni.$u.toast(res.msg ? res.msg : '妫�鏌ュけ璐�')
+							this.logoutShow = false;
+						}
+					})
+				}else{
+					uni.$u.toast('蹇呴』鍏ㄩ儴妫�娴�')
+				}
+			},
+			logoutCancel() {
+				this.logoutShow = false;
+			},
+			falseCancel() {
+				this.falseShow = false;
 			},
 			previewImageClose() {
 				this.previewImageShow = false;
@@ -136,6 +218,7 @@
 			lookRoad(item){
 				this.$reqGetId('getById', item.roadTransportId).then(res => {
 					this.certificateImg=res.data.certificateImg
+					this.ysData=res.data
 					this.imgshow=true
 				});
 			},
@@ -176,24 +259,8 @@
 				   	this.form=item
 				   	this.show = true;
 				   }else{
-				   	this.inspectData=[]
+					this.falseShow = true;
 				   	this.form=item
-				   	uni.showLoading({ title: '鍔犺浇涓�...' });
-				   	this.$reqPost('addCheckLog',{
-				   					carNo:this.form.carNo,
-				   					taskId:this.form.id,
-				   					taskcode:this.form.code,
-				   				}, 'json').then(res => {
-				   		if (res.code === 0) {
-				   			uni.$u.toast('妫�鏌ユ垚鍔�')
-				   			this.form={}
-				   			this.ClickLoading = false;
-				   			this.show = false;
-				   			this.TaskCoalList()
-				   		} else {
-				   			uni.$u.toast(res.msg ? res.msg : '妫�鏌ュけ璐�')
-				   		}
-				   	})
 				   }
 				}
 				
@@ -210,35 +277,7 @@
 				this.certificateImg=""
 			},
 			popClick() {
-					if(this.isAllSelected==true){
-						this.ClickLoading = true;
-						this.inspectData=this.inspectData.map(item=>{
-							return {
-								...item,
-								valve:"閫氳繃"
-							}
-						})
-						uni.showLoading({ title: '鍔犺浇涓�...' });
-						this.$reqPost('addCheckLog',{
-										carNo:this.form.carNo,
-										taskId:this.form.id,
-										taskcode:this.form.code,
-										inspectedResult:JSON.stringify(this.inspectData)
-									}, 'json').then(res => {
-							if (res.code === 0) {
-								uni.$u.toast('妫�鏌ユ垚鍔�')
-								this.form={}
-								this.ClickLoading = false;
-								this.inspectData=[]
-								this.show = false;
-								this.TaskCoalList()
-							} else {
-								uni.$u.toast(res.msg ? res.msg : '妫�鏌ュけ璐�')
-							}
-						})
-					}else{
-						uni.$u.toast('蹇呴』鍏ㄩ儴妫�娴�')
-					}
+				this.logoutShow = true;
 			},
 			open() {},
 			close() {
@@ -269,17 +308,14 @@
 				
 			},
 			change(res) {
-				console.log(res)
 			},
 			search(res) {
-				console.log(res)
 				this.TaskCoalList()
 			},
 			clear(res) {
 				this.carNo=""
 			},
 			custom(res) {
-				console.log(res)
 			}
 		}
 	};
@@ -294,8 +330,12 @@
 		}
 	}
 	.imgrPopup{
-		width: 500rpx;
-		height: 400rpx;
+		width: 700rpx;
+		background-color: #ffffff;
+		.driveruser{
+			display: flex;
+			justify-content: space-between
+		}
 	}
 	.receiverPopup {
 		height: vww(110);

--
Gitblit v1.9.1