From 29611eb117777efebb245e85e448693a349167a8 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期五, 10 十一月 2023 11:17:38 +0800
Subject: [PATCH] 验质增加单位，回显示bug修复
---
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 f68f8af..917bad4 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
@@ -19,7 +19,7 @@
<view class="block-information">
<view class="block-main">
<view class="basic">
- <view class="coalName">{{ coalDetailsData.coalName||'' }}</view>
+ <view class="coalName"><text> {{ coalDetailsData.coalName||'' }}</text></view>
<view class="status-button"
:style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/statusbutton.png)`, backgroundSize: 'cover', backgroundRepeat: 'no-repeat' }">
{{ coalStatus[coalDetailsData.statusWeigh] || '' }}
@@ -59,7 +59,7 @@
</view>
<view class="utilsBox">
- <view class="utils_chil utils_chilTop">
+ <view class="utils_chil utils_chilTop" v-if="!isReservation">
<view class="top-button">
<u-button text="绛惧埌"
type="primary"
@@ -67,12 +67,12 @@
@click="arriveClick"
shape="circle"
:disabled="coalDetailsData.status >= 2"></u-button>
- <u-button text="鍏ュ満鐢宠"
+ <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,12 +90,14 @@
</view>
</view>
</view>
- <view class="weigh-ability">
- <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>
- <view class="weigh-button"><u-button text="涓婄璁￠噺"
+ shape="circle"></u-button></view> -->
+ <view class="weigh-button"><u-button
+ :disabled="!isapproach"
+ text="涓婄璁￠噺"
@click="cengZhongClick"
type="primary"
shape="circle"></u-button></view>
@@ -140,6 +142,7 @@
return {
orderPlanId: null,
yyId: null,
+ chengZhongFlag:true, // 涓婃绉伴噸鐘舵��
dayRZ: [],
coalDetailsData: {}, // 閫氱煡鍗曡鎯�
currentPageCoalStatus: 0, // 褰撳墠椤甸潰閫氱煡鍗曠姸鎬�
@@ -197,6 +200,7 @@
clean: ""
},
completeOutSaleShow: false,
+ reservationIsShow:false,
overTmWaixiao: null,
// 鍒よ缃戠粶鐘舵�侊紝
normalCode: true,
@@ -235,11 +239,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: {
@@ -308,6 +316,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;
@@ -444,7 +453,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('鏈湪纾呮埧锛岃鍓嶅線纾呮埧鍚庡啀璇曪紒锛�');
@@ -491,7 +501,19 @@
// 鏌ョ湅璐ㄩ噺鏄庣粏
jumpWeighDetail() {
uni.navigateTo({
- url: `/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail?orderPlanId=${this.orderPlanId}`
+ 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 => {
+ if (res.data) {
+ uni.hideLoading();
+ // this.orderPlanData = res.data
+ } else {
+ uni.hideLoading();
+ this.$u.toast('鎵撳嵃澶辫触')
+ }
})
}
}
@@ -611,12 +633,15 @@
.coalName,
.order-type {
- width: 45%;
- height: 30rpx;
+ width: 370rpx;
+ height: 55rpx;
font-size: 30rpx;
font-weight: 300;
color: #515151;
position: relative;
+ overflow: hidden; //婧㈠嚭闅愯棌
+ text-overflow: ellipsis; //瓒呭嚭閮ㄥ垎鐪佺暐鍙�
+ white-space: nowrap; //涓嶆崲琛�
}
.black-block {
--
Gitblit v1.9.1