From 29611eb117777efebb245e85e448693a349167a8 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期五, 10 十一月 2023 11:17:38 +0800
Subject: [PATCH] 验质增加单位，回显示bug修复
---
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 508 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 280 insertions(+), 228 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 6831ae7..917bad4 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,63 +1,51 @@
<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;">
- <view class="top-information">
- <view class="cutomer-name"
- 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=""
- v-if="orderType == '杞叆' || orderType == '杞嚭'">鐓ゅ満:{{ coalDetailsData.filedName || '' }}</view>
- <view class=""
- v-else>鐓ゅ満:{{ coalDetailsData.filedName || '鏆傛棤' }}</view>
- </view>
+ :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>
+ <view class="cutomer-name"
+ v-else>瀹㈡埛:{{ coalDetailsData.customerName || '' }}</view>
+ <view class="fild-name">
+ <view class="">鍩哄湴:{{ coalDetailsData.deptName || '鏆傛棤' }}</view>
+ <view class=""
+ v-if="orderType == '杞叆' || orderType == '杞嚭'">浠撳簱:{{ coalDetailsData.filedName || '' }}</view>
+ <view class=""
+ v-else>浠撳簱:{{ coalDetailsData.filedName || '鏆傛棤' }}</view>
</view>
- <view class="block-information">
- <view class="block-main">
- <view class="basic">
- <view class="coalName">{{ coalDetailsData.coalName }}</view>
- <view class="status-button"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/statusbutton.png') no-repeat;
- background-size: cover;">
- {{ coalStatus[coalDetailsData.status] || '' }}
- </view>
- </view>
- <view class="time">
- <view class="time-icon"><u-icon name="clock"
- color="#515151"
- size="40"></u-icon></view>
- <view class="send-date">{{ coalDetailsData.sendDate }}</view>
- </view>
- <view class="coal-code">鎻愮叅鍗曠紪鍙�: {{ coalDetailsData.code || '' }}</view>
- <view class="order-code">
- 璁㈠崟缂栧彿: {{ coalDetailsData.orderCode || '' }}</view>
- <view class="weigh-item">
- <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">{{ coalDetailsData.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">{{ coalDetailsData.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">{{ coalDetailsData.clean }}</view>
- </view>
+ </view>
+ <view class="block-information">
+ <view class="block-main">
+ <view class="basic">
+ <view class="coalName"><text> {{ coalDetailsData.coalName||'' }}</text></view>
+ <view class="status-button"
+ :style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/statusbutton.png)`, backgroundSize: 'cover', backgroundRepeat: 'no-repeat' }">
+ {{ coalStatus[coalDetailsData.statusWeigh] || '' }}
</view>
</view>
+ <view class="time">
+ <view class="time-icon"><u-icon name="clock"
+ color="#515151"
+ size="40"></u-icon></view>
+ <view class="send-date">{{ coalDetailsData.sendDate }}</view>
+ </view>
+ <view class="coal-code">閫氱煡鍗曠紪鍙�: {{ coalDetailsData.code || '' }}</view>
+ <view class="order-code">
+ 璁㈠崟缂栧彿: {{ coalDetailsData.orderCode || '' }}</view>
+ <view class="coal-code"
+ @click="jumpWeighDetail"
+ style="color: rgb(73, 123, 251);">
+ 鏌ョ湅鏄庣粏
+ </view>
+
</view>
</view>
+ <!-- 绉伴噸鍘嗗彶-->
+ <weigh-item :list="showWeigh"></weigh-item>
+ <!-- 鏃堕棿绾� -->
<view class="timeLine">
<u-steps :current="dayRZ.length - 1"
direction="column"
@@ -71,7 +59,7 @@
</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"
@@ -79,12 +67,12 @@
@click="arriveClick"
shape="circle"
:disabled="coalDetailsData.status >= 2"></u-button>
- <u-button text="鍏ュ満鐢宠"
+ <u-button text="鎵撳嵃纾呭崟"
type="primary"
plain
- @click="rcsqClick"
+ @click="printOrder"
shape="circle"
- :disabled="coalDetailsData.status >= 3"></u-button>
+ :disabled="currentPageCoalStatus !== 4"></u-button>
</view>
<view class="bottom-button">
<u-button text="鏀剧┖"
@@ -102,12 +90,14 @@
</view>
</view>
</view>
- <view class="weigh-ability">
- <view class="weigh-button"><u-button text="灞曠ず鎻愮叅鍗�"
+ <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 text="涓婄璁￠噺"
+ shape="circle"></u-button></view> -->
+ <view class="weigh-button"><u-button
+ :disabled="!isapproach"
+ text="涓婄璁￠噺"
@click="cengZhongClick"
type="primary"
shape="circle"></u-button></view>
@@ -123,7 +113,7 @@
<view class="completeOutSale">
<u-modal :show="completeOutSaleShow"
title="纭"
- content="鏄惁瀹屾垚澶栭攢鎻愮叅鍗�"
+ content="鏄惁瀹屾垚澶栭攢閫氱煡鍗�"
:showCancelButton="true"
@confirm="completeOutSaleConfirm"
@cancel="completeOutSaleCancel"></u-modal>
@@ -132,9 +122,14 @@
</template>
<script>
+ import { onlineurl } from '@/api/request.js'
import { webSocketUrl } from '@/api/request.js';
import { mapState, mapMutations } from 'vuex';
+ import weighItem from '@/components/weighItem.vue'
export default {
+ components: {
+ weighItem
+ },
onLoad(value) {
this.orderPlanId = value.orderPlanId;
this.yyId = value.yyId;
@@ -147,9 +142,10 @@
return {
orderPlanId: null,
yyId: null,
+ chengZhongFlag:true, // 涓婃绉伴噸鐘舵��
dayRZ: [],
- coalDetailsData: {}, // 鎻愮叅鍗曡鎯�
- currentPageCoalStatus: 0, // 褰撳墠椤甸潰鎻愮叅鍗曠姸鎬�
+ coalDetailsData: {}, // 閫氱煡鍗曡鎯�
+ currentPageCoalStatus: 0, // 褰撳墠椤甸潰閫氱煡鍗曠姸鎬�
// 鑾峰彇鎵�鍦ㄧ鎴垮弬鏁�
getWeightHouseObj: {
deptId: '',
@@ -174,9 +170,7 @@
openId: null,
openName: ''
},
- coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅浠�', '鍑虹叅浠�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠',
- '杩涘叆鍦洪櫌'
- ], // 鐘舵��
+ coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚', '楠岃川瀹屾垚'], // 鐘舵��
weighHouseCode: '',
// 鏀剧┖寮圭獥鎺у埗鍙橀噺
evacuationModalShow: false,
@@ -206,8 +200,11 @@
clean: ""
},
completeOutSaleShow: false,
- overTmWaixiao: null
-
+ reservationIsShow:false,
+ overTmWaixiao: null,
+ // 鍒よ缃戠粶鐘舵�侊紝
+ normalCode: true,
+ onlineurl,
};
},
onShow() {
@@ -242,14 +239,21 @@
return this.coalDetailsData.hair !== 0 || this.coalDetailsData.skin !== 0;
},
isapproach() {
- return this.currentPageCoalStatus !== 3;
+ return this.currentPageCoalStatus < 3;
+ },
+ // 灞曠ず鐨瘺鍑�
+ showWeigh() {
+ return this.coalDetailsData.tmTaskCoalItems ? this.coalDetailsData.tmTaskCoalItems : []
+ },
+ //鍙告満棰嗗彇鐘舵�佹寜閽叏涓嶅睍绀�
+ isReservation(){
+ return this.reservationIsShow < 1;
}
},
methods: {
init() {
this.$reqGet('coalDayPage', { id: this.orderPlanId }).then(res => {
if (res.code == 0) {
- // this.dayRZ = res.data;
this.dayRZ = res.data.map(v => {
let slicedate = v.taskStatusDes.slice(0, 10);
if (slicedate == this.currentDate) {
@@ -264,7 +268,7 @@
}
});
this.coalDayPage(); //鑾峰彇鏃ュ織
- this.getTakeCoal(); //鑾峰彇鎻愮叅鍗曡鎯�
+ this.getTakeCoal(); //鑾峰彇閫氱煡鍗曡鎯�
this.getgetService(); //鑾峰彇瀹㈡湇
},
// 鑾峰彇瀹㈡湇openid
@@ -281,15 +285,15 @@
}
});
},
- // 鑾峰彇鎻愮叅鍗曡鎯�
+ // 鑾峰彇閫氱煡鍗曡鎯�
getTakeCoal() {
uni.showLoading({
title: '鍔犺浇涓�'
});
this.$reqGet('getTakeCoal', { takeCoalId: this.orderPlanId }).then(res => {
+ uni.hideLoading();
if (res.code == 0) {
- uni.hideLoading();
- console.log(res, '鎻愮叅鍗曡鎯�');
+ console.log(res, '閫氱煡鍗曡鎯�');
this.coalDetailsData = res.data;
this.orderType = this.coalDetailsData.orderType;
// 鍒ゆ柇鏄惁瀹屾垚澶栭攢璁㈠崟
@@ -310,8 +314,9 @@
// 鑾峰彇瀹㈡湇openId鍙傛暟璧嬪��
this.getServiceOpenid.deptId = this.coalDetailsData.deptId;
this.getServiceOpenid.filedId = this.coalDetailsData.filedId;
- // 鑾峰彇鎻愮叅鍗曠姸鎬�
- this.currentPageCoalStatus = this.coalDetailsData.status;
+ // 鑾峰彇閫氱煡鍗曠姸鎬�
+ this.currentPageCoalStatus = this.coalDetailsData.statusWeigh;
+ this.reservationIsShow = this.coalDetailsData.status;
// 鑾峰彇鍘熷彂淇℃伅
this.primarySkin = this.coalDetailsData.skinTwo;
this.primaryHair = this.coalDetailsData.hairTwo;
@@ -339,26 +344,33 @@
},
// 鏃ュ織鏌ヨ
coalDayPage() {
- this.interval = setInterval(() => {
- this.$reqGet('coalDayPage', { id: this.orderPlanId }).then(res => {
- if (res.code == 0) {
- // this.dayRZ = res.data;
- this.dayRZ = res.data.map(v => {
- let slicedate = v.taskStatusDes.slice(0, 10);
- if (slicedate == this.currentDate) {
- return {
- ...v,
- taskStatusDes: v.taskStatusDes.slice(10)
- };
- } else {
- return { ...v }
- }
- });
- }
- });
- }, 5000);
+ if (this.normalCode) {
+ this.interval = setInterval(() => {
+ this.$reqGet('coalDayPage', { id: this.orderPlanId }).then(res => {
+ if (res.code == 0) {
+ this.normalCode = true;
+ this.dayRZ = res.data.map(v => {
+ let slicedate = v.taskStatusDes.slice(0, 10);
+ if (slicedate == this.currentDate) {
+ return {
+ ...v,
+ taskStatusDes: v.taskStatusDes.slice(10)
+ };
+ } else {
+ return { ...v }
+ }
+ });
+ } else {
+ this.normalCode = false;
+ }
+ });
+ }, 10000);
+ } else {
+ clearInterval(this.interval)
+ 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}`
@@ -426,14 +438,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 => {
@@ -449,7 +453,8 @@
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('鏈湪纾呮埧锛岃鍓嶅線纾呮埧鍚庡啀璇曪紒锛�');
@@ -493,6 +498,24 @@
completeOutSaleCancel() {
this.completeOutSaleShow = false
},
+ // 鏌ョ湅璐ㄩ噺鏄庣粏
+ jumpWeighDetail() {
+ uni.navigateTo({
+ url: `/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail?orderPlanId=${this.orderPlanId}&flag=${true}`
+ })
+ },
+ //鎵撳嵃纾呭崟
+ printOrder(){
+ this.$reqGet('printerHandler',{tmId:this.orderPlanId}).then(res => {
+ if (res.data) {
+ uni.hideLoading();
+ // this.orderPlanData = res.data
+ } else {
+ uni.hideLoading();
+ this.$u.toast('鎵撳嵃澶辫触')
+ }
+ })
+ }
}
};
</script>
@@ -521,169 +544,198 @@
::v-deep.bill-of-lading-details {
width: 100%;
- height: 100vh;
+ height: 100%;
margin: 0 auto;
- display: flex;
- flex-direction: column;
.top-banner {
width: 100%;
height: 346rpx;
+ position: fixed;
+ }
- .top-information {
- width: 94%;
- margin: 0 auto;
- height: vww(52);
- @include flex position: relative;
- flex-direction: column;
+ .top-information {
+ width: 94%;
+ margin: 0 auto;
+ height: vww(52);
+ @include flex position: relative;
+ flex-direction: column;
+ justify-content: space-between;
+ align-items: flex-start;
+ top: vww(25);
+ color: #ffffff;
+ font-size: 31rpx;
+ font-weight: 300;
+
+
+ .cutomer-name {
+ width: 100%;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+
+ .fild-name {
+ @include flex;
justify-content: space-between;
- align-items: flex-start;
- top: vww(25);
- color: #ffffff;
- font-size: 31rpx;
- font-weight: 300;
+ width: 100%;
- .cutomer-name {
- width: 100%;
+ view {
+ min-width: 296rpx;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
+ }
+ }
- .fild-name {
- @include flex;
- justify-content: space-between;
- width: 100%;
+ .block-information {
+ width: 690rpx;
+ height: 100%;
+ min-height: 420rpx;
+ margin: vww(40) auto;
+ background: #ffffff;
+ box-shadow: 4rpx 6rpx 51rpx 0rpx rgba(73, 120, 240, 0.11);
+ border-radius: 20rpx;
+ position: relative;
+ font-size: 30rpx;
+ font-weight: 300;
+ color: #303030;
+ overflow: hidden;
- view {
- min-width: 296rpx;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
- }
+ .block-main {
+ display: grid;
+ grid-template-columns: auto;
+ grid-template-rows: repeat(auto-fit, minmax(40rpx, 1fr));
+ gap: auto 5rpx;
+ width: 94%;
+ height: 100%;
+ min-height: 380rpx;
+ margin: vww(18) vww(7) vww(11) vww(17);
+ }
+
+ .status-button {
+ width: vww(71);
+ height: vww(36);
+ text-align: center;
+ line-height: vww(33);
+ font-size: 28rpx;
+ font-weight: 300;
+ position: absolute;
+ right: vww(10);
+ color: #fff;
+ }
+
+ .basic {
+ width: 100%;
+ height: vww(15);
+ @include flex;
+ justify-content: flex-start;
+
+ .coalName,
+ .order-type {
+ width: 370rpx;
+ height: 55rpx;
+ font-size: 30rpx;
+ font-weight: 300;
+ color: #515151;
+ position: relative;
+ overflow: hidden; //婧㈠嚭闅愯棌
+ text-overflow: ellipsis; //瓒呭嚭閮ㄥ垎鐪佺暐鍙�
+ white-space: nowrap; //涓嶆崲琛�
+ }
+
+ .black-block {
+ width: 2rpx;
+ height: 30rpx;
+ background: #515151;
+ position: relative;
+ top: vww(2);
}
}
- .block-information {
- width: 690rpx;
- height: 396rpx;
- margin: vww(40) auto;
- background: #ffffff;
- box-shadow: 4rpx 6rpx 51rpx 0rpx rgba(73, 120, 240, 0.11);
- border-radius: 20rpx;
- position: relative;
- font-size: 30rpx;
- font-weight: 300;
- color: #303030;
- overflow: hidden;
+ .time {
+ width: 35%;
+ height: vww(12);
+ display: flex;
+ justify-content: flex-start;
- .block-main {
- @include flex width: 94%;
- height: 336rpx;
- margin: vww(18) vww(7) vww(11) vww(17);
- flex-direction: column;
- justify-content: space-between;
- align-items: flex-start;
- }
-
- .status-button {
- width: vww(71);
- height: vww(36);
- text-align: center;
- line-height: vww(33);
- font-size: 28rpx;
- font-weight: 300;
- position: absolute;
- right: vww(10);
- color: #fff;
- }
-
- .basic {
- width: 100%;
- height: vww(15);
- @include flex;
- justify-content: flex-start;
-
- .coalName,
- .order-type {
- width: 45%;
- height: 30rpx;
- font-size: 30rpx;
- font-weight: 300;
- color: #515151;
- position: relative;
- }
-
- .black-block {
- width: 2rpx;
- height: 30rpx;
- background: #515151;
- position: relative;
- top: vww(2);
- }
- }
-
- .time {
- width: 35%;
- height: vww(12);
- display: flex;
- justify-content: flex-start;
-
- .send-date {
- width: 148rpx;
- height: 24rpx;
- margin-left: vww(14);
- font-size: 28rpx;
- font-weight: 300;
- color: #515151;
- }
- }
-
- .coal-code,
- .order-code {
- width: 100%;
+ .send-date {
+ width: 148rpx;
height: 24rpx;
+ margin-left: vww(14);
font-size: 28rpx;
font-weight: 300;
- color: #7d7d7d;
+ color: #515151;
}
+ }
+
+ .coal-code,
+ .order-code {
+ width: 100%;
+ height: 24rpx;
+ font-size: 28rpx;
+ font-weight: 300;
+ color: #7d7d7d;
+ }
+
+
+ }
+
+ // 绉伴噸鍘嗗彶
+ .weigh-history {
+ @extend .block-information;
+
+ .block-main {
+ @extend .block-main;
+ gap: 10rpx 20rpx;
.weigh-item {
width: 100%;
- height: vww(36);
+ height: vww(80);
@include flex;
+ flex-direction: column;
justify-content: space-around;
+ align-items: flex-start;
- .item {
- min-width: vww(50);
- height: vww(45);
- font-size: 21rpx;
- font-weight: 400;
- color: #ffffff;
- text-align: center;
- line-height: vww(30);
+ .item-block {
+ width: 100%;
+ height: vww(36);
@include flex;
+ justify-content: space-around;
- .concrete {
- width: vww(36);
- height: vww(36);
- }
+ .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;
- .num {
- font-size: 40rpx;
- font-weight: 300;
- color: #303030;
+ .concrete {
+ width: vww(36);
+ height: vww(36);
+ }
+
+ .num {
+ font-size: 40rpx;
+ font-weight: 300;
+ color: #303030;
+ }
}
}
}
}
}
+ // 鏃堕棿绾�
.timeLine {
- height: 40%;
+ height: 300rpx;
+ min-height: 300rpx;
margin: vww(20);
position: relative;
- top: vww(120);
+ // top: vww(120);
overflow-y: overlay;
padding: vww(20);
@@ -716,7 +768,7 @@
width: 94%;
margin: 0 auto;
position: relative;
- top: vww(80);
+ // top: vww(80);
.utils_chil {
width: 100%;
@@ -743,7 +795,7 @@
.weigh-ability {
width: 631rpx;
height: vww(100);
- margin: vww(80) auto;
+ margin: vww(20) auto;
margin-bottom: vww(10);
@include flex;
flex-direction: column;
--
Gitblit v1.9.1