From 169e9b4d59bdd763bb5bd1b5a9b092a1200e327b Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 17 四月 2023 17:37:18 +0800
Subject: [PATCH] 增加原发信息,修复bug
---
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 95 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 84 insertions(+), 11 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 f829724..3b31d83 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
@@ -3,7 +3,7 @@
<view class="bangDanMessage">
<view class="">
<text>瀹㈡埛锛歿{ coalDetailsData.customerName || '' }}</text>
- <text>鐭垮巶锛歿{ coalDetailsData.deptName || '' }}</text>
+ <text>鐭垮満锛歿{ coalDetailsData.deptName || '' }}</text>
</view>
<view class="">
<text>鐨噸锛歿{ coalDetailsData.skin || '' }}</text>
@@ -11,7 +11,7 @@
<text>鍑�閲嶏細{{ coalDetailsData.clean || '' }}</text>
</view>
<view class="">
- <text>纾呭崟绫诲瀷锛歿{ coalDetailsData.orderTye || '' }}</text>
+ <text>纾呭崟绫诲瀷锛歿{ coalDetailsData.orderType || '' }}</text>
<text>鐘舵�侊細{{ coalStatus[coalDetailsData.status] }}</text>
</view>
<view class="">
@@ -28,16 +28,28 @@
<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 @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) {
if (value.orderPlanId && value.yyId) {
@@ -52,6 +64,7 @@
yyId: null,
dayRZ: [],
coalDetailsData: {}, // 鎻愮叅鍗曡鎯�
+ currentPageCoalStatus: 0, // 褰撳墠椤甸潰鎻愮叅鍗曠姸鎬�
// 鑾峰彇鎵�鍦ㄧ鎴垮弬鏁�
getWeightHouseObj: {
deptId: '',
@@ -76,13 +89,30 @@
openId: null,
openName: ''
},
- coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅鍦�', '鍑虹叅浠�'] // 鐘舵��
+ coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅鍦�', '鍑虹叅浠�', '鏀剧┖'], // 鐘舵��
+ weighHouseCode: '',
+ // 鏀剧┖寮圭獥鎺у埗鍙橀噺
+ evacuationModalShow: false,
+ evacuationTitle: '鏀剧┖纭',
+ evacuationContent: '鏄惁纭鏀剧┖',
+ // 绗竴娆℃斁绌哄弬鏁�
+ weighData: {
+ sceneId: '',
+ gateCameraId: '',
+ equipmentCode: '',
+ weigh: 0
+ },
+ // 鍘熷彂淇℃伅
+ primarySkin: null,
+ primaryHair: null,
+ primaryClean: null
};
},
onShow() {
this.init();
},
computed: {
+ ...mapState(['globalweigh', 'globalinfraredStatus']),
name() {
return uni.getStorageSync('name');
},
@@ -106,6 +136,8 @@
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);
}
}
});
@@ -114,7 +146,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;
@@ -128,6 +161,12 @@
// 鑾峰彇瀹㈡湇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;
}
});
},
@@ -148,7 +187,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}`
});
},
// 鍏ュ満鐢宠
@@ -180,7 +221,7 @@
} else {
wx.join1v1Chat({
caller: { nickname: uni.getStorageSync('name'), openid: uni.getStorageSync('openid') },
- listener: { nickname: '浠樺欢浣�', openid: 'oZjXk5e7G9uIvOzaTO6nFV51ALwk' }, // 杩欓噷鐨刼penid鏄痜yy鐨勶紝鍏呭綋鍥哄畾鐨勫鏈峯penid
+ listener: { nickname: uni.getStorageSync('customerName'), openid: uni.getStorageSync('customeropenId') }, // 杩欓噷鐨刼penid鏄痜yy鐨勶紝鍏呭綋鍥哄畾鐨勫鏈峯penid
backgroundType: 2,
roomType: 'voice',
success() {
@@ -210,15 +251,47 @@
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.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}&primaryClean=${this.primaryClean}`
});
} 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;
}
}
};
@@ -238,7 +311,7 @@
margin: vww(20);
margin-bottom: vww(10);
height: 40%;
- font-size: vww(16);
+ font-size: vww(18);
font-weight: 600;
view {
margin-bottom: vww(10);
--
Gitblit v1.9.1