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 | 597 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 462 insertions(+), 135 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 02a916c..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
@@ -1,28 +1,27 @@
<template>
<view class="bill-of-lading-details">
<view class="top-banner"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/loadingbanner.png') no-repeat;background-size: cover;">
+ :style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/loadingbanner.png)`, backgroundSize: 'cover', backgroundRepeat: 'no-repeat' }">
</view>
<view class="top-information">
<view class="cutomer-name"
- v-if="orderType == '杞叆' || orderType == '杞嚭'">鐓ゅ満:{{ coalDetailsData.toFiledName || '' }}</view>
+ v-if="orderType == '杞叆' || orderType == '杞嚭'">浠撳簱:{{ coalDetailsData.toFiledName || '' }}</view>
<view class="cutomer-name"
v-else>瀹㈡埛:{{ coalDetailsData.customerName || '' }}</view>
<view class="fild-name">
- <view class="">鐭垮満:{{ coalDetailsData.deptName || '鏆傛棤' }}</view>
+ <view class="">鍩哄湴:{{ coalDetailsData.deptName || '鏆傛棤' }}</view>
<view class=""
- v-if="orderType == '杞叆' || orderType == '杞嚭'">鐓ゅ満:{{ coalDetailsData.filedName || '' }}</view>
+ v-if="orderType == '杞叆' || orderType == '杞嚭'">浠撳簱:{{ coalDetailsData.filedName || '' }}</view>
<view class=""
- v-else>鐓ゅ満:{{ coalDetailsData.filedName || '鏆傛棤' }}</view>
+ v-else>浠撳簱:{{ coalDetailsData.filedName || '鏆傛棤' }}</view>
</view>
</view>
<view class="block-information">
<view class="block-main">
<view class="basic">
- <view class="coalName">{{ coalDetailsData.coalName||'' }}</view>
+ <view class="coalName"><text> {{ coalDetailsData.coalName||'' }}</text></view>
<view class="status-button"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/statusbutton.png') no-repeat;
- background-size: cover;">
+ :style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/statusbutton.png)`, backgroundSize: 'cover', backgroundRepeat: 'no-repeat' }">
{{ coalStatus[coalDetailsData.statusWeigh] || '' }}
</view>
</view>
@@ -30,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.code || '' }}</view>
+ <view class="coal-code">杞︾墝鍙�: {{ coalDetailsData.carNo || '' }}</view>
<view class="order-code">
璁㈠崟缂栧彿: {{ coalDetailsData.orderCode || '' }}</view>
<view class="coal-code"
@@ -40,32 +40,13 @@
style="color: rgb(73, 123, 251);">
鏌ョ湅鏄庣粏
</view>
- <view class="weigh-item"
- v-for='item in showWeigh'
- :key="item.id">
- <view class="item">
- <view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/skin.png') no-repeat;background-size: cover;">
- 鐨�</view>
- <view class="num">{{ item.skin }}</view>
- </view>
- <view class="item">
- <view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/hair.png') no-repeat;background-size: cover;">
- 姣�</view>
- <view class="num">{{ item.hair }}</view>
- </view>
- <view class="item">
- <view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
- 鍑�</view>
- <view class="num">{{ item.clean }}</view>
- </view>
- </view>
+
</view>
</view>
-
+ <!-- 绉伴噸鍘嗗彶-->
+ <weigh-item :list="showWeigh" class="weighing-item"></weigh-item>
+ <!-- 鏃堕棿绾� -->
<view class="timeLine">
<u-steps :current="dayRZ.length - 1"
direction="column"
@@ -79,47 +60,80 @@
</view>
<view class="utilsBox">
- <view class="utils_chil utils_chilTop">
+ <view class="utils_chil utils_chilTop" v-if="!isReservation">
<view class="top-button">
<u-button text="绛惧埌"
type="primary"
plain
@click="arriveClick"
shape="circle"
- :disabled="coalDetailsData.status >= 2"></u-button>
- <u-button text="鍏ュ満鐢宠"
+ :disabled="coalDetailsData.status > 2"></u-button>
+ <u-button text="鎵撳嵃纾呭崟"
type="primary"
plain
- @click="rcsqClick"
+ @click="printOrder"
shape="circle"
- :disabled="coalDetailsData.status >= 3"></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">
- <view class="weigh-button"><u-button text="灞曠ず鎻愮叅鍗�"
- @click="showCaolPickUpBill"
- type="primary"
- shape="circle"></u-button></view>
- <view class="weigh-button"><u-button text="涓婄璁￠噺"
- @click="cengZhongClick"
- type="primary"
- shape="circle"></u-button></view>
- </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"
@@ -131,19 +145,52 @@
<view class="completeOutSale">
<u-modal :show="completeOutSaleShow"
title="纭"
- content="鏄惁瀹屾垚澶栭攢鎻愮叅鍗�"
+ content="鏄惁瀹屾垚澶栭攢閫氱煡鍗�"
:showCancelButton="true"
@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 class="serviece-customer">
+ <u-action-sheet
+ v-if="serviceInfoObj.serviecePhone"
+ :actions="hujiaolist"
+ @select="selectClickhujiao"
+ @close='serviceClose'
+ title="鍛煎彨鏂瑰紡"
+ :show="servieceShow"
+ cancelText="鍙栨秷"></u-action-sheet>
+ </view>
+<!-- 纾呮埧鍒楄〃 -->
+ <u-action-sheet
+ :actions="bangfangList"
+ title="閫夋嫨纾呮埧"
+ :closeOnClickAction="true"
+ :closeOnClickOverlay="true"
+ @select="bangfangSelectClick"
+ :show="bangfangListShow"
+ @close="bangfangSheetClose"></u-action-sheet>
</view>
</template>
<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: {
+ weighItem
+ },
onLoad(value) {
+ console.log(value,'valyue')
this.orderPlanId = value.orderPlanId;
this.yyId = value.yyId;
if (value.overTmWaixiao) {
@@ -155,9 +202,24 @@
return {
orderPlanId: null,
yyId: null,
+ show:false,
+ hujiaolist: [{ name: '鎵嬫満鍙�', subname: '', id: 1 }], //鍛煎彨瀹㈡湇閫夐」 { name: '寰俊璇煶', id: 2 }
+ servieceShow:false,
+ chengZhongFlag:true, // 涓婃绉伴噸鐘舵��
dayRZ: [],
- coalDetailsData: {}, // 鎻愮叅鍗曡鎯�
- currentPageCoalStatus: 0, // 褰撳墠椤甸潰鎻愮叅鍗曠姸鎬�
+ list: [
+ {
+ name:'閫夐」涓�',
+ },
+ {
+ name: '閫夐」浜岀鐢�',
+ },
+ {
+ name: '寮�鍚痩oad鍔犺浇', //寮�鍚悗鏂囧瓧涓嶆樉绀�
+ }
+ ],
+ coalDetailsData: {}, // 閫氱煡鍗曡鎯�
+ currentPageCoalStatus: 0, // 褰撳墠椤甸潰閫氱煡鍗曠姸鎬�
// 鑾峰彇鎵�鍦ㄧ鎴垮弬鏁�
getWeightHouseObj: {
deptId: '',
@@ -180,9 +242,10 @@
// 瀹㈡湇淇℃伅
serviceInfoObj: {
openId: null,
- openName: ''
+ openName: '',
+ serviecePhone: ''
},
- coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚'], // 鐘舵��
+ coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚', '璐ㄦ瀹屾垚'], // 鐘舵�乕0,1,3,4]
weighHouseCode: '',
// 鏀剧┖寮圭獥鎺у埗鍙橀噺
evacuationModalShow: false,
@@ -212,9 +275,16 @@
clean: ""
},
completeOutSaleShow: false,
+ reservationIsShow:false,
overTmWaixiao: null,
// 鍒よ缃戠粶鐘舵�侊紝
- normalCode: null
+ normalCode: true,
+ onlineurl,
+ bangfangListShow: false,
+ bangfangList: [],
+ noCarNo:0, //鏄惁鏈夎溅鐗屽彿(鏈夎溅鐗�0锛屾棤杞︾墝1)
+ shenQingFuBangLoading: false, //鐢宠澶嶇loading
+ orderCode:''
};
},
onShow() {
@@ -227,7 +297,8 @@
clearInterval(this.interval);
},
computed: {
- ...mapState(['globalweigh', 'globalinfraredStatus']),
+ ...mapState(['globalinfraredStatus']),
+ ...mapGetters(['globalweigh']),
name() {
return uni.getStorageSync('name');
},
@@ -247,18 +318,59 @@
//
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;
},
// 灞曠ず鐨瘺鍑�
showWeigh() {
return this.coalDetailsData.tmTaskCoalItems ? this.coalDetailsData.tmTaskCoalItems : []
- }
+ },
+ //鍙告満棰嗗彇鐘舵�佹寜閽叏涓嶅睍绀�
+ isReservation(){
+ return this.reservationIsShow < 1;
+ },
+ //鍒ゆ柇鎵撳嵃鍗曟鏁�
+ 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 && this.coalDetailsData.isSendErp != 0) {
+ return true
+ }else {
+ return false
+ }
+ }
},
methods: {
- init() {
- this.$reqGet('coalDayPage', { id: this.orderPlanId }).then(res => {
+ init() {
+ this.$reqGet('coalDayPage', { id: this.orderPlanId }).then(res => {
if (res.code == 0) {
this.dayRZ = res.data.map(v => {
let slicedate = v.taskStatusDes.slice(0, 10);
@@ -273,9 +385,8 @@
});
}
});
- this.coalDayPage(); //鑾峰彇鏃ュ織
- this.getTakeCoal(); //鑾峰彇鎻愮叅鍗曡鎯�
- this.getgetService(); //鑾峰彇瀹㈡湇
+ this.coalDayPage(); //鑾峰彇鏃ュ織
+ this.getTakeCoal(); //鑾峰彇閫氱煡鍗曡鎯�
},
// 鑾峰彇瀹㈡湇openid
getgetService() {
@@ -286,12 +397,14 @@
} else {
this.serviceInfoObj.openId = res.data.openId;
this.serviceInfoObj.openName = res.data.openName;
+ this.serviceInfoObj.serviecePhone = res.data.serviecePhone
+ this.$set(this.hujiaolist[0], 'subname', this.serviceInfoObj.serviecePhone)
uni.setStorageSync('customeropenId', this.serviceInfoObj.openId);
uni.setStorageSync('customerName', this.serviceInfoObj.openName);
}
});
},
- // 鑾峰彇鎻愮叅鍗曡鎯�
+ // 鑾峰彇閫氱煡鍗曡鎯�
getTakeCoal() {
uni.showLoading({
title: '鍔犺浇涓�'
@@ -299,10 +412,13 @@
this.$reqGet('getTakeCoal', { takeCoalId: this.orderPlanId }).then(res => {
uni.hideLoading();
if (res.code == 0) {
- console.log(res, '鎻愮叅鍗曡鎯�');
+ 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
+ // 鍒ゆ柇鏄惁瀹屾垚澶栭攢璁㈠崟
this.completeOutSale.orderType = this.coalDetailsData.orderType;
this.completeOutSale.deptId = this.coalDetailsData.deptId;
this.completeOutSale.filedId = this.coalDetailsData.filedId;
@@ -320,12 +436,19 @@
// 鑾峰彇瀹㈡湇openId鍙傛暟璧嬪��
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;
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,tmId:item.tmId}
+ })
+ this.getPoundRoomByList()
} else {
this.$u.toast('鍔犺浇澶辫触');
}
@@ -345,6 +468,7 @@
})
}
}
+ this.getgetService(); //鑾峰彇瀹㈡湇
})
},
// 鏃ュ織鏌ヨ
@@ -375,7 +499,7 @@
this.$u.toast('鏈嶅姟鍣ㄩ敊璇�,璇风◢鍚庨噸璇�')
}
},
- // 灞曠ず鎻愮叅鍗曡鎯�
+ // 灞曠ず閫氱煡鍗曡鎯�
showCaolPickUpBill() {
uni.navigateTo({
url: `/pages/driver-page/driver-index/bill-of-lading-details/coal-pick-up-bill/coal-pick-up-bill?orderPlanId=${this.orderPlanId}`
@@ -386,7 +510,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}`
});
},
// 鍏ュ満鐢宠
@@ -402,6 +526,63 @@
// if (!this.serviceInfoObj.openId) {
// this.$u.toast('鏃犲鏈嶄俊鎭�');
// }
+ // wx.getSetting({
+ // success(res) {
+ // console.log('鎺堟潈success', res);
+ // if (!res.authSetting['scope.camera'] || !res.authSetting['scope.record']) {
+ // if (!res.authSetting['scope.camera']) {
+ // uni.showToast({
+ // title: '鏃犵浉鏈烘潈闄�'
+ // });
+ // } else if (!res.authSetting['scope.record']) {
+ // uni.showToast({
+ // title: '鏃犻害鍏嬮鏉冮檺'
+ // });
+ // }
+ // } else {
+ // wx.join1v1Chat({
+ // caller: {
+ // nickname: uni.getStorageSync('name'),
+ // openid: uni.getStorageSync(
+ // 'openid')
+ // },
+ // listener: {
+ // nickname: uni.getStorageSync('customerName'),
+ // openid: uni.getStorageSync(
+ // 'customeropenId')
+ // },
+ // backgroundType: 2,
+ // roomType: 'voice',
+ // success() {
+ // console.log('涓�瀵逛竴鎴愬姛');
+ // },
+ // fail(err) {
+ // console.log('涓�瀵逛竴澶辫触', err);
+ // }
+ // });
+ // }
+ // },
+ // fail() {
+ // console.log('鑾峰彇澶辫触');
+ // }
+ // });
+ this.servieceShow = true
+ },
+ serviceClose() {
+ this.servieceShow = false
+ },
+ selectClickhujiao(v){
+ console.log(v,'vvvv')
+ if (v.id === 2) {
+ this.callCustomerServiceImpl()
+ } else if (v.id === 1) {
+ console.log(this.serviceInfoObj,'w123456+')
+ wx.makePhoneCall({
+ phoneNumber: this.serviceInfoObj.serviecePhone
+ })
+ }
+ },
+ callCustomerServiceImpl(){
wx.getSetting({
success(res) {
console.log('鎺堟潈success', res);
@@ -418,7 +599,7 @@
} else {
wx.join1v1Chat({
caller: {
- nickname: uni.getStorageSync('name'),
+ nickname: uni.getStorageSync('username'),
openid: uni.getStorageSync(
'openid')
},
@@ -443,14 +624,6 @@
}
});
},
- calling() {
- // wx.join1v1Chat({
- // caller: { nickname: this.name, openid: this.openid }, //oZjXk5RRmbroAfl1m5aZ6hRNvqh4
- // listener: { nickname: this.serviceInfoObj.openName, openid: 'orutI5YT0yEvARVngdsTmBpisWmw' }, // 杩欓噷鐨刼penid鏄痜yy鐨勶紝鍏呭綋鍥哄畾鐨勫鏈峯penid
- // backgroundType: 2,
- // roomType: 'voice'
- // });
- },
// 绉伴噸
cengZhongClick() {
this.$reqGet('getWeighHouse', this.getWeightHouseObj).then(res => {
@@ -461,18 +634,72 @@
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
}&gateCameraId=${res.data.lastEquipmentId}&gateCameraCode=${res.data.lastEquipmentCode}&weighHouseCode=${res.data.code}&primarySkin=${
this.primarySkin
- }&primaryHair=${this.primaryHair}&psrimaryClean=${this.primaryClean}&sceneInOut=${res.data.sceneInOut}&overTmWaixiao=${this.overTmWaixiao}`
+ }&primaryHair=${this.primaryHair}&psrimaryClean=${this.primaryClean}&sceneInOut=${res.data.sceneInOut}&overTmWaixiao=${this.overTmWaixiao}
+ &isWeighing=${this.coalDetailsData.weighingType}`
});
} else {
- this.$u.toast('鏈湪纾呮埧锛岃鍓嶅線纾呮埧鍚庡啀璇曪紒锛�');
+ this.$u.toast(res.msg ? res.msg : '鏈湪纾呮埧锛岃鍓嶅線纾呮埧鍚庡啀璇曪紒锛�');
}
});
},
+ //鐢宠璁￠噺
+ shenqingjiliangClick() {
+ this.bangfangListShow = true
+ },
+ bangfangSelectClick(val) { //閫変腑纾呮埧(鍙告満閫夋嫨纾呮埧)
+ console.log(val,'id----')
+ this.$reqPost('applyWeight',{tmId:this.getWeightHouseObj.tmId,houseId:val.id},'params').then(res => {
+ console.log(res,'閫夋嫨纾呮埧====')
+ if(res.code == 0) {
+ uni.navigateTo({
+ url: `/pages/driver-page/driver-index/bill-of-lading-details/nocarNoWeighingDevice/nocarNoWeighingDevice?tmId=${this.getWeightHouseObj.tmId}&houseId=${val?.id}&weighHouseCode=${val?.code}`
+ })
+ }else {
+ this.$u.toast(res.msg);
+ }
+ })
+
+ },
+ bangfangSheetClose() {
+ this.bangfangListShow = false
+ },
+ getPoundRoomByList() {
+ console.log(this.getWeightHouseObj.tmId,'this.getWeightHouseObj.tmId===')
+ this.$reqGet('getPoundRoomByList',{tmId:this.getWeightHouseObj.tmId}).then(res => {
+ console.log(res,'res')
+ if(res.data) {
+ this.bangfangList = res.data
+ }
+ })
+ },
+ 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;
@@ -513,15 +740,88 @@
// 鏌ョ湅璐ㄩ噺鏄庣粏
jumpWeighDetail() {
uni.navigateTo({
- url: `/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail?orderPlanId=${this.orderPlanId}`
+ url: `/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail?orderPlanId=${this.orderPlanId}&flag=${true}`
})
- }
+ },
+ //鎵撳嵃纾呭崟
+ printOrder(){
+ this.show = true;
+ },
+ selectClick(obj){
+ 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();
+ 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;
+ }
/deep/.u-steps {
.u-steps-item {
.u-steps-item__content {
@@ -591,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;
@@ -609,11 +909,8 @@
gap: auto 5rpx;
width: 94%;
height: 100%;
- min-height: 380rpx;
- margin: vww(18) vww(7) vww(11) vww(17);
- // flex-direction: column;
- // justify-content: space-between;
- // align-items: flex-start;
+ min-height: 360rpx;
+ margin: vww(18) vww(7) vww(8) vww(17);
}
.status-button {
@@ -636,12 +933,15 @@
.coalName,
.order-type {
- width: 45%;
- height: 30rpx;
+ width: 370rpx;
+ height: 55rpx;
font-size: 30rpx;
font-weight: 300;
color: #515151;
position: relative;
+ overflow: hidden; //婧㈠嚭闅愯棌
+ text-overflow: ellipsis; //瓒呭嚭閮ㄥ垎鐪佺暐鍙�
+ white-space: nowrap; //涓嶆崲琛�
}
.black-block {
@@ -654,7 +954,7 @@
}
.time {
- width: 35%;
+ width: 100%;
height: vww(12);
display: flex;
justify-content: flex-start;
@@ -678,41 +978,56 @@
color: #7d7d7d;
}
- .weigh-item {
- width: 100%;
- height: vww(36);
- @include flex;
- justify-content: space-around;
- .item {
- min-width: vww(50);
- height: vww(45);
- font-size: 21rpx;
- font-weight: 400;
- color: #ffffff;
- text-align: center;
- line-height: vww(30);
+ }
+
+ // 绉伴噸鍘嗗彶
+ .weigh-history {
+ .block-main {
+ .weigh-item {
+ width: 100%;
+ height: vww(80);
@include flex;
+ flex-direction: column;
+ justify-content: space-around;
+ align-items: flex-start;
- .concrete {
- width: vww(36);
+ .item-block {
+ width: 100%;
height: vww(36);
- }
+ @include flex;
+ justify-content: space-around;
- .num {
- font-size: 40rpx;
- font-weight: 300;
- color: #303030;
+ .item {
+ min-width: vww(50);
+ height: vww(45);
+ font-size: 21rpx;
+ font-weight: 400;
+ color: #ffffff;
+ text-align: center;
+ line-height: vww(30);
+ @include flex;
+
+ .concrete {
+ width: vww(36);
+ height: vww(36);
+ }
+
+ .num {
+ font-size: 40rpx;
+ font-weight: 300;
+ color: #303030;
+ }
+ }
}
}
}
}
-
+ // 鏃堕棿绾�
.timeLine {
height: 300rpx;
min-height: 300rpx;
- margin: vww(20);
position: relative;
// top: vww(120);
overflow-y: overlay;
@@ -757,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;
@@ -773,7 +1090,6 @@
.weigh-ability {
width: 631rpx;
- height: vww(100);
margin: vww(20) auto;
margin-bottom: vww(10);
@include flex;
@@ -781,8 +1097,6 @@
.weigh-button {
width: 631rpx;
- height: vww(89);
-
.u-button {
font-size: 28rpx;
font-weight: 300;
@@ -795,4 +1109,17 @@
}
}
}
-</style>
\ No newline at end of file
+ ::v-deep{
+ .u-action-sheet{
+ max-height: 900rpx;
+ overflow-y: auto;
+ }
+ .u-action-sheet__item-wrap__item{
+ padding: 10px 15px!important;
+ }
+ }
+ .btns-box-main{
+ width: 100%;
+ margin-bottom: 60rpx;
+ }
+</style>
--
Gitblit v1.9.1