From 0978691dc9047c7090dca64406f5d0ac027e8df4 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 30 十月 2023 17:59:31 +0800
Subject: [PATCH] 自主配送功能优化 部分功能增删 提煤单详情页面修改
---
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 50 +++++++++++++++++++++++++++++++-------------------
1 files changed, 31 insertions(+), 19 deletions(-)
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
index c823ae7..1204596 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
@@ -169,12 +169,17 @@
@click="arriveClick"
shape="circle"
:disabled="coalDetailsData.status >= 2"></u-button>
- <u-button text="鍏ュ満鐢宠"
+ <!-- <u-button text="鍏ュ満鐢宠"
type="primary"
plain
@click="rcsqClick"
shape="circle"
- :disabled="correctStatus>= 3"></u-button>
+ :disabled="correctStatus>= 3"></u-button> -->
+ <u-button text="鍛煎彨瀹㈡湇"
+ type="primary"
+ plain
+ @click="callCustomerService"
+ shape="circle"></u-button>
</view>
<view class="bottom-button">
<!-- <u-button text="鏀剧┖"
@@ -184,11 +189,7 @@
throttleTime="500"
shape="circle"
:disabled="isEvacuation || isapproach"></u-button> -->
- <u-button text="鍛煎彨瀹㈡湇"
- type="primary"
- plain
- @click="callCustomerService"
- shape="circle"></u-button>
+
</view>
</view>
</view>
@@ -298,6 +299,9 @@
}
},
onHide() {
+ clearInterval(this.interval);
+ },
+ onUnload() {
clearInterval(this.interval);
},
onReady() {
@@ -582,7 +586,7 @@
.coalDetailsData
.yuYueSection.slice(-5);
if (dayjs(this.currentTime).isAfter(endTime) && this.coalDetailsData.status <= 1) {
- this.$u.toast('宸茶秴鍑洪绾︽椂闂�,鍙偣鍑诲叆鍦虹敵璇烽噸鏂板叆鍦�')
+ // this.$u.toast('宸茶秴鍑洪绾︽椂闂�,鍙偣鍑诲叆鍦虹敵璇烽噸鏂板叆鍦�')
this.timeout = '1'
}
}, 1000)
@@ -619,18 +623,20 @@
arriveClick() {
uni.navigateTo({
url: `/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock?orderPlanId=${this.orderPlanId}&coalStatus=${
- this.currentPageCoalStatus
- }&tmId=${this.getWeightHouseObj.tmId}`
+ this.correctStatus
+ }&tmId=${this.getWeightHouseObj.tmId}&timeout=${this.timeout}&yyId=${this.yyId}&filedId=${this.getYuYueDataParams.filedId}&deptId=${
+ this.getYuYueDataParams.deptId
+ }&sendDate=${this.getYuYueDataParams.sendDate}&yuYueSection=${this.coalDetailsData.yuYueSection}`
});
},
// 鍏ュ満鐢宠
- rcsqClick() {
- uni.navigateTo({
- url: `/pages/driver-page/appointment/appointment?type=鍏ュ満鐢宠&takeCoalId=${this.orderPlanId}&yyId=${this.yyId}&filedId=${this.getYuYueDataParams.filedId}&deptId=${
- this.getYuYueDataParams.deptId
- }&sendDate=${this.getYuYueDataParams.sendDate}`
- });
- },
+ // rcsqClick() {
+ // uni.navigateTo({
+ // url: `/pages/driver-page/appointment/appointment?type=鍏ュ満鐢宠&takeCoalId=${this.orderPlanId}&yyId=${this.yyId}&filedId=${this.getYuYueDataParams.filedId}&deptId=${
+ // this.getYuYueDataParams.deptId
+ // }&sendDate=${this.getYuYueDataParams.sendDate}`
+ // });
+ // },
callCustomerService() {
this.servieceShow = true
},
@@ -794,7 +800,8 @@
tmId: this.getWeightHouseObj.tmId,
carNo: uni.getStorageSync('carNo'),
type: 2,
- weighingNumber: 1
+ weighingNumber: 1,
+ printing: uni.getStorageSync('selectedPrintStyle')
}
let form1 = uni.getStorageSync('WeighHouseForm') ? uni.getStorageSync('WeighHouseForm') : '{}'
this.$reqPost('printer', Object.assign(form, JSON.parse(form1)),
@@ -824,7 +831,8 @@
tmId: this.getWeightHouseObj.tmId,
carNo: uni.getStorageSync('carNo'),
type: 3,
- weighingNumber: 2
+ weighingNumber: 2,
+ printing: uni.getStorageSync('selectedPrintStyle')
}
let form1 = uni.getStorageSync('WeighHouseForm') ? uni.getStorageSync('WeighHouseForm') : '{}'
this.outLoading = true
@@ -1048,6 +1056,10 @@
position: absolute;
right: vww(10);
color: #fff;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ -o-text-overflow: ellipsis;
+ overflow: hidden;
}
.basic {
--
Gitblit v1.9.1