From 545c2584be24a1bf8083657c7e4c97b09a08280a Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 27 六月 2024 17:50:03 +0800
Subject: [PATCH] feat:库管增加 是否空车出厂选项 & 库管首页修改显示文字

---
 pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock.vue |   68 +++++++++------------------------
 1 files changed, 19 insertions(+), 49 deletions(-)

diff --git a/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock.vue b/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock.vue
index 63eae0f..36693d6 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock.vue
@@ -11,12 +11,6 @@
 				</view>
 			</view>
 		</view>
-		<view class="entrance-apply">
-			<view class="entrance-apply_block">
-				<u-button text="鏇存崲棰勭害鏃堕棿"
-					@click="entranceApply"></u-button>
-			</view>
-		</view>
 	</view>
 </template>
 
@@ -46,12 +40,11 @@
 		onLoad(params) {
 			this.punchTheClockObj.tmcoa = params.tmId;
 			this.coalStatus = params.coalStatus;
-			this.timeout = params.timeout
 			this.entranceApplyParams.takeCoalId = params.orderPlanId
 			this.entranceApplyParams.filedId = params.filedId
 			this.entranceApplyParams.deptId = params.deptId
-			this.entranceApplyParams.sendDate = params.sendDate
 			this.entranceApplyParams.yyId = params.yyId
+			this.entranceApplyParams.sendDate = params.sendDate
 			this.yuYueSection = params.yuYueSection
 			this.getSetting(); //鑾峰彇鎺堟潈
 			this.getFuzzyLocation(); //鑾峰彇浣嶇疆
@@ -101,11 +94,10 @@
 					this.$reqPost('arrive', this.punchTheClockObj, 'params').then(res => {
 						console.log(res, '绛惧埌');
 						if (res.code == 0) {
-							this.$u.toast('绛惧埌鎴愬姛');
 							setTimeout(() => {
-								uni.navigateBack({
-									delta: 1
-								});
+								uni.redirectTo({
+									url: `/pages/driver-page/appointment/appointment?type=鍏ュ満鐢宠&yyId=${this.entranceApplyParams.yyId}&yuYueSection=${this.yuYueSection}&takeCoalId=${this.entranceApplyParams.takeCoalId}&deptId=${this.entranceApplyParams.deptId}&filedId=${this.entranceApplyParams.filedId}&sendDate=${this.entranceApplyParams.sendDate}`
+								})
 							}, 1000);
 						} else {
 							this.$u.toast(res.msg ? res.msg : '绛惧埌澶辫触');
@@ -115,21 +107,21 @@
 					this.$u.toast('鏆傝幏鍙栦笉鍒板埌褰撳墠浣嶇疆');
 				}
 			},
-			entranceApply() {
-				if (this.coalStatus !== 2) {
-					this.$u.toast('璇峰厛绛惧埌')
-					return
-				}
-				if (this.timeout === '2') {
-					this.$u.toast('鏈秴鍑洪绾︽椂闂�,鏃犻渶鏇存崲');
-					return
-				}
-				uni.navigateTo({
-					url: `/pages/driver-page/appointment/appointment?type=鍏ュ満鐢宠&takeCoalId=${this.entranceApplyParams.takeCoalId}&yyId=${this.entranceApplyParams.yyId}&filedId=${this.entranceApplyParams.filedId}&deptId=${
-						this.entranceApplyParams.deptId
-					}&sendDate=${this.entranceApplyParams.sendDate}&yuYueSection=${this.yuYueSection}`
-				});
-			}
+			// entranceApply() {
+			// 	if (this.coalStatus !== 2) {
+			// 		this.$u.toast('璇峰厛绛惧埌')
+			// 		return
+			// 	}
+			// 	if (this.timeout === '2') {
+			// 		this.$u.toast('鏈秴鍑洪绾︽椂闂�,鏃犻渶鏇存崲');
+			// 		return
+			// 	}
+			// 	uni.navigateTo({
+			// 		url: `/pages/driver-page/appointment/appointment?type=鍏ュ満鐢宠&takeCoalId=${this.entranceApplyParams.takeCoalId}&yyId=${this.entranceApplyParams.yyId}&filedId=${this.entranceApplyParams.filedId}&deptId=${
+			// 			this.entranceApplyParams.deptId
+			// 		}&sendDate=${this.entranceApplyParams.sendDate}&yuYueSection=${this.yuYueSection}`
+			// 	});
+			// }
 		}
 	};
 </script>
@@ -168,28 +160,6 @@
 
 				.text {
 					margin-left: vww(5);
-				}
-			}
-		}
-
-		.entrance-apply {
-			width: 100%;
-			display: flex;
-			justify-content: center;
-			position: fixed;
-			bottom: vww(50);
-
-			&_block {
-				width: 50%;
-
-				/deep/.u-button {
-					font-size: 28rpx;
-					font-weight: 300;
-					color: #ffffff !important;
-					background: #497bfb !important;
-					letter-spacing: 4rpx;
-					border-radius: 37rpx 37rpx 37rpx 37rpx !important;
-					box-shadow: 2rpx 3rpx 13rpx 0rpx rgba(43, 98, 239, 0.5), 0rpx 0rpx 9rpx 0rpx rgba(247, 250, 253, 0.29);
 				}
 			}
 		}

--
Gitblit v1.9.1