From 5e08d4f61c24db589bd6d30875fcb1191f719b16 Mon Sep 17 00:00:00 2001 From: yangan <yangan0921@163.com> Date: 星期五, 11 四月 2025 20:41:44 +0800 Subject: [PATCH] feat:申请复磅 --- pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 51 ++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 44 insertions(+), 7 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 464815d..f3ee759 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" @@ -360,7 +361,7 @@ }, isShenqingFubangShow() { //鐢宠澶嶇鎸夐挳鏄惁鏄剧ず //鏉′欢锛� 涓嶆槸 绉伴噸瀹屾垚+涓嶆槸 鏈О閲�+鍙告満 銆愭湭绉伴噸0锛岀О閲嶄腑1锛岄獙璐ㄤ腑2锛岀О閲嶅畬鎴�3,楠岃川瀹屾垚4銆� noCarNo 鏄惁鏈夎溅鐗屽彿(鏈夎溅鐗�0锛屾棤杞︾墝1) - if((this.currentPageCoalStatus != 0) && this.roleType == 3) { + if((this.currentPageCoalStatus != 0) && this.roleType == 3 && this.coalDetailsData.isSendErp != 0) { return true }else { return false @@ -445,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 { @@ -747,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