From 6cb6a76d779335f8bc9f1e2a3431b2903558a075 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期三, 20 十二月 2023 09:50:28 +0800
Subject: [PATCH] 验质扣罚金额bugFix
---
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 53 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 39 insertions(+), 14 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 fa9a4ad..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"
@@ -58,21 +58,21 @@
<view class="white-block">
</view>
- <view class="utilsBox" v-if="currentPageCoalStatus">
- <view class="utils_chil utils_chilTop">
+ <view class="utilsBox">
+ <view class="utils_chil utils_chilTop" v-if="!isReservation">
<view class="top-button">
<u-button text="绛惧埌"
type="primary"
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="鏀剧┖"
@@ -90,11 +90,11 @@
</view>
</view>
</view>
- <view class="weigh-ability" v-if="currentPageCoalStatus">
- <view class="weigh-button"><u-button text="灞曠ず閫氱煡鍗�"
+ <view class="weigh-ability" v-if="!isReservation">
+ <!-- <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,
@@ -200,6 +201,7 @@
clean: ""
},
completeOutSaleShow: false,
+ reservationIsShow:false,
overTmWaixiao: null,
// 鍒よ缃戠粶鐘舵�侊紝
normalCode: true,
@@ -238,11 +240,15 @@
return this.coalDetailsData.hair !== 0 || this.coalDetailsData.skin !== 0;
},
isapproach() {
- return this.currentPageCoalStatus !== 3;
+ return this.currentPageCoalStatus < 3;
},
// 灞曠ず鐨瘺鍑�
showWeigh() {
return this.coalDetailsData.tmTaskCoalItems ? this.coalDetailsData.tmTaskCoalItems : []
+ },
+ //鍙告満棰嗗彇鐘舵�佹寜閽叏涓嶅睍绀�
+ isReservation(){
+ return this.reservationIsShow < 1;
}
},
methods: {
@@ -311,6 +317,7 @@
this.getServiceOpenid.filedId = this.coalDetailsData.filedId;
// 鑾峰彇閫氱煡鍗曠姸鎬�
this.currentPageCoalStatus = this.coalDetailsData.statusWeigh;
+ this.reservationIsShow = this.coalDetailsData.status;
// 鑾峰彇鍘熷彂淇℃伅
this.primarySkin = this.coalDetailsData.skinTwo;
this.primaryHair = this.coalDetailsData.hairTwo;
@@ -375,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}`
});
},
// 鍏ュ満鐢宠
@@ -447,7 +454,8 @@
res.data.id
}&gateCameraId=${res.data.lastEquipmentId}&gateCameraCode=${res.data.lastEquipmentCode}&weighHouseCode=${res.data.code}&primarySkin=${
this.primarySkin
- }&primaryHair=${this.primaryHair}&psrimaryClean=${this.primaryClean}&sceneInOut=${res.data.sceneInOut}&overTmWaixiao=${this.overTmWaixiao}`
+ }&primaryHair=${this.primaryHair}&psrimaryClean=${this.primaryClean}&sceneInOut=${res.data.sceneInOut}&overTmWaixiao=${this.overTmWaixiao}
+ &isWeighing=${this.coalDetailsData.weighingType}`
});
} else {
this.$u.toast('鏈湪纾呮埧锛岃鍓嶅線纾呮埧鍚庡啀璇曪紒锛�');
@@ -496,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('鎵撳嵃澶辫触')
+ })
}
}
};
@@ -503,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