From 09154bf4f7bc61e7cdfaf2f9f6cecea6d5759ba2 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期五, 15 十二月 2023 11:54:29 +0800
Subject: [PATCH] 验质提交传参错误修改
---
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 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 c8642d3..d5edfc3 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
@@ -44,7 +44,7 @@
</view>
<!-- 绉伴噸鍘嗗彶-->
- <weigh-item :list="showWeigh"></weigh-item>
+ <weigh-item :list="showWeigh" class="weighing-item"></weigh-item>
<!-- 鏃堕棿绾� -->
<view class="timeLine">
<u-steps :current="dayRZ.length - 1"
@@ -66,13 +66,13 @@
plain
@click="arriveClick"
shape="circle"
- :disabled="coalDetailsData.status >= 2"></u-button>
- <u-button text="鍏ュ満鐢宠"
+ :disabled="coalDetailsData.status > 2"></u-button>
+ <u-button text="鎵撳嵃纾呭崟"
type="primary"
plain
- @click="rcsqClick"
+ @click="printOrder"
shape="circle"
- :disabled="coalDetailsData.status >= 3"></u-button>
+ :disabled="currentPageCoalStatus !== 4"></u-button>
</view>
<view class="bottom-button">
<u-button text="鏀剧┖"
@@ -91,10 +91,10 @@
</view>
</view>
<view class="weigh-ability" v-if="!isReservation">
- <view class="weigh-button"><u-button text="灞曠ず閫氱煡鍗�"
+ <!-- <view class="weigh-button"><u-button text="灞曠ず閫氱煡鍗�"
@click="showCaolPickUpBill"
type="primary"
- shape="circle"></u-button></view>
+ shape="circle"></u-button></view> -->
<view class="weigh-button"><u-button
:disabled="!isapproach"
text="涓婄璁￠噺"
@@ -131,6 +131,7 @@
weighItem
},
onLoad(value) {
+ console.log(value,'valyue')
this.orderPlanId = value.orderPlanId;
this.yyId = value.yyId;
if (value.overTmWaixiao) {
@@ -170,7 +171,7 @@
openId: null,
openName: ''
},
- coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚', '楠岃川瀹屾垚'], // 鐘舵��
+ coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚', '澶勭悊瀹屾垚'], // 鐘舵��
weighHouseCode: '',
// 鏀剧┖寮圭獥鎺у埗鍙橀噺
evacuationModalShow: false,
@@ -239,7 +240,7 @@
return this.coalDetailsData.hair !== 0 || this.coalDetailsData.skin !== 0;
},
isapproach() {
- return this.currentPageCoalStatus !== 3;
+ return this.currentPageCoalStatus < 3;
},
// 灞曠ず鐨瘺鍑�
showWeigh() {
@@ -381,7 +382,7 @@
uni.navigateTo({
url: `/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock?orderPlanId=${this.orderPlanId}&coalStatus=${
this.currentPageCoalStatus
- }&tmId=${this.getWeightHouseObj.tmId}`
+ }&tmId=${this.getWeightHouseObj.tmId}&yyId=${this.yyId}`
});
},
// 鍏ュ満鐢宠
@@ -503,6 +504,20 @@
uni.navigateTo({
url: `/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail?orderPlanId=${this.orderPlanId}&flag=${true}`
})
+ },
+ //鎵撳嵃纾呭崟
+ printOrder(){
+ this.$reqGet('printerHandler',{tmId:this.orderPlanId}).then(res => {
+ uni.hideLoading();
+ this.$u.toast(res.msg)
+ if (res.data) {
+ // this.$u.toast('鎵撳嵃鎴愬姛')
+ // this.orderPlanData = res.data
+ }
+ }).catch((err) => {
+ uni.hideLoading();
+ this.$u.toast('鎵撳嵃澶辫触')
+ })
}
}
};
@@ -510,6 +525,9 @@
<style lang="scss"
scoped>
+ .weighing-item{
+ min-height: 200rpx!important;
+ }
/deep/.u-steps {
.u-steps-item {
.u-steps-item__content {
--
Gitblit v1.9.1