From 3fd84886a15713ece1ba34954f49fd1e075ef7be Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 19 四月 2023 17:38:48 +0800
Subject: [PATCH] 改变称重监听，增加发运详情，修复电子提煤单错误
---
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 315 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 273 insertions(+), 42 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 27b78fa..e541d34 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,58 +1,181 @@
<template>
<view class="bill-of-lading-details">
- <view class="bangDanMessage"><text>纾呭崟淇℃伅</text></view>
+ <view class="bangDanMessage">
+ <view class="">
+ <text>瀹㈡埛锛歿{ coalDetailsData.customerName || '' }}</text>
+ <text>鐭垮満锛歿{ coalDetailsData.deptName || '' }}</text>
+ </view>
+ <view class="">
+ <text>鐨噸锛歿{ coalDetailsData.skin || '' }}</text>
+ <text>姣涢噸锛歿{ coalDetailsData.hair || '' }}</text>
+ <text>鍑�閲嶏細{{ coalDetailsData.clean || '' }}</text>
+ </view>
+ <view class="">
+ <text>纾呭崟绫诲瀷锛歿{ coalDetailsData.orderType || '' }}</text>
+ <text>鐘舵�侊細{{ coalStatus[coalDetailsData.status] }}</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="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 {
orderPlanId: null,
yyId: null,
- dayRZ: []
+ dayRZ: [],
+ coalDetailsData: {}, // 鎻愮叅鍗曡鎯�
+ currentPageCoalStatus: 0, // 褰撳墠椤甸潰鎻愮叅鍗曠姸鎬�
+ // 鑾峰彇鎵�鍦ㄧ鎴垮弬鏁�
+ getWeightHouseObj: {
+ deptId: '',
+ filedId: '',
+ tmId: '',
+ tmCode: '',
+ carNo: ''
+ },
+ // 鑾峰彇鍏ュ満鐢宠鐨勫垪琛ㄩ〉闈㈠弬鏁�
+ getYuYueDataParams: {
+ deptId: '',
+ filedId: '',
+ sendDate: ''
+ },
+ // 鑾峰彇瀹㈡湇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
};
},
onShow() {
this.init();
},
- computed:{
- userName(){
- return uni.getStorageSync('username')
+ computed: {
+ ...mapState(['globalweigh', 'globalinfraredStatus']),
+ name() {
+ return uni.getStorageSync('name');
},
- openid(){
- return uni.getStorageSync('openid')
+ openid() {
+ return uni.getStorageSync('openid');
}
},
methods: {
init() {
- this.coalDayPage();
+ 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) {
+ console.log(res, '鎻愮叅鍗曡鎯�');
+ this.coalDetailsData = res.data;
+ // 鑾峰彇鎵�鍦ㄧ鎴垮弬鏁拌祴鍊�
+ this.getWeightHouseObj.deptId = this.coalDetailsData.deptId;
+ this.getWeightHouseObj.filedId = this.coalDetailsData.filedId;
+ this.getWeightHouseObj.tmId = this.coalDetailsData.id;
+ this.getWeightHouseObj.tmCode = this.coalDetailsData.code;
+ this.getWeightHouseObj.carNo = this.coalDetailsData.carNo;
+ // 鑾峰彇鍏ュ満鐢宠鎿嶄綔鍚庣殑棰勭害鍒楄〃鐨勫弬鏁�
+ 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;
+ }
+ });
},
// 鏃ュ織鏌ヨ
coalDayPage() {
- this.$reqGet('coalDayPage').then(res => {
+ this.$reqGet('coalDayPage', { id: this.orderPlanId }).then(res => {
if (res.code == 0) {
- this.dayRZ = res.data.records;
+ this.dayRZ = res.data;
}
});
},
@@ -64,34 +187,114 @@
},
// 绛惧埌
arriveClick() {
- this.$reqPost('arrive', { id: this.orderPlanId }, 'params').then(res => {
- console.log(res, '绛惧埌');
+ uni.navigateTo({
+ url: `/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock?orderPlanId=${this.orderPlanId}&coalStatus=${
+ this.currentPageCoalStatus
+ }&tmId=${this.getWeightHouseObj.tmId}`
});
},
// 鍏ュ満鐢宠
rcsqClick() {
uni.navigateTo({
- url: `/pages/driver-page/appointment/appointment?takeCoalId=${this.orderPlanId}&type=鍏ュ満鐢宠&yyId=${this.yyId}`
+ url: `/pages/driver-page/appointment/appointment?type=鍏ュ満鐢宠&takeCoalId=${this.orderPlanId}&yyId=${this.yyId}&filedId=${this.getYuYueDataParams.filedId}&deptId=${
+ this.getYuYueDataParams.deptId
+ }&sendDate=${this.getYuYueDataParams.sendDate}`
});
},
// 鍛煎彨瀹㈡湇
- callCustomerService(){
- wx.join1v1Chat({
- caller: { nickname:this.userName , openid: this.openid },
- listener: { nickname: '瀹㈡湇', openid: 'orutI5YT0yEvARVngdsTmBpisWmw' }, // 杩欓噷鐨刼penid鏄痜yy鐨勶紝鍏呭綋鍥哄畾鐨勫鏈峯penid
- backgroundType: 2,
- roomType: 'voice'
+ callCustomerService() {
+ // 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() {
- uni.navigateTo({
- url:`/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice?takeCoalId=${this.orderPlanId}`
- })
+ 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}&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;
}
- /**
- * @desc 绛夊緟鍙栫叅鍗曟帴鍙�
- * */
}
};
</script>
@@ -103,22 +306,50 @@
margin: 0 auto;
display: flex;
flex-direction: column;
-
.bangDanMessage {
- font-size: vww(20);
- font-weight: 500;
+ padding: vww(10);
border: vww(2) solid #dddddd;
border-radius: vww(20);
margin: vww(20);
margin-bottom: vww(10);
- flex: 1;
- display: flex;
- flex-direction: row;
- align-items: center;
- justify-content: center;
+ 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: 45%;
+ height: 25%;
margin: vww(20);
margin-top: vww(10);
margin-bottom: vww(10);
@@ -127,12 +358,12 @@
padding: vww(20);
box-sizing: border-box;
overflow-y: overlay; //琛屼负涓� auto 鐩稿悓锛屼絾鏄粴鍔ㄦ潯缁樺埗鍦ㄥ唴瀹逛箣涓婏紝鑰屼笉鏄崰鎹┖闂淬��
- .u-text{
- margin-bottom: vww(5)!important;
+ .u-text {
+ margin-bottom: vww(5) !important;
}
}
.utilsBox {
- padding: vww(20);
+ padding: vww(10) vww(20);
flex: 1;
display: flex;
flex-direction: column;
--
Gitblit v1.9.1