From bb52e0d4baffe8e0486c951e525b6614bd4aaa28 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 24 四月 2023 14:08:56 +0800
Subject: [PATCH] 修改样式，修复已知bug
---
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 233 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 147 insertions(+), 86 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 cc668fc..461de18 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,9 +1,57 @@
<template>
<view class="bill-of-lading-details">
- <view class="bangDanMessage">
+ <scroll-view class="bangDanMessage" :scroll-top="scrollTop" scroll-y="true">
+ <uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁">
+ <uni-tr>
+ <uni-th align="left">瀹㈡埛</uni-th>
+ <uni-td align="right">{{ coalDetailsData.customerName || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鐭垮満</uni-th>
+ <uni-td align="right">{{ coalDetailsData.deptName || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">姣涢噸</uni-th>
+ <uni-td align="right">{{ coalDetailsData.hair || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鐨噸</uni-th>
+ <uni-td align="right">{{ coalDetailsData.skin || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鍑�閲�</uni-th>
+ <uni-td align="right">{{ coalDetailsData.clean || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">纾呭崟绫诲瀷</uni-th>
+ <uni-td align="right">{{ coalDetailsData.orderType || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鐘舵��</uni-th>
+ <uni-td align="right">{{ coalStatus[coalDetailsData.status] }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鐓ゅ満</uni-th>
+ <uni-td align="right">{{ coalDetailsData.filedName || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鍙戣繍鏃堕棿</uni-th>
+ <uni-td align="right">{{ coalDetailsData.sendDate || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鎻愮叅鍗曠紪鍙�</uni-th>
+ <uni-td align="right">{{ coalDetailsData.code || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">璁㈠崟缂栧彿</uni-th>
+ <uni-td align="right">{{ coalDetailsData.orderCode || '' }}</uni-td>
+ </uni-tr>
+ </uni-table>
+ </scroll-view>
+ <!-- <view class="bangDanMessage">
<view class="">
- <text>瀹㈡埛锛歿{ coalDetailsData.customerName || '' }}</text>
- <text>鐭垮巶锛歿{ coalDetailsData.deptName || '' }}</text>
+ <text>瀹㈡埛锛歿{}}</text>
+ <text>鐭垮満锛歿{ coalDetailsData.deptName || '' }}</text>
</view>
<view class="">
<text>鐨噸锛歿{ coalDetailsData.skin || '' }}</text>
@@ -11,7 +59,7 @@
<text>鍑�閲嶏細{{ coalDetailsData.clean || '' }}</text>
</view>
<view class="">
- <text>纾呭崟绫诲瀷锛歿{ coalDetailsData.orderTye || '' }}</text>
+ <text>纾呭崟绫诲瀷锛歿{ coalDetailsData.orderType || '' }}</text>
<text>鐘舵�侊細{{ coalStatus[coalDetailsData.status] }}</text>
</view>
<view class="">
@@ -20,7 +68,7 @@
<text>鎻愮叅鍗曠紪鍙凤細{{ coalDetailsData.code || '' }}</text>
<text>璁㈠崟缂栧彿锛歿{ coalDetailsData.orderCode || '' }}</text>
</view>
- </view>
+ </view> -->
<view class="timeLine" style="font-size: 16rpx;">
<u--text type="primary" size="30" plain v-for="(item, index) in dayRZ" :key="index" :text="item.taskStatusDes"></u--text>
</view>
@@ -48,8 +96,8 @@
</template>
<script>
-let socket = null;
import { webSocketUrl } from '@/api/request.js';
+import { mapState, mapMutations } from 'vuex';
export default {
onLoad(value) {
if (value.orderPlanId && value.yyId) {
@@ -100,14 +148,21 @@
sceneId: '',
gateCameraId: '',
equipmentCode: '',
- weigh: 0
- }
+ weigh: 0,
+ sceneInOut: ''
+ },
+ // 鍘熷彂淇℃伅
+ primarySkin: null,
+ primaryHair: null,
+ primaryClean: null,
+ scrollTop: 0
};
},
onShow() {
this.init();
},
computed: {
+ ...mapState(['globalweigh', 'globalinfraredStatus']),
name() {
return uni.getStorageSync('name');
},
@@ -141,7 +196,8 @@
getTakeCoal() {
this.$reqGet('getTakeCoal', { takeCoalId: this.orderPlanId }).then(res => {
if (res.code == 0) {
- this.coalDetailsData = res.data[0];
+ console.log(res, '鎻愮叅鍗曡鎯�');
+ this.coalDetailsData = res.data;
// 鑾峰彇鎵�鍦ㄧ鎴垮弬鏁拌祴鍊�
this.getWeightHouseObj.deptId = this.coalDetailsData.deptId;
this.getWeightHouseObj.filedId = this.coalDetailsData.filedId;
@@ -157,6 +213,10 @@
this.getServiceOpenid.filedId = this.coalDetailsData.filedId;
// 鑾峰彇鎻愮叅鍗曠姸鎬�
this.currentPageCoalStatus = this.coalDetailsData.status;
+ // 鑾峰彇鍘熷彂淇℃伅
+ this.primarySkin = this.coalDetailsData.skinTwo;
+ this.primaryHair = this.coalDetailsData.hairTwo;
+ this.primaryClean = this.coalDetailsData.cleanTwo;
}
});
},
@@ -244,53 +304,18 @@
this.weighData.sceneId = res.data.id;
this.weighData.gateCameraId = res.data.lastEquipmentId;
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}`
+ }&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}`
});
} else {
this.$u.toast('鏈湪纾呮埧锛岃鍓嶅線纾呮埧鍚庡啀璇曪紒锛�');
}
- });
- },
- /**
- * 鍒濆鍖� weoSocket
- */
- initWebSocket() {
- let wsUrl = `${webSocketUrl}?access_token=${uni.getStorageSync('token')}`;
- socket = uni.connectSocket({
- url: wsUrl,
- header: {
- CLIENT_TOC: 'Y'
- },
- complete: res => {
- console.log(res, 'socket缁撴灉');
- }
- });
- socket.onOpen(() => {
- console.log('onOpen');
- });
- // 鑾峰彇鏈嶅姟鍣ㄤ紶鏉ョ殑鏁版嵁锛屽仛鐩稿簲澶勭悊
- socket.onMessage(res => {
- console.log('socketWeigh', res);
- let nowWeighObj = JSON.parse(res.data.slice(7));
- if (nowWeighObj.eqCode == this.weighHouseCode) {
- if (nowWeighObj.eqInfraredStatus) {
- this.weighData.weigh = nowWeighObj.weigh;
- } else {
- this.weighData.weigh = nowWeighObj.weigh;
- }
- }
- });
- socket.onClose(() => {
- console.log('webSocketClose');
- this.$u.toast('纾呮埧鎺ュ彛缁堢');
- });
- socket.onError(err => {
- console.log('socket鎶ラ敊', err);
- this.$u.toast('纾呮埧鎺ュ彛鏆傛椂涓嶈兘浣跨敤锛岃閲嶆柊杩涘叆璇ラ〉闈紝閲嶈瘯锛侊紒');
});
},
// 鏀剧┖
@@ -299,10 +324,20 @@
},
// 鏀剧┖寮圭獥纭
evacuationConfirm() {
+ this.weighData = {
+ ...this.weighData,
+ weigh: this.globalweigh
+ };
let mix = Object.assign(this.weighData, this.getWeightHouseObj);
this.$reqPost('getOneEvacuation', mix, 'json').then(res => {
console.log(res, '绗竴娆℃斁绌�');
- this.evacuationModalShow = false;
+ if (res.code == 0) {
+ this.$u.toast('鎿嶄綔鎴愬姛');
+ this.evacuationModalShow = false;
+ } else {
+ this.$u.toast('鎿嶄綔澶辫触锛岃绋嶅悗閲嶈瘯');
+ this.evacuationModalShow = false;
+ }
});
},
// 鏀剧┖寮圭獥鍙栨秷
@@ -321,47 +356,73 @@
display: flex;
flex-direction: column;
.bangDanMessage {
- padding: vww(10);
- border: vww(2) solid #dddddd;
- border-radius: vww(20);
- margin: vww(20);
- margin-bottom: vww(10);
- height: 40%;
- font-size: vww(18);
- font-weight: 600;
- view {
- margin-bottom: vww(10);
- }
- view:nth-of-type(1) {
- display: flex;
- text {
- width: 50%;
- text-align: center;
+ width: 96%;
+ margin: 0 auto;
+ height: 50%;
+ }
+ // 琛ㄦ牸鏍峰紡
+ .uni-table {
+ .uni-table-tr {
+ padding: 0;
+ border: vww(1) solid #c6c6c6;
+ .uni-table-th {
+ font-size: vww(14);
+ height: vww(20);
+ line-height: vww(20);
+ // padding: vww(5) vww(10);
+ color: #111111;
+ font-weight: 500;
+ background: #e2e2e2;
}
- }
- view:nth-of-type(2) {
- display: flex;
- text {
- width: 33%;
- text-align: center;
- }
- }
- view:nth-of-type(3) {
- display: flex;
- text {
- width: 50%;
- text-align: center;
- }
- }
- view:nth-of-type(4) {
- display: flex;
- flex-direction: column;
- text {
- margin-bottom: vww(10);
- text-align: center;
+ .uni-table-td {
+ font-size: vww(14);
+ font-weight: 400;
+ height: vww(20);
+ line-height: vww(20);
+ padding: vww(5) vww(10);
+ color: #111111;
}
}
}
+ // .bangDanMessage {
+ // margin: vww(20);
+ // margin-bottom: vww(10);
+ // height: 40%;
+ // font-size: vww(18);
+ // font-weight: 600;
+ // view {
+ // margin-bottom: vww(10);
+ // }
+ // view:nth-of-type(1) {
+ // display: flex;
+ // text {
+ // width: 50%;
+ // text-align: center;
+ // }
+ // }
+ // view:nth-of-type(2) {
+ // display: flex;
+ // text {
+ // width: 33%;
+ // text-align: center;
+ // }
+ // }
+ // view:nth-of-type(3) {
+ // display: flex;
+ // text {
+ // width: 50%;
+ // text-align: center;
+ // }
+ // }
+ // view:nth-of-type(4) {
+ // display: flex;
+ // flex-direction: column;
+ // text {
+ // margin-bottom: vww(10);
+ // text-align: center;
+ // }
+ // }
+ // }
.timeLine {
height: 25%;
margin: vww(20);
--
Gitblit v1.9.1