From 984b4fea0cb45ad57bb2ecd85b06d2937e368dd0 Mon Sep 17 00:00:00 2001 From: yangan <yangan0921@163.com> Date: 星期三, 20 三月 2024 18:18:27 +0800 Subject: [PATCH] feat:超出平均皮重限制 --- pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock.vue | 58 ++++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 40 insertions(+), 18 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 e3521ea..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 @@ -10,10 +10,6 @@ <p>{{ nowTime }}</p> </view> </view> - <!-- <view class="punchTheClock_text"> - <u-icon name="map" color="#51e30d" size="30"></u-icon> - <text>鏈繘鍏ョ熆鍦哄尯鍩�</text> - </view> --> </view> </view> </template> @@ -21,10 +17,6 @@ <script> import { todayDate } from '@/utils/util.js'; export default { - onLoad(params) { - this.punchTheClockObj.tmcoa = params.tmId.toString(); - this.coalStatus = params.coalStatus; - }, data() { return { nowTime: '', @@ -33,10 +25,27 @@ tmcoa: null, latA: null, latB: null - } + }, + timeout: '2', //'1' 鏄秴鏃� '2' 鏄湭瓒呮椂 + entranceApplyParams: { + takeCoalId: '', + filedId: '', + deptId: '', + sendDate: '', + yyId: '' + }, + yuYueSection: '', //棰勭害鏃堕棿娈� }; }, - onLoad() { + onLoad(params) { + this.punchTheClockObj.tmcoa = params.tmId; + this.coalStatus = params.coalStatus; + this.entranceApplyParams.takeCoalId = params.orderPlanId + this.entranceApplyParams.filedId = params.filedId + this.entranceApplyParams.deptId = params.deptId + this.entranceApplyParams.yyId = params.yyId + this.entranceApplyParams.sendDate = params.sendDate + this.yuYueSection = params.yuYueSection this.getSetting(); //鑾峰彇鎺堟潈 this.getFuzzyLocation(); //鑾峰彇浣嶇疆 this.todayDate(); //褰撳墠鏃堕棿 @@ -85,14 +94,11 @@ this.$reqPost('arrive', this.punchTheClockObj, 'params').then(res => { console.log(res, '绛惧埌'); if (res.code == 0) { - this.$u.toast('绛惧埌鎴愬姛'); setTimeout(() => { - uni.navigateBack({ - delta: 1 - }, - 500 - ); - }); + 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 : '绛惧埌澶辫触'); } @@ -100,7 +106,22 @@ } else { 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}` + // }); + // } } }; </script> @@ -112,6 +133,7 @@ display: flex; justify-content: center; align-items: center; + flex-direction: column; .punchTheClock_container { .punchTheClock_btn { -- Gitblit v1.9.1