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 | 204 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 137 insertions(+), 67 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 54337af..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
@@ -32,6 +32,7 @@
<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"
@@ -73,55 +74,66 @@
@click="printOrder"
shape="circle"
: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="isShenqingFubangShow">
- <view class="weigh-button"><u-button
- :loading="shenQingFuBangLoading"
- :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"
@@ -147,7 +159,7 @@
@close="sheetClose" >
</u-action-sheet>
<view class="serviece-customer">
- <u-action-sheet
+ <u-action-sheet
v-if="serviceInfoObj.serviecePhone"
:actions="hujiaolist"
@select="selectClickhujiao"
@@ -171,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: {
@@ -285,7 +297,8 @@
clearInterval(this.interval);
},
computed: {
- ...mapState(['globalweigh', 'globalinfraredStatus']),
+ ...mapState(['globalinfraredStatus']),
+ ...mapGetters(['globalweigh']),
name() {
return uni.getStorageSync('name');
},
@@ -305,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() {
@@ -326,8 +360,8 @@
return uni.getStorageSync('userInfo').type;
},
isShenqingFubangShow() { //鐢宠澶嶇鎸夐挳鏄惁鏄剧ず
- //鏉′欢锛� 涓嶆槸 绉伴噸瀹屾垚+涓嶆槸 鏈О閲�+鏈夎溅鐗�+鍙告満 銆愭湭绉伴噸0锛岀О閲嶄腑1锛岄獙璐ㄤ腑2锛岀О閲嶅畬鎴�3,楠岃川瀹屾垚4銆� noCarNo 鏄惁鏈夎溅鐗屽彿(鏈夎溅鐗�0锛屾棤杞︾墝1)
- if((this.currentPageCoalStatus != 0 && this.currentPageCoalStatus != 3) && this.roleType == 3 && this.noCarNo == 0) {
+ //鏉′欢锛� 涓嶆槸 绉伴噸瀹屾垚+涓嶆槸 鏈О閲�+鍙告満 銆愭湭绉伴噸0锛岀О閲嶄腑1锛岄獙璐ㄤ腑2锛岀О閲嶅畬鎴�3,楠岃川瀹屾垚4銆� noCarNo 鏄惁鏈夎溅鐗屽彿(鏈夎溅鐗�0锛屾棤杞︾墝1)
+ if((this.currentPageCoalStatus != 0) && this.roleType == 3) {
return true
}else {
return false
@@ -354,14 +388,6 @@
this.coalDayPage(); //鑾峰彇鏃ュ織
this.getTakeCoal(); //鑾峰彇閫氱煡鍗曡鎯�
},
- getYuanfaList() { //鍘熷彂淇℃伅list
- this.$reqGet('getMaterialDetailByOrderCode', { orderCode: this.orderCode }).then(res => {
- if(res.code == 0) {
- this.$store.commit('GET_YUANFALIST',res.data)
- }
-
- })
- },
// 鑾峰彇瀹㈡湇openid
getgetService() {
this.$reqGet('getCallOutList', this.getServiceOpenid).then(res => {
@@ -388,6 +414,7 @@
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
@@ -419,10 +446,9 @@
//鍒濆鍖栫鍗曟暟鎹�
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()
- this.getYuanfaList() //鍘熷彂淇℃伅
} else {
this.$u.toast('鍔犺浇澶辫触');
}
@@ -659,8 +685,10 @@
tmId:this.coalDetailsData.id
}
this.shenQingFuBangLoading = true
- this.$reqPost('applyForRepeatedCar',params,'json').then(res => {
+ 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);
@@ -720,19 +748,55 @@
this.show = true;
},
selectClick(obj){
- this.$reqGet('printerHandler',{tmItemId:obj.id}).then(res => {
- uni.hideLoading();
- this.$u.toast(res.msg ? 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(){
@@ -1008,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;
@@ -1052,4 +1118,8 @@
padding: 10px 15px!important;
}
}
+ .btns-box-main{
+ width: 100%;
+ margin-bottom: 60rpx;
+ }
</style>
--
Gitblit v1.9.1