From 2adce788c1a411959b81f08d5569d92861c7f300 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 17 十月 2023 16:54:52 +0800
Subject: [PATCH] 删除无用代码 修改部分逻辑 调整部分样式
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 288 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 172 insertions(+), 116 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 82a486f..ea56d85 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
@@ -5,7 +5,6 @@
background-size: cover;">
<view class="top">
<view class="top_left">
- <!-- <text>{{ realTimeWeigh }}</text> -->
<text>{{ globalweigh }}</text>
</view>
<view class="top_right">
@@ -26,56 +25,8 @@
<view class="bottom"><text>TIP:褰撳墠鐘舵�佷负姝ｅ父鏃跺彲浠ョО閲�</text></view>
</view>
<view class="middle-block"
- v-if="firstHairCustomernameShow || sideline">
- <view class="block-main"
- v-if="firstHairCustomernameShow">
- <view class="first-line"><combined-title title="鍘熷彂淇℃伅"></combined-title></view>
- <view class="second-line">
- <view class="label-text"
- :class="{ focusClass: isfocus1 }">鐨噸</view>
- <view class="input-container"
- :class="{ inputClass: isfocus1, disabledClass: haveInputOrigin }">
- <u--input placeholder="璇疯緭鍏ョ毊閲�"
- border="surround"
- v-model="weighData.coalContactSkin"
- @focus="inputFocus(1)"
- @blur="inputBlur"
- @change="inputChange"
- :disabled="haveInputOrigin"></u--input>
- </view>
- <view class="unit"
- :class="{ focusClass: isfocus1 }">鍚�</view>
- </view>
- <view class="second-line">
- <view class="label-text"
- :class="{ focusClass: isfocus2 }">姣涢噸</view>
- <view class="input-container"
- :class="{ inputClass: isfocus2, disabledClass: haveInputOrigin }">
- <u--input placeholder="璇疯緭鍏ユ瘺閲�"
- border="surround"
- v-model="weighData.coalContactHair"
- @focus="inputFocus(2)"
- @blur="inputBlur"
- @change="inputChange"
- :disabled="haveInputOrigin"></u--input>
- </view>
- <view class="unit"
- :class="{ focusClass: isfocus2 }">鍚�</view>
- </view>
- <view class="second-line">
- <view class="label-text">鍑�閲�</view>
- <view class="input-container"
- :class="{ disabledClass: haveInputOrigin }">
- <u--input placeholder="鍑�閲�"
- border="surround"
- v-model="coalContactClean"
- :disabled="haveInputOrigin"></u--input>
- </view>
- <view class="unit">鍚�</view>
- </view>
- </view>
- <view class="block-sideline"
- v-if="sideline">
+ v-if="sideline">
+ <view class="block-sideline">
<view class="first-line"><combined-title title="鍘熷彂淇℃伅"></combined-title></view>
<view class="weigh-item">
<view class="item">
@@ -211,6 +162,26 @@
</view>
</view>
</view>
+ <view v-show="mergeStateShow">
+ <view class="mergeState">
+ <view class="merge-wrap">
+ <view>鏄惁纭鍚堝苟</view>
+ <view class="merge-checkbox">
+ <u-checkbox-group v-model="checkboxValue1"
+ placement="column"
+ @change="mergeStateChange">
+ <u-checkbox :customStyle="{marginBottom: '8px'}"
+ :label="mergeState?'纭':'鍙栨秷'"
+ name="confirm"
+ label-size="30"
+ size="30"
+ activeColor="#48a2ff">
+ </u-checkbox>
+ </u-checkbox-group>
+ </view>
+ </view>
+ </view>
+ </view>
<view class="three">
<!-- 鏀剧┖ -->
<u-button type="primary"
@@ -218,22 +189,32 @@
plain
@click="evacuation"
throttleTime="500"
- :disabled="!isEvacuation"
+ :loading="TwoEvacuationLoading"
v-if='weighList.skin||weighList.hair'></u-button>
<!-- 澶栭攢璁㈠崟绉扮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
<u-button type="primary"
text="纭畾绉伴噸"
- :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh || !isInputOrigin||!mergeState"
+ :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh ||!mergeState||globalWarning"
:loading="isConfirmWeighLoading"
loadingText="纭"
@click="confirmWeigh"
throttleTime="800"></u-button>
<u-button type="primary"
- text="杩斿洖鍔犲噺鍚�"
+ text="杩斿洖瑁呭嵏"
:disabled="addAndSubtractCoalDisabled"
@click="addAndSubtractCoal"
class="jiajian"
- v-if="outBuy"></u-button>
+ v-if="outBuy||!isSkinWeigh"
+ :loading="addAndSubtractCoalLoading"></u-button>
+ </view>
+ <view v-show="isExceedOrigin"
+ style="color: #ff6363;width: auto;margin: 0 auto;">
+ <text v-if="weighList.orderType == '澶栬喘'">瓒呭嚭鍘熷彂姣涢噸,纾呮埧浜哄憳纭涓�,璇峰嬁绂诲紑姝ら〉闈�</text>
+ <text v-else>瓒呭嚭鏈�澶ф瘺閲�,纾呮埧浜哄憳纭涓�,璇峰嬁绂诲紑姝ら〉闈�</text>
+ </view>
+ <view v-show="afterEvacuationStatus"
+ style="color: #ff6363;width: auto;margin: 0 auto;">
+ <text>{{afterEvacuationText}}</text>
</view>
<!-- 鏀剧┖寮圭獥 -->
<view class="evacuationModal">
@@ -248,9 +229,8 @@
<view class="">
<u-modal :show="abnormalModalShow"
title="寮傚父鍘熷洜"
- :showCancelButton="true"
+ :showCancelButton="false"
@confirm="abnormalConfirm"
- @cancel="abnormalCancel"
confirmText="鎻愪氦">
<view class="slot-content">
<u--form labelPosition="top"
@@ -270,19 +250,17 @@
</view>
</u-modal>
</view>
- <view class="mergeState">
- <u-modal :show="mergeStateShow"
- title="鍚堝崱纭"
- content="鏄惁纭鍚堝崱"
- :showCancelButton="true"
- @confirm="mergeConfirm"
- @cancel="mergeCancel"></u-modal>
+ <!-- 纭鍚庣О閲嶆彁绀哄脊绐� -->
+ <view class="">
+ <u-modal :show="confirmWeighVisiable"
+ title="鎻愮ず"
+ :content="confirmWeighContent"
+ @confirm="confirmWeighConfirm"></u-modal>
</view>
</view>
</template>
<script>
- let socket = null;
import { webSocketUrl } from '@/api/request.js';
import { mapState, mapMutations } from 'vuex';
import combinedTitle from '@/components/combined-title/combined-title.vue';
@@ -306,6 +284,26 @@
this.changeWeigh('')
this.realTimeWeigh = 0
},
+ onShow() {
+ if (this.timer) {
+ clearTimeout(this.timer)
+ }
+ this.timer = setTimeout(() => {
+ if (!this.globalweigh) {
+ console.log('绉伴噸鏃惰嚜鍔ㄩ噸杩�');
+ this.socketTask.close();
+ this.changesocketTask(null);
+ this.changereconnectNum({ connectNum: 1, isWeigh: true })
+ this.$store.dispatch('websocketInit');
+ }
+ }, 3000)
+ },
+ onHide() {
+ clearTimeout(this.timer)
+ },
+ onUnload() {
+ clearTimeout(this.timer)
+ },
components: {
combinedTitle
},
@@ -325,12 +323,9 @@
coalContactClean: 0,
coalContactHair: 0,
coalContactSkin: 0,
- isMerge: 0 //1鏄� 0涓嶆槸 榛樿0 鏄惁鍚堝崱
+ isMerge: '0', //1鏄� 0涓嶆槸 榛樿0 鏄惁鍚堝崱
+ isBackground: '0'
},
- // 鏄惁濉啓鍘熷彂淇℃伅
- isInputOrigin: false,
- haveInputOrigin: false,
-
takeCoalId: null,
weighHouseCode: '',
isConfirmWeighLoading: false, //纭畾绉伴噸鎸夐挳
@@ -356,11 +351,6 @@
orderSurplusLess: false,
// 澶栬喘绫诲瀷绉伴噸濉啓姣涳紝鐨紝
firstHairCustomernameShow: false,
- coalContactHair: '',
- coalContactSkin: '',
- // 鑱氱劍鏃舵敼鍙樻牱寮�
- isfocus1: false,
- isfocus2: false,
// 澶栬喘绗竴娆＄О姣涢噸涓嶉渶瑕佸姞鍑忓惃
outBuy: true,
// 鐨噸寮傚父鐩稿叧
@@ -396,6 +386,14 @@
},
mergeState: true, //鍚堝崱鐘舵��
mergeStateShow: false, //鍚堝崱寮圭獥
+ checkboxValue1: [],
+ isExceedOrigin: false, //鏄惁瓒呭嚭姣涢噸
+ refreshLoading: false,
+ timer: null,
+ afterEvacuationStatus: null, //鏀剧┖鍚庢彁鐓ゅ崟鐘舵�佺姸鎬佷负21鏃舵彁绀衡�樼瓑寰呯鎴跨‘璁も��
+ afterEvacuationText: '',
+ TwoEvacuationLoading: false,
+ addAndSubtractCoalLoading: false
};
},
watch: {
@@ -408,16 +406,22 @@
.orderType ==
'杞嚭') {
if (this.weighList.skin == 0) {
- this.isSkinWeigh = true
+ this.isSkinWeigh = true //绉扮毊娌℃湁杩斿洖瑁呭嵏
+ this.outBuy = false //绉扮毊娌℃湁杩斿洖瑁呭嵏
this.temporaryWeighObj.skin = newV;
let xx = new BigNumber(this.avgSkin)
let yy = new BigNumber(newV)
- this.errorTipShow = xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2
+ this.errorTipShow = (xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2) &&
+ this.avgSkin !== 0
} else {
this.isSkinWeigh = false;
+ this.outBuy = true;
this.temporaryWeighObj.hair = newV;
- this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.weighList.skin).toFixed(
- 2);
+ let x = new BigNumber(this.temporaryWeighObj.hair)
+ let y = new BigNumber(this.weighList.skin)
+ this.temporaryWeighObj.clean = x.minus(y).toNumber().toFixed(2)
+ // this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.weighList.skin).toFixed(
+ // 2);
this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
.temporaryWeighObj
.clean < 0;
@@ -428,15 +432,21 @@
.orderType == '杞叆') {
if (this.weighList.hair == 0) {
this.isSkinWeigh = false;
+ this.outBuy = true;
this.temporaryWeighObj.hair = newV;
} else {
- this.isSkinWeigh = true;
+ this.isSkinWeigh = true; //绉扮毊娌℃湁杩斿洖瑁呭嵏
+ this.outBuy = false //绉扮毊娌℃湁杩斿洖瑁呭嵏
this.temporaryWeighObj.skin = newV;
let xx = new BigNumber(this.avgSkin)
let yy = new BigNumber(newV)
- this.errorTipShow = xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2
- this.temporaryWeighObj.clean = (this.weighList.hair - this.temporaryWeighObj.skin).toFixed(
- 2);
+ this.errorTipShow = (xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2) &&
+ this.avgSkin !== 0;
+ let x = new BigNumber(this.weighList.hair)
+ let y = new BigNumber(this.temporaryWeighObj.skin)
+ this.temporaryWeighObj.clean = x.minus(y).toNumber().toFixed(2)
+ // this.temporaryWeighObj.clean = (this.weighList.hair - this.temporaryWeighObj.skin).toFixed(
+ // 2);
this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
.temporaryWeighObj
.clean < 0;
@@ -445,10 +455,12 @@
}
}
}
- }
+ },
},
computed: {
- ...mapState(['globalweigh', 'globalinfraredStatus']),
+ ...mapState(['globalweigh', 'globalinfraredStatus', 'globalisconnect', 'globalisUploadimg', 'globalisLogin',
+ 'is_open_socket', 'socketTask', 'confirmWeighVisiable', 'confirmWeighContent', 'globalWarning'
+ ]),
coalContactClean() {
let xx = BigNumber(this.weighData.coalContactHair)
let yy = BigNumber(this.weighData.coalContactSkin)
@@ -476,8 +488,11 @@
return this.weighList.orderType == '鍐呰喘' || this.weighList.orderType == '杞叆';
}
},
+
methods: {
- ...mapMutations(['changeweighHouseCode', 'changeisLogin', 'changeWeigh']),
+ ...mapMutations(['changeweighHouseCode', 'changeisLogin', 'changeWeigh', 'changeconfirmWeighVisiable',
+ 'changesocketTask', 'changereconnectNum'
+ ]),
init() {
uni.showLoading({
title: "鍔犺浇涓�"
@@ -534,6 +549,7 @@
let yy = new BigNumber(this.globalweigh)
if (xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2) {
this.abnormalModalShow = true
+ this.skinAbnormal()
} else {
this.saveWeigh();
}
@@ -555,13 +571,15 @@
.then(res => {
console.log(res, '绉伴噸鎺ュ彛');
if (res.code == 0) {
- this.$u.toast('绉伴噸鎴愬姛');
+ this.$u.toast('绉伴噸鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
+ this.isConfirmWeighLoading = false;
setTimeout(() => {
uni.navigateBack({
delta: 1
});
- this.isConfirmWeighLoading = false;
}, 1000);
+ } else if (res.code === 3) {
+ this.isExceedOrigin = true
} else {
this.$u.toast(res.msg ? res.msg : '绉伴噸澶辫触锛岃绋嶅悗閲嶈瘯');
this.isConfirmWeighLoading = false
@@ -574,6 +592,7 @@
},
// 鍔犲噺鐓�
addAndSubtractCoal() {
+ this.addAndSubtractCoalLoading = true
this.$reqPost('addAndSubtractCoal', {
deptId: this.weighData.deptId,
sceneId: this.weighData.sceneId,
@@ -584,6 +603,7 @@
weigh: this.weighData.weigh
}, 'json').then(res => {
if (res.code == 0) {
+ this.addAndSubtractCoalLoading = false
this.$u.toast('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
setTimeout(() => {
uni.navigateBack({
@@ -591,7 +611,8 @@
});
this.isConfirmWeighLoading = false;
}, 1000);
- console.log(res, '鍔犲噺鐓�');
+ } else {
+ this.$u.toast(res.msg ? res.msg : '鎿嶄綔澶辫触');
}
});
},
@@ -601,19 +622,24 @@
},
// 鏀剧┖寮圭獥纭
evacuationConfirm() {
+ this.TwoEvacuationLoading = true;
this.$reqPost('getTwoEvacuation', this.weighData, 'json').then(res => {
console.log(res, '绗簩娆℃斁绌�');
- if (res.code == 0) {
- this.$u.toast('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
+ if (res.msg.length > 4) { //澶т簬4鏄瓑寰呭悗鍙扮‘璁�
+ this.TwoEvacuationLoading = true;
+ this.evacuationModalShow = false;
+ this.afterEvacuationStatus = res.data.status === 21 || res.data.status === 22
+ this.afterEvacuationText = res.msg
+
+ } else { //灏忎簬4鎴愬姛
+ this.TwoEvacuationLoading = false;
+ this.evacuationModalShow = false;
+ this.$u.toast('鎿嶄綔鎴愬姛,鍗冲皢杩斿洖涓婁竴椤�');
setTimeout(() => {
uni.navigateBack({
delta: 1
});
}, 1000);
- this.evacuationModalShow = false;
- } else {
- this.$u.toast(res.msg ? res.msg : '鎿嶄綔澶辫触');
- this.evacuationModalShow = true;
}
});
},
@@ -667,28 +693,36 @@
// 鎻愪氦寮傚父鍘熷洜
abnormalConfirm() {
this.weighData.abnormalText = this.abnormalContent
- this.skinAbnormal()
this.saveWeigh()
+ this.abnormalModalShow = false
},
skinAbnormal() {
- this.$reqPost('skinAbnormal', { sceneId: this.weighData.sceneId }, 'params').then(() => {
- this.abnormalModalShow = false
- })
+ this.$reqPost('skinAbnormal', { sceneId: this.weighData.sceneId, tmId: this.weighData.tmId }, 'params')
},
- mergeConfirm() {
- this.mergeStateShow = false
- this.weighData.isMerge = 1
- this.MergeState = true
- this.isweigh = false
- this.orderSurplusLess = false
+ mergeStateChange(e) {
+ if (e.length !== 0) {
+ this.weighData.isMerge = 1
+ this.MergeState = true
+ this.isweigh = false
+ this.orderSurplusLess = false
+ } else {
+ this.weighData.isMerge = 0
+ this.MergeState = false
+ this.isweigh = true
+ this.orderSurplusLess = true
+ }
},
- mergeCancel() {
- this.mergeStateShow = false
- this.weighData.isMerge = 0
- this.MergeState = false
- this.isweigh = true
- this.orderSurplusLess = true
- },
+ confirmWeighConfirm() {
+ this.changeconfirmWeighVisiable(false)
+ this.isConfirmWeighLoading = false
+ this.TwoEvacuationLoading = false;
+ setTimeout(() => {
+ this.$u.toast('鍗冲皢杩斿洖涓婁竴椤�'),
+ uni.navigateBack({
+ delta: 1
+ })
+ }, 800)
+ }
}
};
</script>
@@ -893,7 +927,7 @@
width: calc(100% - 60rpx);
box-sizing: border-box;
height: 630rpx;
- margin: 0 vww(15) vww(45) vww(15);
+ margin: 0 vww(15) vww(15) vww(15);
background: #ffffff;
box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
border-radius: 20rpx;
@@ -940,6 +974,29 @@
}
}
+ .mergeState {
+ width: 100%;
+ margin: vww(4) 0;
+ margin-bottom: vww(10);
+ display: flex;
+ justify-content: center;
+ font-size: vww(16);
+ overflow: hidden;
+
+ .merge-wrap {
+ width: vww(200);
+ height: vww(30);
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+
+ .merge-checkbox {
+ margin-top: vww(10);
+ }
+ }
+
+ }
+
.three {
margin: 0 auto vww(30);
flex: 0.7;
@@ -958,9 +1015,8 @@
}
.four {
- width: 100%;
- margin-top: vww(5);
- text-align: center;
+ width: vww(80);
+ margin: 0 auto;
}
.slide-fade-enter-active {
--
Gitblit v1.9.1