From f1950b48fec6421b50580f2a8899b360b314b73c Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 10 四月 2025 15:29:33 +0800
Subject: [PATCH] feat：增加车牌号，和规格Bug修改
---
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 269 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 199 insertions(+), 70 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 279eeae..222c7bb 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
@@ -29,9 +29,10 @@
<view class="time-icon"><u-icon name="clock"
color="#515151"
size="40"></u-icon></view>
- <view class="send-date">{{ coalDetailsData.sendDate }}</view>
+ <view class="send-date" >{{ coalDetailsData.sendDate }}</view>
</view>
<view class="coal-code">閫氱煡鍗曠紪鍙�: {{ coalDetailsData.code || '' }}</view>
+ <view class="coal-code">杞︾墝鍙�: {{ coalDetailsData.carNo || '' }}</view>
<view class="order-code">
璁㈠崟缂栧彿: {{ coalDetailsData.orderCode || '' }}</view>
<view class="coal-code"
@@ -72,46 +73,67 @@
plain
@click="printOrder"
shape="circle"
- :disabled="(currentPageCoalStatus < 3) || !printNum"></u-button>
+ :disabled="(currentPageCoalStatus != 3) || !printNum"></u-button>
+ <u-button text="鍛煎彨瀹㈡湇"
+ type="primary"
+ plain
+ @click="callCustomerService"
+ shape="circle"></u-button>
</view>
- <view class="bottom-button">
- <u-button text="鏀剧┖"
- type="primary"
- plain
- @click="evacuation"
- throttleTime="500"
- shape="circle"
- :disabled="isEvacuation || isapproach"></u-button>
- <u-button text="鍛煎彨瀹㈡湇"
- type="primary"
- plain
- @click="callCustomerService"
- shape="circle"></u-button>
- </view>
+<!-- <view class="bottom-button">-->
+<!-- <u-button text="鏀剧┖"-->
+<!-- type="primary"-->
+<!-- plain-->
+<!-- @click="evacuation"-->
+<!-- throttleTime="500"-->
+<!-- shape="circle"-->
+<!-- :disabled="!isFangKong"></u-button>-->
+<!-- </view>-->
</view>
</view>
- <view class="weigh-ability" v-if="!isReservation && noCarNo != 1">
-<!-- <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
- :disabled="!isapproach"
- text="涓婄璁￠噺"
- @click="cengZhongClick"
- type="primary"
- shape="circle"></u-button></view>
- </view>
- <view class="weigh-ability" v-if="noCarNo == 1">
- <view class="weigh-button"><u-button
- :disabled="!isapproach"
- text="鐢宠璁￠噺"
- @click="shenqingjiliangClick"
- type="primary"
- shape="circle"></u-button></view>
+ <view class="btns-box-main">
+ <view class="weigh-ability" v-if="!isReservation && noCarNo != 1">
+ <!-- <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
+ :disabled="!isapproach"
+ text="涓婄璁￠噺"
+ @click="cengZhongClick"
+ type="primary"
+ shape="circle"></u-button></view>
+ </view>
+<!-- <view class="weigh-ability">-->
+<!-- <view class="weigh-button"><u-button-->
+<!-- :disabled="!isapproach"-->
+<!-- text="鐢宠澶嶇"-->
+<!-- @click="shenqingFubangClick"-->
+<!-- type="primary"-->
+<!-- shape="circle"></u-button></view>-->
+<!-- </view>-->
+ <view class="weigh-ability" v-if="noCarNo == 1">
+ <view class="weigh-button"><u-button
+ :disabled="!isapproach"
+ text="鐢宠璁￠噺"
+ @click="shenqingjiliangClick"
+ type="primary"
+ shape="circle"></u-button></view>
+
+ </view>
+ <view class="weigh-ability" v-if="isShenqingFubangShow">
+ <view class="weigh-button"><u-button
+ :loading="shenQingFuBangLoading"
+ text="鐢宠澶嶇"
+ @click="shenqingFubangClick"
+ type="primary"
+ shape="circle"></u-button></view>
+
+ </view>
</view>
+
<view class="evacuationModal">
<u-modal :show="evacuationModalShow"
:title="evacuationTitle"
@@ -134,9 +156,12 @@
:closeOnClickOverlay="true"
:closeOnClickAction="true"
@select="selectClick"
- @close="sheetClose" ></u-action-sheet>
+ @close="sheetClose" >
+ </u-action-sheet>
<view class="serviece-customer">
- <u-action-sheet :actions="hujiaolist"
+ <u-action-sheet
+ v-if="serviceInfoObj.serviecePhone"
+ :actions="hujiaolist"
@select="selectClickhujiao"
@close='serviceClose'
title="鍛煎彨鏂瑰紡"
@@ -158,7 +183,7 @@
<script>
import { onlineurl } from '@/api/request.js'
import { webSocketUrl } from '@/api/request.js';
- import { mapState, mapMutations } from 'vuex';
+ import { mapState, mapMutations,mapGetters } from 'vuex';
import weighItem from '@/components/weighItem.vue'
export default {
components: {
@@ -178,7 +203,7 @@
orderPlanId: null,
yyId: null,
show:false,
- hujiaolist: [{ name: '鎵嬫満鍙�', subname: '1213456', id: 1 }, { name: '寰俊璇煶', id: 2 }], //鍛煎彨瀹㈡湇閫夐」
+ hujiaolist: [{ name: '鎵嬫満鍙�', subname: '', id: 1 }], //鍛煎彨瀹㈡湇閫夐」 { name: '寰俊璇煶', id: 2 }
servieceShow:false,
chengZhongFlag:true, // 涓婃绉伴噸鐘舵��
dayRZ: [],
@@ -220,7 +245,7 @@
openName: '',
serviecePhone: ''
},
- coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚', '澶勭悊瀹屾垚'], // 鐘舵��
+ coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚', '璐ㄦ瀹屾垚'], // 鐘舵�乕0,1,3,4]
weighHouseCode: '',
// 鏀剧┖寮圭獥鎺у埗鍙橀噺
evacuationModalShow: false,
@@ -258,6 +283,8 @@
bangfangListShow: false,
bangfangList: [],
noCarNo:0, //鏄惁鏈夎溅鐗屽彿(鏈夎溅鐗�0锛屾棤杞︾墝1)
+ shenQingFuBangLoading: false, //鐢宠澶嶇loading
+ orderCode:''
};
},
onShow() {
@@ -270,7 +297,8 @@
clearInterval(this.interval);
},
computed: {
- ...mapState(['globalweigh', 'globalinfraredStatus']),
+ ...mapState(['globalinfraredStatus']),
+ ...mapGetters(['globalweigh']),
name() {
return uni.getStorageSync('name');
},
@@ -290,9 +318,30 @@
//
isEvacuation() {
return this.coalDetailsData.hair !== 0 || this.coalDetailsData.skin !== 0;
- },
+ },
+ isFangKong() {
+ if(this.coalDetailsData.hair !== 0 || this.coalDetailsData.skin !== 0) {
+ console.log(Math.abs(Number(this.coalDetailsData.hair) - Number(this.globalweigh)).toFixed(1),'hair')
+ console.log(Math.abs(Number(this.coalDetailsData.skin) - Number(this.globalweigh)).toFixed(1),'skin')
+ console.log(Number(this.globalweigh),'globalweigh')
+ console.log(Math.abs(Number(this.coalDetailsData.hair) - Number(this.globalweigh)) <= 0.1,'1111111111111')
+ console.log(Math.abs(Number(this.coalDetailsData.skin) - Number(this.globalweigh)) <= 0.1,'222222222222222')
+ if(Math.abs(Number(this.coalDetailsData.hair) - Number(this.globalweigh)).toFixed(2) <= 0.1 || Math.abs(Number(this.coalDetailsData.skin) - Number(this.globalweigh)).toFixed(2) <= 0.1) {
+ return true
+ }else {
+ return false
+ }
+ // if((this.coalDetailsData.hair == this.globalweigh) || (this.coalDetailsData.skin == this.globalweigh)) {
+ // return true
+ // }else {
+ // return false
+ // }
+ }else {
+ return false
+ }
+ },
isapproach() {
- return this.currentPageCoalStatus < 3;
+ return this.currentPageCoalStatus != 3 || this.coalDetailsData.isSendErp ==1;
},
// 灞曠ず鐨瘺鍑�
showWeigh() {
@@ -305,7 +354,19 @@
//鍒ゆ柇鎵撳嵃鍗曟鏁�
printNum(){
return this.coalDetailsData.printTimes2 <= this.coalDetailsData.tmTaskCoalItems?.length
- }
+ },
+ roleType() {
+ console.log(uni.getStorageSync('userInfo').type,'roleType')
+ return uni.getStorageSync('userInfo').type;
+ },
+ isShenqingFubangShow() { //鐢宠澶嶇鎸夐挳鏄惁鏄剧ず
+ //鏉′欢锛� 涓嶆槸 绉伴噸瀹屾垚+涓嶆槸 鏈О閲�+鍙告満 銆愭湭绉伴噸0锛岀О閲嶄腑1锛岄獙璐ㄤ腑2锛岀О閲嶅畬鎴�3,楠岃川瀹屾垚4銆� noCarNo 鏄惁鏈夎溅鐗屽彿(鏈夎溅鐗�0锛屾棤杞︾墝1)
+ if((this.currentPageCoalStatus != 0) && this.roleType == 3) {
+ return true
+ }else {
+ return false
+ }
+ }
},
methods: {
init() {
@@ -326,7 +387,6 @@
});
this.coalDayPage(); //鑾峰彇鏃ュ織
this.getTakeCoal(); //鑾峰彇閫氱煡鍗曡鎯�
- // this.getgetService(); //鑾峰彇瀹㈡湇
},
// 鑾峰彇瀹㈡湇openid
getgetService() {
@@ -354,6 +414,8 @@
if (res.code == 0) {
console.log(res, '閫氱煡鍗曡鎯�');
this.coalDetailsData = res.data;
+ console.log('coalDetailsData',this.coalDetailsData)
+ this.orderCode = res.data.orderCode
this.orderType = this.coalDetailsData.orderType;
this.noCarNo = res.data.noCarNo
// 鍒ゆ柇鏄惁瀹屾垚澶栭攢璁㈠崟
@@ -375,7 +437,7 @@
this.getServiceOpenid.deptId = this.coalDetailsData.deptId;
this.getServiceOpenid.filedId = this.coalDetailsData.filedId;
// 鑾峰彇閫氱煡鍗曠姸鎬�
- this.currentPageCoalStatus = this.coalDetailsData.statusWeigh;
+ this.currentPageCoalStatus = this.coalDetailsData.statusWeigh; //銆愭湭绉伴噸0锛岀О閲嶄腑1锛岄獙璐ㄤ腑2锛岀О閲嶅畬鎴�3,楠岃川瀹屾垚4銆�
this.reservationIsShow = this.coalDetailsData.status;
// 鑾峰彇鍘熷彂淇℃伅
this.primarySkin = this.coalDetailsData.skinTwo;
@@ -384,7 +446,7 @@
//鍒濆鍖栫鍗曟暟鎹�
this.list = this.coalDetailsData.tmTaskCoalItems.map(item=>{
- return {name:item.breed + '/' + item.spec,id:item.id}
+ return {name:item.breed + '/' + item.spec,id:item.id,tmId:item.tmId}
})
this.getPoundRoomByList()
} else {
@@ -406,6 +468,7 @@
})
}
}
+ this.getgetService(); //鑾峰彇瀹㈡湇
})
},
// 鏃ュ織鏌ヨ
@@ -571,6 +634,7 @@
this.weighData.equipmentCode = res.data.lastEquipmentCode;
this.weighData.sceneInOut = res.data.sceneInOut;
this.weighHouseCode = res.data.code;
+
uni.navigateTo({
url: `/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice?takeCoalId=${this.orderPlanId}&sceneId=${
res.data.id
@@ -614,7 +678,28 @@
}
})
},
-
+ shenqingFubangClick() { //鐢宠澶嶇
+ let params = {
+ deptId:this.coalDetailsData.deptId,
+ filedId:this.coalDetailsData.filedId,
+ tmId:this.coalDetailsData.id
+ }
+ this.shenQingFuBangLoading = true
+ this.$reqPost('applyForRepeatedCarNew',params,'json').then(res => {
+ console.log(res,'鐢宠澶嶇-----')
+ if(res.code == 0) {
+ this.$u.toast(res.msg);
+ this.shenQingFuBangLoading = false
+ }else {
+ this.$u.toast(res.msg);
+ this.shenQingFuBangLoading = false
+ }
+ }).catch(() => {
+ this.shenQingFuBangLoading = false
+ }).finally(() => {
+ this.shenQingFuBangLoading = false
+ })
+ },
// 鏀剧┖
evacuation() {
this.evacuationModalShow = true;
@@ -663,30 +748,77 @@
this.show = true;
},
selectClick(obj){
- this.$reqGet('printerHandler',{tmItemId:obj.id}).then(res => {
- uni.hideLoading();
- this.$u.toast(res.msg)
- if (res.data) {
+ console.log(obj,'tmiod')
+ this.startProlling(obj.id,obj.tmId);
+
+ },
+ //鎵撳嵃浠诲姟
+ printPolling(id){
+ return new Promise((resolve, reject) => {
+ this.$reqGet('printerHandler',{tmItemId:id}).then(res => {
+ uni.hideLoading();
+ this.$u.toast(res.msg ? res.msg : '鍘绘墦鍗�')
+ if (res.data) {
// this.$u.toast('鎵撳嵃鎴愬姛')
// this.orderPlanData = res.data
+ resolve(true)
}
}).catch((err) => {
uni.hideLoading();
- this.$u.toast('鎵撳嵃澶辫触')
+ reject(false)
+ this.$u.toast('鎵撳嵃澶辫触')
}).finally(() => {
this.show = false;
})
+ })
+ },
+ //鎺ㄩ�乪rp
+ pushErp(id,tmId)
+ {
+ return new Promise((resolve, reject) => {
+ this.$reqPost('reSendErp',{tmId:tmId},'json').then(res => {
+ uni.hideLoading();
+ if (res.data) {
+ resolve(true)
+ }
+ }).catch((err) => {
+ uni.hideLoading();
+ reject(false)
+ this.$u.toast('鎺ㄩ�佸け璐�')
+ })
+ })
+ },
+ //鎵ц鎵撳嵃浠诲姟
+ startProlling(id,tmId){
+ Promise.all([this.pushErp(id,tmId), this.printPolling(id)]).then(res => {
+ console.log('鎵�鏈夊紓姝ヨ姹傚潎宸叉垚鍔熷姞杞藉畬姣�',res)
+ this.$u.toast('鎺ㄩ�佹垚鍔�');
+ }).catch(err => {
+ console.log(err)
+ })
+
},
sheetClose(){
this.show = false;
- }
+ },
+ onPullDownRefresh() { //涓嬫媺鍒锋柊
+ setTimeout(() => {
+ this.getTakeCoal(() => { //鑾峰彇閫氱煡鍗曡鎯�
+ uni.stopPullDownRefresh()
+ })
+ },1000)
+ }
}
};
</script>
<style lang="scss"
scoped>
+ .send-date{
+ font-size: 12px;
+ color: #eee;
+ }
.weighing-item{
min-height: 200rpx!important;
}
@@ -759,8 +891,8 @@
.block-information {
width: 690rpx;
height: 100%;
- min-height: 420rpx;
- margin: vww(40) auto;
+ min-height: 400rpx;
+ margin: vww(40) auto 0rpx;
background: #ffffff;
box-shadow: 4rpx 6rpx 51rpx 0rpx rgba(73, 120, 240, 0.11);
border-radius: 20rpx;
@@ -777,8 +909,8 @@
gap: auto 5rpx;
width: 94%;
height: 100%;
- min-height: 380rpx;
- margin: vww(18) vww(7) vww(11) vww(17);
+ min-height: 360rpx;
+ margin: vww(18) vww(7) vww(8) vww(17);
}
.status-button {
@@ -822,7 +954,7 @@
}
.time {
- width: 35%;
+ width: 100%;
height: vww(12);
display: flex;
justify-content: flex-start;
@@ -851,12 +983,7 @@
// 绉伴噸鍘嗗彶
.weigh-history {
- @extend .block-information;
-
.block-main {
- @extend .block-main;
- gap: 10rpx 20rpx;
-
.weigh-item {
width: 100%;
height: vww(80);
@@ -901,7 +1028,6 @@
.timeLine {
height: 300rpx;
min-height: 300rpx;
- margin: vww(20);
position: relative;
// top: vww(120);
overflow-y: overlay;
@@ -946,9 +1072,11 @@
.bottom-button {
width: 100%;
height: vww(47);
- @include flex;
+ display: flex;
+ justify-items: flex-start;
.u-button {
+ margin: 0 20rpx;
width: 40%;
height: 60rpx;
font-size: 28rpx;
@@ -962,7 +1090,6 @@
.weigh-ability {
width: 631rpx;
- height: vww(100);
margin: vww(20) auto;
margin-bottom: vww(10);
@include flex;
@@ -970,8 +1097,6 @@
.weigh-button {
width: 631rpx;
- height: vww(89);
-
.u-button {
font-size: 28rpx;
font-weight: 300;
@@ -993,4 +1118,8 @@
padding: 10px 15px!important;
}
}
+ .btns-box-main{
+ width: 100%;
+ margin-bottom: 60rpx;
+ }
</style>
--
Gitblit v1.9.1