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 | 347 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 291 insertions(+), 56 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 d03e6e0..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,48 +1,110 @@
<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="">
- <u--text align="center" size="35" bold plain text="涓昏壊" :text="'瀹㈡埛锛�' + coalDetailsData.customerName"></u--text>
- <u--text align="center" size="35" bold plain text="涓昏壊" :text="'鐭垮巶锛�' + coalDetailsData.deptName"></u--text>
+ <text>瀹㈡埛锛歿{}}</text>
+ <text>鐭垮満锛歿{ coalDetailsData.deptName || '' }}</text>
</view>
<view class="">
- <u--text align="center" size="35" bold plain text="涓昏壊" :text="'鐨噸锛�' + coalDetailsData.skin"></u--text>
- <u--text align="center" size="35" bold plain text="涓昏壊" :text="'姣涢噸锛�' + coalDetailsData.hair"></u--text>
- <u--text align="center" size="35" bold plain text="涓昏壊" :text="'鍑�閲嶏細' + coalDetailsData.clean"></u--text>
+ <text>鐨噸锛歿{ coalDetailsData.skin || '' }}</text>
+ <text>姣涢噸锛歿{ coalDetailsData.hair || '' }}</text>
+ <text>鍑�閲嶏細{{ coalDetailsData.clean || '' }}</text>
</view>
<view class="">
- <u--text align="center" size="35" bold plain text="涓昏壊" :text="'纾呭崟绫诲瀷锛�' + coalDetailsData.orderTye"></u--text>
- <u--text align="center" size="35" bold plain text="涓昏壊" :text="'鐘舵�侊細' + coalStatus[coalDetailsData.status]"></u--text>
+ <text>纾呭崟绫诲瀷锛歿{ coalDetailsData.orderType || '' }}</text>
+ <text>鐘舵�侊細{{ coalStatus[coalDetailsData.status] }}</text>
</view>
- <u--text align="center" size="35" bold plain text="涓昏壊" :text="'鐓ゅ満锛�' + coalDetailsData.filedName"></u--text>
- <u--text align="center" size="35" bold plain text="涓昏壊" :text="'鍙戣繍鏃堕棿锛�' + coalDetailsData.sendDate"></u--text>
- <u--text align="center" size="35" bold plain text="涓昏壊" :text="'鎻愮叅鍗曠紪鍙凤細' + coalDetailsData.code"></u--text>
- <u--text align="center" size="35" bold plain text="涓昏壊" :text="'璁㈠崟缂栧彿锛�' + coalDetailsData.orderCode"></u--text>
- </view>
+ <view class="">
+ <text>鐓ゅ満锛歿{ coalDetailsData.filedName || '' }}</text>
+ <text>鍙戣繍鏃堕棿锛歿{ coalDetailsData.sendDate || '' }}</text>
+ <text>鎻愮叅鍗曠紪鍙凤細{{ coalDetailsData.code || '' }}</text>
+ <text>璁㈠崟缂栧彿锛歿{ coalDetailsData.orderCode || '' }}</text>
+ </view>
+ </view> -->
<view class="timeLine" style="font-size: 16rpx;">
- <u--text type="primary" size="30" plain text="涓昏壊" v-for="(item, index) in dayRZ" :key="index" :text="item.taskStatusDes"></u--text>
+ <u--text type="primary" size="30" plain v-for="(item, index) in dayRZ" :key="index" :text="item.taskStatusDes"></u--text>
</view>
<view class="utilsBox">
<view class="utils_chil utils_chilTop">
<u-button text="绛惧埌" type="primary" plain @click="arriveClick"></u-button>
<u-button text="鍏ュ満鐢宠" type="primary" plain @click="rcsqClick"></u-button>
- <u-button text="鏀剧┖" type="primary" plain></u-button>
- <u-button text="鍛煎彨瀹㈡湇" type="primary" plain></u-button>
+ <u-button text="鏀剧┖" type="primary" plain @click="evacuation" throttleTime="500"></u-button>
+ <u-button text="鍛煎彨瀹㈡湇" type="primary" plain @click="callCustomerService"></u-button>
</view>
<view class="utils_chil"><u-button text="灞曠ず鎻愮叅鍗�" @click="showCaolPickUpBill" type="primary"></u-button></view>
<view class="utils_chil"><u-button text="涓婄璁￠噺" @click="cengZhongClick" type="primary"></u-button></view>
+ </view>
+ <view class="evacuationModal">
+ <u-modal
+ :show="evacuationModalShow"
+ :title="evacuationTitle"
+ :content="evacuationContent"
+ :showCancelButton="true"
+ @confirm="evacuationConfirm"
+ @cancel="evacuationCancel"
+ ></u-modal>
</view>
</view>
</template>
<script>
+import { webSocketUrl } from '@/api/request.js';
+import { mapState, mapMutations } from 'vuex';
export default {
onLoad(value) {
- console.log('椤甸潰鍔犺浇', value);
if (value.orderPlanId && value.yyId) {
this.orderPlanId = value.orderPlanId;
this.yyId = value.yyId;
}
+ // wx.startRecord();
},
data() {
return {
@@ -50,28 +112,59 @@
yyId: null,
dayRZ: [],
coalDetailsData: {}, // 鎻愮叅鍗曡鎯�
+ currentPageCoalStatus: 0, // 褰撳墠椤甸潰鎻愮叅鍗曠姸鎬�
+ // 鑾峰彇鎵�鍦ㄧ鎴垮弬鏁�
getWeightHouseObj: {
- // 鑾峰彇鎵�鍦ㄧ鎴�
deptId: '',
filedId: '',
tmId: '',
tmCode: '',
carNo: ''
},
+ // 鑾峰彇鍏ュ満鐢宠鐨勫垪琛ㄩ〉闈㈠弬鏁�
getYuYueDataParams: {
deptId: '',
filedId: '',
sendDate: ''
},
- coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅鍦�', '鍑虹叅浠�'] // 鐘舵��
+ // 鑾峰彇瀹㈡湇openid鍙傛暟
+ getServiceOpenid: {
+ deptId: '',
+ filedId: ''
+ },
+ // 瀹㈡湇淇℃伅
+ serviceInfoObj: {
+ openId: null,
+ openName: ''
+ },
+ coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅鍦�', '鍑虹叅浠�', '鏀剧┖'], // 鐘舵��
+ weighHouseCode: '',
+ // 鏀剧┖寮圭獥鎺у埗鍙橀噺
+ evacuationModalShow: false,
+ evacuationTitle: '鏀剧┖纭',
+ evacuationContent: '鏄惁纭鏀剧┖',
+ // 绗竴娆℃斁绌哄弬鏁�
+ weighData: {
+ sceneId: '',
+ gateCameraId: '',
+ equipmentCode: '',
+ weigh: 0,
+ sceneInOut: ''
+ },
+ // 鍘熷彂淇℃伅
+ primarySkin: null,
+ primaryHair: null,
+ primaryClean: null,
+ scrollTop: 0
};
},
onShow() {
this.init();
},
computed: {
- userName() {
- return uni.getStorageSync('username');
+ ...mapState(['globalweigh', 'globalinfraredStatus']),
+ name() {
+ return uni.getStorageSync('name');
},
openid() {
return uni.getStorageSync('openid');
@@ -79,14 +172,32 @@
},
methods: {
init() {
- this.coalDayPage();
- this.getTakeCoal();
+ this.coalDayPage(); //鑾峰彇鏃ュ織
+ this.getTakeCoal(); //鑾峰彇鎻愮叅鍗曡鎯�
+ this.getgetService(); //鑾峰彇瀹㈡湇
+ },
+ // 鑾峰彇瀹㈡湇openid
+ getgetService() {
+ this.$reqGet('getCallOutList', this.getServiceOpenid).then(res => {
+ console.log(res, '瀹㈡湇openid');
+ if (res.code != 0) {
+ this.$u.toast('鑾峰彇瀹㈡湇淇℃伅澶辫触');
+ } else {
+ if (res.data.length > 0) {
+ this.serviceInfoObj.openId = res.data[0].openId;
+ this.serviceInfoObj.openName = res.data[0].openName;
+ uni.setStorageSync('customeropenId', this.serviceInfoObj.openId);
+ uni.setStorageSync('customerName', this.serviceInfoObj.openName);
+ }
+ }
+ });
},
// 鑾峰彇鎻愮叅鍗曡鎯�
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;
@@ -97,6 +208,15 @@
this.getYuYueDataParams.deptId = this.coalDetailsData.deptId;
this.getYuYueDataParams.filedId = this.coalDetailsData.filedId;
this.getYuYueDataParams.sendDate = this.coalDetailsData.sendDate;
+ // 鑾峰彇瀹㈡湇openId鍙傛暟璧嬪��
+ this.getServiceOpenid.deptId = this.coalDetailsData.deptId;
+ 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;
}
});
},
@@ -117,7 +237,9 @@
// 绛惧埌
arriveClick() {
uni.navigateTo({
- url: `/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock?orderPlanId=${this.orderPlanId}`
+ url: `/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock?orderPlanId=${this.orderPlanId}&coalStatus=${
+ this.currentPageCoalStatus
+ }&tmId=${this.getWeightHouseObj.tmId}`
});
},
// 鍏ュ満鐢宠
@@ -130,27 +252,97 @@
},
// 鍛煎彨瀹㈡湇
callCustomerService() {
- wx.join1v1Chat({
- caller: { nickname: this.userName, openid: this.openid },
- listener: { nickname: '瀹㈡湇', openid: 'orutI5YT0yEvARVngdsTmBpisWmw' }, // 杩欓噷鐨刼penid鏄痜yy鐨勶紝鍏呭綋鍥哄畾鐨勫鏈峯penid
- backgroundType: 2,
- roomType: 'voice'
+ // 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') }, // 杩欓噷鐨刼penid鏄痜yy鐨勶紝鍏呭綋鍥哄畾鐨勫鏈峯penid
+ backgroundType: 2,
+ roomType: 'voice',
+ success() {
+ console.log('涓�瀵逛竴鎴愬姛');
+ },
+ fail(err) {
+ console.log('涓�瀵逛竴澶辫触', err);
+ }
+ });
+ }
+ },
+ fail() {
+ console.log('鑾峰彇澶辫触');
+ }
});
+ },
+ 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 => {
console.log(res, '鑾峰彇纾呮埧');
if (res.code == 0) {
+ 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}`
+ 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}`
});
} else {
this.$u.toast('鏈湪纾呮埧锛岃鍓嶅線纾呮埧鍚庡啀璇曪紒锛�');
}
});
+ },
+ // 鏀剧┖
+ evacuation() {
+ this.evacuationModalShow = true;
+ },
+ // 鏀剧┖寮圭獥纭
+ 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, '绗竴娆℃斁绌�');
+ if (res.code == 0) {
+ this.$u.toast('鎿嶄綔鎴愬姛');
+ this.evacuationModalShow = false;
+ } else {
+ this.$u.toast('鎿嶄綔澶辫触锛岃绋嶅悗閲嶈瘯');
+ this.evacuationModalShow = false;
+ }
+ });
+ },
+ // 鏀剧┖寮圭獥鍙栨秷
+ evacuationCancel() {
+ this.evacuationModalShow = false;
}
}
};
@@ -164,30 +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%;
- box-sizing: border-box;
- overflow-y: overlay; //琛屼负涓� auto 鐩稿悓锛屼絾鏄粴鍔ㄦ潯缁樺埗鍦ㄥ唴瀹逛箣涓婏紝鑰屼笉鏄崰鎹┖闂淬��
- .u-text {
- margin-bottom: vww(5) !important;
- }
- view {
- margin-bottom: vww(5);
- }
- view:nth-of-type(1) {
- display: flex;
- }
- view:nth-of-type(2) {
- display: flex;
- }
- view:nth-of-type(3) {
- display: flex;
+ 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;
+ }
+ .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);
@@ -203,7 +438,7 @@
}
}
.utilsBox {
- padding: vww(20);
+ padding: vww(10) vww(20);
flex: 1;
display: flex;
flex-direction: column;
--
Gitblit v1.9.1