From 40a7d8db73f81ad10de03684dc9f6720e18cc315 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 08 八月 2023 16:11:14 +0800
Subject: [PATCH] 称重异常修改
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 203 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 141 insertions(+), 62 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 7a5cade..8a414af 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
@@ -101,6 +101,47 @@
</view>
<view v-else
style="width: 100%;height: 40rpx;"></view>
+ <view class="history-utils">
+ <view class="history-utils_item">
+ 骞冲潎鐨噸:{{avgSkin}}
+ </view>
+ <view class="history-utils_item btn">
+ <u-button plain
+ type="primary"
+ :text="historyShow?'闅愯棌鍘嗗彶绉伴噸':'鏄剧ず鍘嗗彶绉伴噸'"
+ @click="historyShow=!historyShow"></u-button>
+ </view>
+ </view>
+ <Transition name="slide-fade">
+ <view class="history-skin"
+ v-show="historyShow">
+ <view class="table-title">
+ <view class="table-title_item time">
+ 绉伴噸鏃堕棿
+ </view>
+ <view class="table-title_item coal-name">
+ 鐓ょ鍚嶇О
+ </view>
+ <view class="table-title_item skin">
+ 鐨噸閲嶉噺
+ </view>
+ </view>
+ <view class="history-skin_item"
+ v-for="item in tmTaskCoalList">
+ <view class="item createTime">
+ {{item.createTime}}
+ </view>
+ <view class="item">
+ {{item.coalName}}
+ </view>
+ <view class="item skin">
+ <view class="">
+ {{item.skin}}
+ </view>
+ </view>
+ </view>
+ </view>
+ </Transition>
<view class="bottom-block">
<view class="block-main">
<view class="main-information"
@@ -175,8 +216,7 @@
:disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh || !isInputOrigin"
:loading="isConfirmWeighLoading"
loadingText="纭"
- @click="confirmWeigh"
- v-if="!historyBtn"></u-button>
+ @click="confirmWeigh"></u-button>
<u-button type="primary"
text="杩斿洖鍔犲噺鍚�"
:disabled="addAndSubtractCoalDisabled"
@@ -184,29 +224,6 @@
class="jiajian"
v-if="outBuy"></u-button>
</view>
- <view style="width: 200rpx;margin: auto;position: relative;"
- v-if="historyBtn"><u-button type="primary"
- text="鏄剧ず鍘嗗彶鐨噸"
- @click.stop="displayHistory"></u-button></view>
- <Transition name="slide-fade">
- <view class="history-skin"
- v-if="historyShow">
- <view class="history-skin_item"
- v-for="item in tmTaskCoalList">
- <view class="createTime">
- 鏃ユ湡:{{item.createTime.slice(0,10)}}
- </view>
- <view class="skin">
- <view class="">
- 鐨噸:
- </view>
- <view class="">
- {{item.skin}}
- </view>
- </view>
- </view>
- </view>
- </Transition>
<!-- 鏀剧┖寮圭獥 -->
<view class="evacuationModal">
<u-modal :show="evacuationModalShow"
@@ -263,6 +280,9 @@
this.weighData.overTmWaixiao = 1
}
this.changeweighHouseCode(params.weighHouseCode);
+ this.init();
+ this.changeWeigh('')
+ this.realTimeWeigh = 0
},
components: {
combinedTitle
@@ -321,11 +341,13 @@
outBuy: true,
// 鐨噸寮傚父鐩稿叧
abnormalContent: '',
- avgSkin: null, // 骞冲潎鐨噸
+ avgSkin: '', // 骞冲潎鐨噸
tmTaskCoalList: [],
abnormalModalShow: false,
historyBtn: false,
- historyShow: false
+ historyShow: true,
+ // 鏄惁鍦ㄧО鐨噸锛岀偣鍑荤‘瀹氱О閲嶅垽鏂槸鍚﹀紓甯�
+ isSkinWeigh: false
};
},
watch: {
@@ -341,9 +363,10 @@
.orderType ==
'杞嚭') {
if (this.weighList.skin == 0) {
+ this.isSkinWeigh = true
this.temporaryWeighObj.skin = newV;
- this.getAverageSkin(newV)
} else {
+ this.isSkinWeigh = false;
this.temporaryWeighObj.hair = newV;
this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.weighList.skin).toFixed(
2);
@@ -354,10 +377,11 @@
} else if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList
.orderType == '杞叆') {
if (this.weighList.hair == 0) {
+ this.isSkinWeigh = false;
this.temporaryWeighObj.hair = newV;
} else {
+ this.isSkinWeigh = true;
this.temporaryWeighObj.skin = newV;
- this.getAverageSkin(newV)
this.temporaryWeighObj.clean = (this.weighList.hair - this.temporaryWeighObj.skin).toFixed(
2);
this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
@@ -367,14 +391,6 @@
}
}
}
- },
- onShow() {
- this.init();
- this.changeisLogin(true)
- this.realTimeWeigh = 0
- },
- onHide() {
-
},
computed: {
...mapState(['globalweigh', 'globalinfraredStatus']),
@@ -406,7 +422,7 @@
}
},
methods: {
- ...mapMutations(['changeweighHouseCode', 'changeisLogin']),
+ ...mapMutations(['changeweighHouseCode', 'changeisLogin', 'changeWeigh']),
init() {
uni.showLoading({
title: "鍔犺浇涓�"
@@ -440,7 +456,9 @@
uni.hideLoading()
this.$u.toast('鍔犺浇澶辫触')
}
- });
+ }).then(() => {
+ this.getAverageSkin()
+ })
},
/**
* @纭绉伴噸绛夊緟鍚庣鎻愪緵瀹炴椂绉伴噸鎺ュ彛锛岃幏鍙栫毊閲嶏紝姣涢噸
@@ -449,16 +467,28 @@
if (this.isConfirmWeighLoading == false) {
this.isConfirmWeighLoading = true;
if (this.weighData.weigh != 0) {
- if (this.weighList.orderType == '澶栭攢') {
- if (this.weighList.skin ? (this.weighList.skin < this.realTimeWeigh ? true : false) : true) {
- this.saveWeigh();
+ if (this.isSkinWeigh) {
+ let xx = new BigNumber(this.avgSkin)
+ let yy = new BigNumber(this.globalweigh)
+ if (xx.minus(yy).toNumber() > 0.2) {
+ this.abnormalModalShow = true
} else {
- this.$u.toast('姣涢噸涓嶈兘灏忎簬鐨噸');
- this.isConfirmWeighLoading = false;
+ this.abnormalModalShow = false
+ this.saveWeigh();
}
} else {
this.saveWeigh();
}
+ // if (this.weighList.orderType == '澶栭攢') {
+ // 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;
@@ -548,7 +578,7 @@
this.isInputOrigin = true;
}
},
- getAverageSkin(weigh) {
+ getAverageSkin() {
uni.showLoading({
title: "鍔犺浇涓�"
})
@@ -557,13 +587,13 @@
uni.hideLoading()
this.avgSkin = res.data.avgSkin
this.tmTaskCoalList = res.data.tmTaskCoalList
- let xx = new BigNumber(this.avgSkin)
- let yy = new BigNumber(weigh)
- console.log(weigh, this.avgSkin, yy.minus(xx).toNumber());
- if (xx.minus(yy).toNumber() <= 0.2) {
- this.abnormalModalShow = true
- this.historyBtn = true
- }
+ // let xx = new BigNumber(this.avgSkin)
+ // let yy = new BigNumber(weigh)
+ // console.log(weigh, this.avgSkin, yy.minus(xx).toNumber());
+ // if (xx.minus(yy).toNumber() <= 0.2) {
+ // this.abnormalModalShow = true
+ // this.historyBtn = true
+ // }
} else {
uni.hideLoading()
this.$u.toast('鍔犺浇澶辫触')
@@ -572,6 +602,7 @@
},
abnormalCancel() {
this.abnormalModalShow = false
+ this.isConfirmWeighLoading = false;
},
// 鎻愪氦寮傚父鍘熷洜
abnormalConfirm() {
@@ -585,17 +616,21 @@
uni.hideLoading()
this.$u.toast('鎻愪氦鎴愬姛')
this.abnormalModalShow = false
+ this.isConfirmWeighLoading = false
+ setTimeout(() => {
+ uni.navigateBack({
+ delta: 1
+ });
+ }, 1000);
+
} else {
uni.hideLoading()
this.$u.toast('鎻愪氦澶辫触')
this.abnormalModalShow = true
+ this.isConfirmWeighLoading = false
}
})
},
- displayHistory() {
- this.historyShow = true
-
- }
}
};
</script>
@@ -617,6 +652,31 @@
.slot-content {
width: 96%;
border: 1rpx solid rgb(220, 223, 230);
+ }
+
+ .table-title {
+ width: 96%;
+ @include flex;
+ position: absolute;
+ top: 8rpx;
+ color: #9e9399;
+
+ &_item {
+ width: 33.3%;
+ text-align: center;
+ }
+
+ .time {
+ padding-left: 20rpx;
+ }
+
+ .coal-name {
+ padding-left: 70rpx;
+ }
+
+ .skin {
+ padding-left: 10rpx;
+ }
}
.one {
@@ -817,7 +877,7 @@
}
.three {
- margin: 0 auto vww(20);
+ margin: 0 auto vww(30);
flex: 0.7;
display: flex;
color: #939393;
@@ -843,23 +903,43 @@
transition: all 0.3s ease-out;
}
+ .history-utils {
+ width: 96%;
+ margin: vww(10) auto;
+ @include flex;
+ justify-content: space-around;
+
+ &_item {
+ width: 50%;
+ }
+
+ .btn {
+ width: 180rpx;
+ }
+ }
+
.history-skin {
width: 96%;
height: vww(300);
- margin: vww(50) auto;
+ margin: auto;
margin-top: vww(10);
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;
overflow: scroll;
color: #000;
-
+ position: relative;
.history-skin_item {
- width: 80%;
+ width: 96%;
height: vww(30);
@include flex;
- margin: vww(10) auto;
+ margin: vww(40) auto;
+
+ .item {
+ width: 33.3%;
+ text-align: center;
+ }
.createTime {
color: rgb(60, 156, 255);
@@ -867,7 +947,6 @@
.skin {
color: #f81414;
- @include flex;
width: 180rpx;
height: vww(30);
}
--
Gitblit v1.9.1