From c7372dc7f495bdefb7f5e78d1c02756d637377b3 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 20 六月 2024 17:13:06 +0800
Subject: [PATCH] feat：司机去掉查看验质出场时间
---
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 66 +++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 12 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 bc323b4..1728db5 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>
+ :disabled="coalDetailsData.status > 2"></u-button>
<u-button text="鎵撳嵃纾呭崟"
type="primary"
plain
@click="printOrder"
shape="circle"
- :disabled="currentPageCoalStatus !== 4"></u-button>
+ :disabled="(currentPageCoalStatus < 3) || !printNum"></u-button>
</view>
<view class="bottom-button">
<u-button text="鏀剧┖"
@@ -118,6 +118,13 @@
@confirm="completeOutSaleConfirm"
@cancel="completeOutSaleCancel"></u-modal>
</view>
+ <u-action-sheet
+ :actions="list"
+ :show="show"
+ :closeOnClickOverlay="true"
+ :closeOnClickAction="true"
+ @select="selectClick"
+ @close="sheetClose" ></u-action-sheet>
</view>
</template>
@@ -131,6 +138,7 @@
weighItem
},
onLoad(value) {
+ console.log(value,'valyue')
this.orderPlanId = value.orderPlanId;
this.yyId = value.yyId;
if (value.overTmWaixiao) {
@@ -142,8 +150,20 @@
return {
orderPlanId: null,
yyId: null,
+ show:false,
chengZhongFlag:true, // 涓婃绉伴噸鐘舵��
dayRZ: [],
+ list: [
+ {
+ name:'閫夐」涓�',
+ },
+ {
+ name: '閫夐」浜岀鐢�',
+ },
+ {
+ name: '寮�鍚痩oad鍔犺浇', //寮�鍚悗鏂囧瓧涓嶆樉绀�
+ }
+ ],
coalDetailsData: {}, // 閫氱煡鍗曡鎯�
currentPageCoalStatus: 0, // 褰撳墠椤甸潰閫氱煡鍗曠姸鎬�
// 鑾峰彇鎵�鍦ㄧ鎴垮弬鏁�
@@ -170,7 +190,7 @@
openId: null,
openName: ''
},
- coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚', '楠岃川瀹屾垚'], // 鐘舵��
+ coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚', '澶勭悊瀹屾垚'], // 鐘舵��
weighHouseCode: '',
// 鏀剧┖寮圭獥鎺у埗鍙橀噺
evacuationModalShow: false,
@@ -239,7 +259,7 @@
return this.coalDetailsData.hair !== 0 || this.coalDetailsData.skin !== 0;
},
isapproach() {
- return this.currentPageCoalStatus !== 3;
+ return this.currentPageCoalStatus < 3;
},
// 灞曠ず鐨瘺鍑�
showWeigh() {
@@ -248,6 +268,10 @@
//鍙告満棰嗗彇鐘舵�佹寜閽叏涓嶅睍绀�
isReservation(){
return this.reservationIsShow < 1;
+ },
+ //鍒ゆ柇鎵撳嵃鍗曟鏁�
+ printNum(){
+ return this.coalDetailsData.printTimes2 <= this.coalDetailsData.tmTaskCoalItems.length
}
},
methods: {
@@ -321,6 +345,10 @@
this.primarySkin = this.coalDetailsData.skinTwo;
this.primaryHair = this.coalDetailsData.hairTwo;
this.primaryClean = this.coalDetailsData.cleanTwo;
+ //鍒濆鍖栫鍗曟暟鎹�
+ this.list = this.coalDetailsData.tmTaskCoalItems.map(item=>{
+ return {name:item.breed + '/' + item.spec,id:item.id}
+ })
} else {
this.$u.toast('鍔犺浇澶辫触');
}
@@ -381,7 +409,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}`
});
},
// 鍏ュ満鐢宠
@@ -506,15 +534,26 @@
},
//鎵撳嵃纾呭崟
printOrder(){
- this.$reqGet('printerHandler',{tmId:this.orderPlanId}).then(res => {
+ this.show = true;
+ },
+ selectClick(obj){
+ this.$reqGet('printerHandler',{tmItemId:obj.id}).then(res => {
+ uni.hideLoading();
+ this.$u.toast(res.msg)
if (res.data) {
- uni.hideLoading();
+ // this.$u.toast('鎵撳嵃鎴愬姛')
// this.orderPlanData = res.data
- } else {
- uni.hideLoading();
- this.$u.toast('鍔犺浇澶辫触')
- }
+ }
+ }).catch((err) => {
+ uni.hideLoading();
+ this.$u.toast('鎵撳嵃澶辫触')
+ }).finally(() => {
+ this.show = false;
})
+
+ },
+ sheetClose(){
+ this.show = false;
}
}
};
@@ -522,6 +561,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