From 82fa9121ff649bb681fc55e482fe405c5ce0d4d0 Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期三, 22 三月 2023 13:48:29 +0800
Subject: [PATCH] 称重界面完成（上磅计量页面完成）
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 102 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 83 insertions(+), 19 deletions(-)
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
index d27cf67..411d631 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
@@ -25,15 +25,18 @@
<view class="two">
<p>璁㈠崟缂栧彿锛歿{ weighList.code || '' }}</p>
<p>璁㈠崟绫诲瀷锛歿{ weighList.orderTye || '' }}</p>
- <p>璁㈠崟浣欓噺锛歿{ weighList.allowance }}</p>
- <p>鐨噸锛歿{ weighList.skin || '' }}</p>
- <p>姣涢噸锛歿{ weighList.hair || '' }}</p>
- <p>鍑�閲嶏細{{ weighList.clean || '' }}</p>
+ <p>璁㈠崟浣欓噺锛歿{ weighList.orderSurplus }}</p>
+ <p>鐨噸锛歿{ weighList.skin || 0 }}</p>
+ <p>姣涢噸锛歿{ weighList.hair || 0 }}</p>
+ <p>鍑�閲嶏細{{ weighList.skin == 0 && weighList.hair == 0 ? weighList.clean : weighList.skin != 0 ? realTimeWeigh - weighList.skin : weighList.hair - realTimeWeigh }}</p>
+ <p>鐓ょ鍚嶇О锛歿{ weighList.coalName }}</p>
+ <p>鍗曚綅鍚嶇О锛歿{ weighList.deptName }}</p>
+ <p>鐭垮満鍚嶇О锛歿{ weighList.filedName }}</p>
</view>
<view class="three">
<!-- 澶栭攢璁㈠崟鎴愮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
- <u-button type="primary" text="纭畾绉伴噸" @click="confirmWeigh"></u-button>
- <u-button type="primary" text="杩斿洖鍔犲噺鍚�"></u-button>
+ <u-button type="primary" text="纭畾绉伴噸" :loading="isConfirmWeighLoading" loadingText="鍔犺浇涓�" @click="confirmWeigh"></u-button>
+ <u-button type="primary" text="杩斿洖鍔犲噺鍚�" :disabled="addAndSubtractCoalDisabled" v-if="weighList.orderTye == '澶栭攢'" @click="addAndSubtractCoal"></u-button>
</view>
<view class="four">濡傛偍闇�瑕佽皟鏁磋杞借揣鍝佸惃鏁帮紝璇风偣鍑昏繑鍥炲姞鍑忓惃</view>
</view>
@@ -48,7 +51,7 @@
this.weighData.sceneId = params.sceneId;
this.weighData.gateCameraId = params.gateCameraId;
this.weighData.equipmentCode = params.gateCameraCode;
- this.weighCode = params.weighCode;
+ this.weighHouseCode = params.weighHouseCode;
},
data() {
return {
@@ -60,11 +63,12 @@
carNo: '',
gateCameraId: '',
equipmentCode: '',
- weigh: '',
+ weigh: 0,
tmCode: ''
},
takeCoalId: null,
- weighCode: '',
+ weighHouseCode: '',
+ isConfirmWeighLoading: false, //纭畾绉伴噸鎸夐挳
realTimeWeigh: '',
weighList: {},
webSocket: null // webSocket瀹炰緥
@@ -87,6 +91,15 @@
computed: {
token() {
return uni.getStorageSync('token');
+ },
+ addAndSubtractCoalDisabled() {
+ if (this.weighList.orderTye == '澶栭攢') {
+ if (this.weighList.skin == 0) {
+ return true;
+ } else if (this.weighList.skin != 0) {
+ return false;
+ }
+ }
}
},
methods: {
@@ -107,10 +120,58 @@
* @纭绉伴噸绛夊緟鍚庣鎻愪緵瀹炴椂绉伴噸鎺ュ彛锛岃幏鍙栫毊閲嶏紝姣涢噸
*/
confirmWeigh() {
- console.log('纭绉伴噸', this.weighData);
- this.$reqPost('saveWeigh',this.weighData,'json').then(res=>{
- console.log(res,"纭绉伴噸");
- })
+ if (this.isConfirmWeighLoading == false) {
+ this.isConfirmWeighLoading = true;
+ if (this.weighData.weigh != 0) {
+ if (this.weighList.orderTye == '澶栭攢') {
+ if (this.weighList.skin ? (this.weighList.skin < this.realTimeWeigh ? true : false) : true) {
+ this.saveWeigh();
+ } else {
+ this.$u.toast('姣涢噸涓嶈兘灏忎簬鐨噸');
+ this.isConfirmWeighLoading = false;
+ }
+ } else {
+ this.saveWeigh();
+ }
+ } else {
+ this.$u.toast('鏈兘鑾峰彇鍦扮閲嶉噺');
+ this.isConfirmWeighLoading = false;
+ }
+ }
+ },
+ // 纭绉伴噸鎺ュ彛
+ saveWeigh() {
+ this.$reqPost('saveWeigh', this.weighData, 'json')
+ .then(res => {
+ if (res.code == 0) {
+ this.$u.toast('绉伴噸鎴愬姛');
+ setTimeout(() => {
+ uni.navigateBack({
+ delta: 1
+ });
+ this.isConfirmWeighLoading = false;
+ }, 1000);
+ }
+ })
+ .catch(err => {
+ this.isConfirmWeighLoading = false;
+ console.log(err);
+ });
+ },
+ // 鍔犲噺鐓�
+ addAndSubtractCoal() {
+ this.$reqPost('addAndSubtractCoal', { deptId: this.weighData.deptId, sceneId: this.weighData.sceneId, carNo: this.weighData.carNo }, 'json').then(res => {
+ if (res.code == 0) {
+ this.$u.toast('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�')
+ setTimeout(() => {
+ uni.navigateBack({
+ delta: 1
+ });
+ this.isConfirmWeighLoading = false;
+ }, 1000);
+ console.log(res, '鍔犲噺鐓�');
+ }
+ });
},
/**
* 鍒濆鍖� weoSocket
@@ -131,18 +192,21 @@
console.log('onOpen');
});
socket.onMessage(res => {
+ // 鑾峰彇鏈嶅姟鍣ㄤ紶鏉ョ殑鏁版嵁锛屽仛鐩稿簲澶勭悊
console.log('socketWeigh', res);
let nowWeigh = JSON.parse(res.data.slice(7)).weigh;
- // if (nowWeigh.eqCode == this.weighCode) {
- // this.weighData.weigh = this.realTimeWeigh = nowWeigh;
- // }
- this.weighData.weigh = this.realTimeWeigh = nowWeigh;
- }); // 鑾峰彇鏈嶅姟鍣ㄤ紶鏉ョ殑鏁版嵁锛屽仛鐩稿簲澶勭悊
+ let nowWeighHouseCode = JSON.parse(res.data.slice(7)).eqCode;
+ if (nowWeighHouseCode == this.weighHouseCode) {
+ this.weighData.weigh = this.realTimeWeigh = nowWeigh;
+ }
+ });
socket.onClose(() => {
- console.log('close');
+ console.log('webSocketClose');
+ this.$u.toast('纾呮埧鎺ュ彛缁堢');
});
socket.onError(err => {
console.log('socket鎶ラ敊', err);
+ this.$u.toast('纾呮埧鎺ュ彛鏆傛椂涓嶈兘浣跨敤锛岃閲嶆柊杩涘叆璇ラ〉闈紝閲嶈瘯锛侊紒');
});
}
}
--
Gitblit v1.9.1