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 | 60 ++++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 46 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 f5aaddb..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"
@@ -125,7 +126,6 @@
<view class="weigh-ability" v-if="isShenqingFubangShow">
<view class="weigh-button"><u-button
:loading="shenQingFuBangLoading"
- :disabled="!isapproach"
text="鐢宠澶嶇"
@click="shenqingFubangClick"
type="primary"
@@ -321,17 +321,14 @@
},
isFangKong() {
if(this.coalDetailsData.hair !== 0 || this.coalDetailsData.skin !== 0) {
- console.log(this.coalDetailsData,'this.coalDetailsData==')
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) {
- console.log('鎴戣繘鏉ヤ簡----------------11111111333333333333333331111111111')
return true
}else {
- console.log('鎴戣繘鏉ヤ簡----------------2222222222')
return false
}
// if((this.coalDetailsData.hair == this.globalweigh) || (this.coalDetailsData.skin == this.globalweigh)) {
@@ -340,12 +337,11 @@
// return false
// }
}else {
- console.log('鎴戣繘鏉ヤ簡----------------333333333')
return false
}
},
isapproach() {
- return this.currentPageCoalStatus != 3;
+ return this.currentPageCoalStatus != 3 || this.coalDetailsData.isSendErp ==1;
},
// 灞曠ず鐨瘺鍑�
showWeigh() {
@@ -364,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 && this.orderType == "澶栬喘") {
+ //鏉′欢锛� 涓嶆槸 绉伴噸瀹屾垚+涓嶆槸 鏈О閲�+鍙告満 銆愭湭绉伴噸0锛岀О閲嶄腑1锛岄獙璐ㄤ腑2锛岀О閲嶅畬鎴�3,楠岃川瀹屾垚4銆� noCarNo 鏄惁鏈夎溅鐗屽彿(鏈夎溅鐗�0锛屾棤杞︾墝1)
+ if((this.currentPageCoalStatus != 0) && this.roleType == 3) {
return true
}else {
return false
@@ -450,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 {
@@ -752,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(){
--
Gitblit v1.9.1