From c234dffcd3adaf7b8d87a5a8301871493c0cadbd Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期四, 21 九月 2023 14:20:35 +0800
Subject: [PATCH] 修改皮重异常弹窗不正确弹出
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 388 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 290 insertions(+), 98 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 9f7d048..696260a 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,50 @@
</view>
<view v-else
style="width: 100%;height: 40rpx;"></view>
+ <view class="history-utils">
+ <view class="history-utils_item">
+ <text>骞冲潎鐨噸:{{avgSkin}}</text>
+ <text style="color: #ff6363;font-weight: bold;font-size: 26rpx;"
+ class="error-tip"
+ v-if="errorTipShow">* 寮傚父</text>
+ </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"
@@ -142,22 +186,48 @@
</view>
<view class="main-information">
<view class="prefix">鐨噸:</view>
- <view class="suffix">{{ temporaryWeighObj.skin == 0 ? weighList.skin : temporaryWeighObj.skin }}
+ <view class="suffix">
+ {{ temporaryWeighObj.skin == 0 ? weighList.skin : temporaryWeighObj.skin||"" }}
</view>
</view>
<view class="main-information">
<view class="prefix">姣涢噸:</view>
- <view class="suffix">{{ temporaryWeighObj.hair == 0 ? weighList.hair : temporaryWeighObj.hair }}
+ <view class="suffix">
+ {{ temporaryWeighObj.hair == 0 ? weighList.hair : temporaryWeighObj.hair||"" }}
</view>
</view>
<view class="main-information">
<view class="prefix">鍑�閲�:</view>
- <view class="suffix">{{ temporaryWeighObj.clean == 0 ? weighList.clean : temporaryWeighObj.clean }}
+ <view class="suffix">
+ {{ temporaryWeighObj.clean == 0 ? weighList.clean : temporaryWeighObj.clean ||"" }}
</view>
</view>
<view class="main-information">
<view class="prefix">璁㈠崟浣欓噺:</view>
- <view class="suffix">{{ weighList.orderSurplus || 0 }}</view>
+ <view class="suffix">{{ weighList.orderSurplus ||"" }}</view>
+ <text style="color: #ff6363;font-weight: bold;font-size: 26rpx;"
+ class="error-tip"
+ v-show="orderSurplusLess">* 璁㈠崟浣欓噺涓嶈冻</text>
+ </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>
@@ -168,44 +238,23 @@
plain
@click="evacuation"
throttleTime="500"
- :disabled="!isEvacuation"></u-button>
+ :disabled="!isEvacuation"
+ v-if='weighList.skin||weighList.hair'></u-button>
<!-- 澶栭攢璁㈠崟绉扮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
<u-button type="primary"
text="纭畾绉伴噸"
- :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh || !isInputOrigin"
+ :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh || !isInputOrigin||!mergeState"
:loading="isConfirmWeighLoading"
loadingText="纭"
- @click="confirmWeigh"></u-button>
+ @click="confirmWeigh"
+ throttleTime="800"></u-button>
<u-button type="primary"
- text="杩斿洖鍔犲噺鍚�"
+ text="杩斿洖瑁呭嵏"
:disabled="addAndSubtractCoalDisabled"
@click="addAndSubtractCoal"
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"
@@ -224,11 +273,14 @@
@cancel="abnormalCancel"
confirmText="鎻愪氦">
<view class="slot-content">
- <u--form labelPosition="top">
- <u-form-item>
- <u-textarea v-model="abnormalContent"
+ <u--form labelPosition="top"
+ :model='abnormalForm'
+ :rules="rules"
+ ref="uForm">
+ <u-form-item prop="abnormalContent">
+ <u-textarea v-model="abnormalForm.abnormalContent"
confirmType="done"
- placeholder="璇疯緭鍏ュ紓甯稿師鍥�"
+ placeholder="璇疯緭鍏ュ紓甯稿師鍥�(瀛楁暟涓嶅皯浜�5涓瓧)"
height='140'
count
border="surround"
@@ -246,6 +298,7 @@
import { webSocketUrl } from '@/api/request.js';
import { mapState, mapMutations } from 'vuex';
import combinedTitle from '@/components/combined-title/combined-title.vue';
+ import BigNumber from "bignumber.js"
export default {
onLoad(params) {
this.takeCoalId = params.takeCoalId;
@@ -257,10 +310,13 @@
this.primarySkin = params.primarySkin;
this.primaryHair = params.primaryHair;
this.primaryClean = params.primaryClean;
- if (params.overTmWaixiao) {
+ if (params.overTmWaixiao !== 'null') {
this.weighData.overTmWaixiao = 1
}
this.changeweighHouseCode(params.weighHouseCode);
+ this.init();
+ this.changeWeigh('')
+ this.realTimeWeigh = 0
},
components: {
combinedTitle
@@ -280,7 +336,8 @@
sceneInOut: '',
coalContactClean: 0,
coalContactHair: 0,
- coalContactSkin: 0
+ coalContactSkin: 0,
+ isMerge: 0 //1鏄� 0涓嶆槸 榛樿0 鏄惁鍚堝崱
},
// 鏄惁濉啓鍘熷彂淇℃伅
isInputOrigin: false,
@@ -308,6 +365,7 @@
primaryClean: null,
// 鍒ゆ柇绉伴噸鎸夐挳鏄惁鍙敤
isweigh: false,
+ orderSurplusLess: false,
// 澶栬喘绫诲瀷绉伴噸濉啓姣涳紝鐨紝
firstHairCustomernameShow: false,
coalContactHair: '',
@@ -318,18 +376,42 @@
// 澶栬喘绗竴娆＄О姣涢噸涓嶉渶瑕佸姞鍑忓惃
outBuy: true,
// 鐨噸寮傚父鐩稿叧
- abnormalContent: '',
- avgSkin: null, // 骞冲潎鐨噸
+ abnormalForm: {
+ abnormalContent: '',
+ },
+ avgSkin: '', // 骞冲潎鐨噸
+ isAbnormalAvgSkin: true, //骞冲潎鐨噸鏄惁寮傚父
tmTaskCoalList: [],
abnormalModalShow: false,
historyBtn: false,
- historyShow: false
+ historyShow: false,
+ // 鏄惁鍦ㄧО鐨噸锛岀偣鍑荤‘瀹氱О閲嶅垽鏂槸鍚﹀紓甯�
+ isSkinWeigh: false,
+ errorTipShow: false,
+ rules: {
+ abnormalContent: [{
+ required: true,
+ message: "璇峰～鍐欏紓甯稿師鍥�",
+ trigger: ['blur', 'change'],
+ type: 'string'
+ },
+ {
+ validator: (rule, value, callback) => {
+ if (value.length < 5) {
+ callback(new Error('鍘熷洜涓嶅彲灏戜簬5涓瓧'))
+ } else {
+ callback()
+ }
+ }
+ },
+ ]
+ },
+ mergeState: true, //鍚堝崱鐘舵��
+ mergeStateShow: false, //鍚堝崱寮圭獥
+ checkboxValue1: []
};
},
watch: {
- realTimeWeigh(newV, oldV) {
-
- },
// 鐩戝惉閲嶉噺鍙樺寲
globalweigh: {
deep: true,
@@ -339,48 +421,53 @@
.orderType ==
'杞嚭') {
if (this.weighList.skin == 0) {
- this.getAverageSkin()
+ this.isSkinWeigh = true
this.temporaryWeighObj.skin = newV;
- if (this.avgSkin < newV) {
- this.abnormalModalShow = true
- this.historyBtn = true
- }
+ 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.avgSkin !== 0
} else {
+ this.isSkinWeigh = false;
this.temporaryWeighObj.hair = newV;
this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.weighList.skin).toFixed(
2);
this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
.temporaryWeighObj
.clean < 0;
+ this.orderSurplusLess = this.temporaryWeighObj.clean > this.weighList.orderSurplus
+ this.mergeStateShow = this.weighList.source !== 0 && this.orderSurplusLess
}
} 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;
+ 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.avgSkin !== 0;
this.temporaryWeighObj.clean = (this.weighList.hair - this.temporaryWeighObj.skin).toFixed(
2);
this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
.temporaryWeighObj
.clean < 0;
+ this.orderSurplusLess = this.temporaryWeighObj.clean > this.weighList.orderSurplus
+ this.mergeStateShow = this.weighList.source !== 0 && this.orderSurplusLess
}
}
}
}
},
- onShow() {
- this.init();
- this.changeisLogin(true)
- this.realTimeWeigh = 0
- },
- onHide() {
-
- },
computed: {
...mapState(['globalweigh', 'globalinfraredStatus']),
coalContactClean() {
- return (Number(this.weighData.coalContactHair) - Number(this.weighData.coalContactSkin)).toFixed(2);
+ let xx = BigNumber(this.weighData.coalContactHair)
+ let yy = BigNumber(this.weighData.coalContactSkin)
+ return xx.minus(yy).toNumber().toFixed(2)
},
token() {
return uni.getStorageSync('token');
@@ -393,13 +480,11 @@
isEvacuation() {
if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList.orderType ==
'杞嚭') {
- return (this.weighList.skin === 0 ? this.temporaryWeighObj.skin : this.weighList.skin) == this
- .temporaryWeighObj.hair;
+ return this.weighList.skin == this.temporaryWeighObj.hair;
}
if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList.orderType ==
'杞叆') {
- return (this.weighList.hair === 0 ? this.temporaryWeighObj.skin : this.weighList.hair) == this
- .temporaryWeighObj.hair;
+ return this.weighList.hair == this.temporaryWeighObj.skin;
}
},
sideline() {
@@ -407,7 +492,7 @@
}
},
methods: {
- ...mapMutations(['changeweighHouseCode', 'changeisLogin']),
+ ...mapMutations(['changeweighHouseCode', 'changeisLogin', 'changeWeigh']),
init() {
uni.showLoading({
title: "鍔犺浇涓�"
@@ -425,6 +510,7 @@
this.weighData.filedId = res.data.filedId;
this.weighData.coalContactHair = res.data.hairTwo ? res.data.hairTwo : 0;
this.weighData.coalContactSkin = res.data.skinTwo ? res.data.skinTwo : 0;
+ this.weighList.source = res.data.source
if (this.weighList.orderType == '澶栬喘') {
this.firstHairCustomernameShow = true;
if (this.weighList.hair > 0) {
@@ -441,7 +527,9 @@
uni.hideLoading()
this.$u.toast('鍔犺浇澶辫触')
}
- });
+ }).then(() => {
+ this.getAverageSkin()
+ })
},
/**
* @纭绉伴噸绛夊緟鍚庣鎻愪緵瀹炴椂绉伴噸鎺ュ彛锛岃幏鍙栫毊閲嶏紝姣涢噸
@@ -450,16 +538,26 @@
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) {
+ // 濡傛灉姝ｅ湪绉扮毊
+ if (this.isSkinWeigh) {
+ // 濡傛灉骞冲潎鐨噸涓�0
+ if (this.isAbnormalAvgSkin) {
+ this.abnormalModalShow = false
this.saveWeigh();
} else {
- this.$u.toast('姣涢噸涓嶈兘灏忎簬鐨噸');
- this.isConfirmWeighLoading = false;
+ let xx = new BigNumber(this.avgSkin)
+ 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();
+ }
}
} else {
this.saveWeigh();
}
+
} else {
this.$u.toast('鏈兘鑾峰彇鍦扮閲嶉噺');
this.isConfirmWeighLoading = false;
@@ -469,6 +567,7 @@
// 纭绉伴噸鎺ュ彛
saveWeigh() {
this.weighData.coalContactClean = this.coalContactClean;
+ console.log(this.weighData);
this.$reqPost('saveWeigh', this.weighData, 'json')
.then(res => {
console.log(res, '绉伴噸鎺ュ彛');
@@ -481,7 +580,8 @@
this.isConfirmWeighLoading = false;
}, 1000);
} else {
- this.$u.toast('绉伴噸澶辫触锛岃绋嶅悗閲嶈瘯');
+ this.$u.toast(res.msg ? res.msg : '绉伴噸澶辫触锛岃绋嶅悗閲嶈瘯');
+ this.isConfirmWeighLoading = false
}
})
.catch(err => {
@@ -496,7 +596,9 @@
sceneId: this.weighData.sceneId,
carNo: this.weighData.carNo,
tmId: this.weighData.tmId,
- filedId: this.weighData.filedId
+ filedId: this.weighData.filedId,
+ equipmentCode: this.weighData.equipmentCode,
+ weigh: this.weighData.weigh
}, 'json').then(res => {
if (res.code == 0) {
this.$u.toast('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
@@ -519,7 +621,12 @@
this.$reqPost('getTwoEvacuation', this.weighData, 'json').then(res => {
console.log(res, '绗簩娆℃斁绌�');
if (res.code == 0) {
- this.$u.toast('鎿嶄綔鎴愬姛');
+ this.$u.toast('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
+ setTimeout(() => {
+ uni.navigateBack({
+ delta: 1
+ });
+ }, 1000);
this.evacuationModalShow = false;
} else {
this.$u.toast(res.msg ? res.msg : '鎿嶄綔澶辫触');
@@ -553,11 +660,16 @@
uni.showLoading({
title: "鍔犺浇涓�"
})
- this.$reqGet('getAvgSkin').then(res => {
+ this.$reqGet('getAvgSkin', { xsUserId1: this.weighList.xsUserId1 }).then(res => {
if (res.code === 0) {
uni.hideLoading()
this.avgSkin = res.data.avgSkin
this.tmTaskCoalList = res.data.tmTaskCoalList
+ /**
+ * @description true鐨勮瘽鏄涓�娆＄О, false灏变笉鏄�,娌℃湁鍘嗗彶锛屽钩鍧囩毊閲嶄负0鏄涓�娆′篃鏄甯� */
+ // this.isAbnormalAvgSkin = (Array.isArray(this.tmTaskCoalList) && this
+ // .tmTaskCoalList.length === 0 || !this.tmTaskCoalList) && this.avgSkin == 0
+ this.isAbnormalAvgSkin = this.avgSkin == 0
} else {
uni.hideLoading()
this.$u.toast('鍔犺浇澶辫触')
@@ -566,29 +678,31 @@
},
abnormalCancel() {
this.abnormalModalShow = false
+ this.isConfirmWeighLoading = false;
+ this.$u.toast('鍙告満鍙栨秷鎻愪氦')
},
+ // 鎻愪氦寮傚父鍘熷洜
abnormalConfirm() {
- uni.showLoading({
- title: "鎻愪氦涓�"
- })
- this.$reqPost('tmAbnormalTextAdd', { tmId: this.weighData.tmId, abnormalText: this.abnormalContent },
- 'params').then(
- res => {
- if (res.code == 0) {
- uni.hideLoading()
- this.$u.toast('鎻愪氦鎴愬姛')
- this.abnormalModalShow = false
- } else {
- uni.hideLoading()
- this.$u.toast('鎻愪氦澶辫触')
- this.abnormalModalShow = true
- }
- })
+ this.weighData.abnormalText = this.abnormalContent
+ this.saveWeigh()
+ this.abnormalModalShow = false
},
- displayHistory() {
- this.historyShow = true
-
- }
+ skinAbnormal() {
+ this.$reqPost('skinAbnormal', { sceneId: this.weighData.sceneId, tmId: this.weighData.tmId }, 'params')
+ },
+ 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
+ }
+ },
}
};
</script>
@@ -610,6 +724,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 {
@@ -768,7 +907,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;
@@ -795,6 +934,7 @@
@include flex;
justify-content: flex-start;
overflow: hidden;
+ position: relative;
.prefix {
min-width: vww(60);
@@ -805,12 +945,40 @@
margin-left: vww(12);
text-align: left;
}
+
+ .error-tip {
+ position: absolute;
+ right: 200rpx;
+ }
}
}
}
+ .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(20);
+ margin: 0 auto vww(30);
flex: 0.7;
display: flex;
color: #939393;
@@ -836,23 +1004,48 @@
transition: all 0.3s ease-out;
}
+ .history-utils {
+ width: 96%;
+ margin: vww(10) auto;
+ @include flex;
+ justify-content: space-around;
+
+ &_item {
+ width: 50%;
+
+ .error-tip {
+ display: inline-block;
+ margin-left: 34rpx;
+ }
+ }
+
+ .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);
@@ -860,7 +1053,6 @@
.skin {
color: #f81414;
- @include flex;
width: 180rpx;
height: vww(30);
}
--
Gitblit v1.9.1