From 22bf89749751bf2204ca1d1d30bda9ce7fde3e5b Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期五, 22 三月 2024 10:20:47 +0800
Subject: [PATCH] fix：皮重阈值删除等于
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 273 +++++++++++++++++++++++++++--------------------------
1 files changed, 139 insertions(+), 134 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 c07442d..f192276 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
@@ -1,7 +1,7 @@
<template>
<view class="weighingDevice">
<view class="one"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/weighbanner.png') no-repeat;
+ style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/weighbanner.png') no-repeat;
background-size: cover;">
<view class="top">
<view class="top_left">
@@ -31,19 +31,19 @@
<view class="weigh-item">
<view class="item">
<view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/skin.png') no-repeat;background-size: cover;">
+ style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/skin.png') no-repeat;background-size: cover;">
鐨�</view>
<view class="num">{{ weighList.skinTwo }}</view>
</view>
<view class="item">
<view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/hair.png') no-repeat;background-size: cover;">
+ style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/hair.png') no-repeat;background-size: cover;">
姣�</view>
<view class="num">{{ weighList.hairTwo }}</view>
</view>
<view class="item">
<view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
+ style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
鍑�</view>
<view class="num">{{ weighList.cleanTwo }}</view>
</view>
@@ -158,27 +158,7 @@
<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>
+ v-show="orderSurplusLess&&!isSpecial">* 璁㈠崟浣欓噺涓嶈冻</text>
</view>
</view>
</view>
@@ -189,26 +169,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 ||!mergeState"
+ :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh ||globalWarning||addAndSubtractCoalDisabled"
:loading="isConfirmWeighLoading"
loadingText="纭"
@click="confirmWeigh"
throttleTime="800"></u-button>
<u-button type="primary"
text="杩斿洖瑁呭嵏"
- :disabled="addAndSubtractCoalDisabled"
+ :disabled="addAndSubtractCoalDisabled||isConfirmWeighLoading"
@click="addAndSubtractCoal"
class="jiajian"
- v-if="outBuy||!isSkinWeigh"></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 == '澶栬喘'">瓒呭嚭鍘熷彂{{avgFalse ? '鐨噸' :'姣涢噸'}} ,纾呮埧浜哄憳纭涓�,璇峰嬁绂诲紑姝ら〉闈�</text>
+ <text v-else>瓒呭嚭鏈�澶� {{avgFalse ? '鐨噸' :'姣涢噸'}},纾呮埧浜哄憳纭涓�,璇峰嬁绂诲紑姝ら〉闈�</text>
+ </view>
+ <view v-show="afterEvacuationStatus"
+ style="color: #ff6363;width: auto;margin: 0 auto;">
+ <text>{{afterEvacuationText}}</text>
</view>
<!-- 鏀剧┖寮圭獥 -->
<view class="evacuationModal">
@@ -231,12 +217,11 @@
:model='abnormalForm'
:rules="rules"
ref="uForm">
- <u-form-item prop="abnormalContent">
+ <u-form-item>
<u-textarea v-model="abnormalForm.abnormalContent"
confirmType="done"
placeholder="璇疯緭鍏ュ紓甯稿師鍥�(瀛楁暟涓嶅皯浜�5涓瓧)"
- height='140'
- count
+ :height='200'
border="surround"
autoHeight></u-textarea>
</u-form-item>
@@ -257,6 +242,7 @@
<script>
import { webSocketUrl } from '@/api/request.js';
import { mapState, mapMutations } from 'vuex';
+ import { BaseUrl } from '@/api/publicInterface.js'
import combinedTitle from '@/components/combined-title/combined-title.vue';
import BigNumber from "bignumber.js"
export default {
@@ -269,12 +255,14 @@
this.weighHouseCode = params.weighHouseCode;
this.primarySkin = params.primarySkin;
this.primaryHair = params.primaryHair;
+ this.deptId = params.deptId;
this.primaryClean = params.primaryClean;
if (params.overTmWaixiao !== 'null') {
this.weighData.overTmWaixiao = 1
}
this.changeweighHouseCode(params.weighHouseCode);
this.init();
+ this.getDept();
this.changeWeigh('')
this.realTimeWeigh = 0
},
@@ -303,6 +291,7 @@
},
data() {
return {
+ avgFalse:false, // 鏄惁鐨噸寮傚父
weighData: {
//纭绉伴噸鎺ュ彛鍙傛暟
deptId: '',
@@ -311,25 +300,29 @@
carNo: '',
gateCameraId: '',
equipmentCode: '',
+ avgSkin:'',
weigh: 0,
tmCode: '',
sceneInOut: '',
coalContactClean: 0,
coalContactHair: 0,
coalContactSkin: 0,
- isMerge: '0', //1鏄� 0涓嶆槸 榛樿0 鏄惁鍚堝崱
- isBackground: '0'
+ isMerge: '0', //1鏄� 0涓嶆槸 榛樿0 鏄惁鍚堝崱 宸叉棤鐢�
+ isBackground: '0',
+ abnormalText: ''
},
takeCoalId: null,
+ deptId:'',
+ weightReal:0, // 绉伴噸娴姩鏁版嵁
weighHouseCode: '',
isConfirmWeighLoading: false, //纭畾绉伴噸鎸夐挳
realTimeWeigh: 0,
weighList: {},
// 涓存椂绉伴噸瀵硅薄
temporaryWeighObj: {
- skin: 0,
- hair: 0,
- clean: 0
+ skin: 0, //鐨�
+ hair: 0, //姣�
+ clean: 0 //鍑�閲�
},
infraredStatus: false, // 绾㈠鐘舵�侊紝
// 鏀剧┖鎺у埗
@@ -362,7 +355,7 @@
errorTipShow: false,
rules: {
abnormalContent: [{
- required: true,
+ required: false,
message: "璇峰～鍐欏紓甯稿師鍥�",
trigger: ['blur', 'change'],
type: 'string'
@@ -378,12 +371,17 @@
},
]
},
- mergeState: true, //鍚堝崱鐘舵��
- mergeStateShow: false, //鍚堝崱寮圭獥
+ mergeState: true, //鍚堝崱鐘舵��
+ // mergeStateShow: false, //鍚堝崱寮圭獥
checkboxValue1: [],
isExceedOrigin: false, //鏄惁瓒呭嚭姣涢噸
refreshLoading: false,
- timer: null
+ timer: null,
+ afterEvacuationStatus: null, //鏀剧┖鍚庢彁鐓ゅ崟鐘舵�佺姸鎬佷负21鏃舵彁绀衡�樼瓑寰呯鎴跨‘璁も��
+ afterEvacuationText: '',
+ TwoEvacuationLoading: false,
+ addAndSubtractCoalLoading: false,
+ isSpecial: null //1 鏄壒娈� 0涓嶆槸鐗规畩
};
},
watch: {
@@ -397,54 +395,43 @@
'杞嚭') {
if (this.weighList.skin == 0) {
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() < -this.weightReal || xx.minus(yy).toNumber() > this.weightReal) &&
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);
- this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
+ let x = new BigNumber(this.temporaryWeighObj.hair)
+ let y = new BigNumber(this.weighList.skin)
+ this.temporaryWeighObj.clean = x.minus(y).toNumber().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
+ .clean < 0) && !this.isSpecial && !this.weighList.source
+ this.orderSurplusLess = (this.temporaryWeighObj.clean > this.weighList.orderSurplus) && !
+ this.weighList.source
}
} else if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList
.orderType == '杞叆') {
if (this.weighList.hair == 0) {
this.isSkinWeigh = false;
- this.outBuy = true;
this.temporaryWeighObj.hair = newV;
- // if (this.weighList.orderType == '澶栬喘') {
- // let xx = new BigNumber(newV)
- // let yy = new BigNumber(this.weighList.hairTwo)
- // if (xx.minus(yy) > 0.3) {
- // this.$u.toast('瓒呭嚭鍘熷彂淇℃伅姣涢噸,璇风瓑寰呯鐞嗕汉鍛樺鐞�')
- // this.isExceedOrigin = true
- // this.saveWeigh()
- // }
- // }
} else {
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() < -this.weightReal || xx.minus(yy).toNumber() > this.weightReal) &&
this.avgSkin !== 0;
- this.temporaryWeighObj.clean = (this.weighList.hair - this.temporaryWeighObj.skin).toFixed(
- 2);
- this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this
+ let x = new BigNumber(this.weighList.hair)
+ let y = new BigNumber(this.temporaryWeighObj.skin)
+ this.temporaryWeighObj.clean = x.minus(y).toNumber().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
+ .clean < 0) && !this.isSpecial && !this.weighList.source
+ this.orderSurplusLess = (this.temporaryWeighObj.clean > this.weighList.orderSurplus) && !
+ this.weighList.source
}
}
}
@@ -452,7 +439,7 @@
},
computed: {
...mapState(['globalweigh', 'globalinfraredStatus', 'globalisconnect', 'globalisUploadimg', 'globalisLogin',
- 'is_open_socket', 'socketTask', 'confirmWeighVisiable', 'confirmWeighContent'
+ 'is_open_socket', 'socketTask', 'confirmWeighVisiable', 'confirmWeighContent', 'globalWarning'
]),
coalContactClean() {
let xx = BigNumber(this.weighData.coalContactHair)
@@ -479,6 +466,9 @@
},
sideline() {
return this.weighList.orderType == '鍐呰喘' || this.weighList.orderType == '杞叆';
+ },
+ isNeedOrigin() {
+ return uni.getStorageSync('isNeedOrigin')
}
},
@@ -496,6 +486,7 @@
if (res.code == 0) {
uni.hideLoading()
this.weighList = res.data;
+ this.isSpecial = res.data.isSpecial
this.weighData.deptId = res.data.deptId;
this.weighData.tmId = res.data.id;
this.weighData.carNo = res.data.carNo;
@@ -503,19 +494,11 @@
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) {
- this.haveInputOrigin = true;
- this.isInputOrigin = true;
- }
- if (this.weighList.hair == 0) {
- this.outBuy = false;
- }
- } else {
- this.isInputOrigin = true;
- }
+ this.weighList.source = res.data.source //0鎵嬪姩 1涓嶆槸 鏄�0鍒ゆ柇浣欓噺涓嶈冻
+ this.outBuy = !(this.weighList.orderType === '澶栬喘' || this.weighList.orderType ===
+ '鍐呰喘' ||
+ this.weighList.orderType === '杞叆')
+ console.log(this.outBuy);
} else {
uni.hideLoading()
this.$u.toast('鍔犺浇澶辫触')
@@ -528,33 +511,31 @@
* @纭绉伴噸绛夊緟鍚庣鎻愪緵瀹炴椂绉伴噸鎺ュ彛锛岃幏鍙栫毊閲嶏紝姣涢噸
*/
confirmWeigh() {
- if (this.isConfirmWeighLoading == false) {
- this.isConfirmWeighLoading = true;
- if (this.weighData.weigh != 0) {
- // 濡傛灉姝ｅ湪绉扮毊
- if (this.isSkinWeigh) {
- // 濡傛灉骞冲潎鐨噸涓�0
- if (this.isAbnormalAvgSkin) {
- this.abnormalModalShow = false
- this.saveWeigh();
- } else {
- 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.isConfirmWeighLoading = true;
+ if (this.weighData.weigh != 0) {
+ // 濡傛灉姝ｅ湪绉扮毊
+ if (this.isSkinWeigh) {
+ // 濡傛灉骞冲潎鐨噸涓�0
+ if (this.isAbnormalAvgSkin) {
+ this.abnormalModalShow = false
this.saveWeigh();
+ } else {
+ let xx = new BigNumber(this.avgSkin)
+ let yy = new BigNumber(this.globalweigh)
+ if (xx.minus(yy).toNumber() < -this.weightReal || xx.minus(yy).toNumber() > this.weightReal) {
+ this.abnormalModalShow = true
+ this.skinAbnormal()
+ } else {
+ this.saveWeigh();
+ }
}
-
} else {
- this.$u.toast('鏈兘鑾峰彇鍦扮閲嶉噺');
- this.isConfirmWeighLoading = false;
+ this.saveWeigh();
}
+
+ } else {
+ this.$u.toast('鏈兘鑾峰彇鍦扮閲嶉噺');
+ this.isConfirmWeighLoading = false;
}
},
// 纭绉伴噸鎺ュ彛
@@ -565,14 +546,21 @@
console.log(res, '绉伴噸鎺ュ彛');
if (res.code == 0) {
this.$u.toast('绉伴噸鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
- this.isConfirmWeighLoading = false;
setTimeout(() => {
uni.navigateBack({
delta: 1
});
+ this.isConfirmWeighLoading = false;
}, 1000);
} else if (res.code === 3) {
- this.isExceedOrigin = true
+ if(/鐨噸/.test(res.msg)){
+ this.avgFalse = true;
+ this.isExceedOrigin = true;
+ }else{
+ this.avgFalse = false;
+ this.isExceedOrigin = true;
+ }
+
} else {
this.$u.toast(res.msg ? res.msg : '绉伴噸澶辫触锛岃绋嶅悗閲嶈瘯');
this.isConfirmWeighLoading = false
@@ -585,6 +573,7 @@
},
// 鍔犲噺鐓�
addAndSubtractCoal() {
+ this.addAndSubtractCoalLoading = true
this.$reqPost('addAndSubtractCoal', {
deptId: this.weighData.deptId,
sceneId: this.weighData.sceneId,
@@ -595,6 +584,7 @@
weigh: this.weighData.weigh
}, 'json').then(res => {
if (res.code == 0) {
+ this.addAndSubtractCoalLoading = false
this.$u.toast('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
setTimeout(() => {
uni.navigateBack({
@@ -602,7 +592,8 @@
});
this.isConfirmWeighLoading = false;
}, 1000);
- console.log(res, '鍔犲噺鐓�');
+ } else {
+ this.$u.toast(res.msg ? res.msg : '鎿嶄綔澶辫触');
}
});
},
@@ -612,19 +603,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;
}
});
},
@@ -657,7 +653,8 @@
this.$reqGet('getAvgSkin', { xsUserId1: this.weighList.xsUserId1 }).then(res => {
if (res.code === 0) {
uni.hideLoading()
- this.avgSkin = res.data.avgSkin
+ this.avgSkin = res.data.avgSkin;
+ this.weighData.avgSkin = res.data.avgSkin;
this.tmTaskCoalList = res.data.tmTaskCoalList
/**
* @description true鐨勮瘽鏄涓�娆＄О, false灏变笉鏄�,娌℃湁鍘嗗彶锛屽钩鍧囩毊閲嶄负0鏄涓�娆′篃鏄甯� */
@@ -677,35 +674,37 @@
},
// 鎻愪氦寮傚父鍘熷洜
abnormalConfirm() {
- this.weighData.abnormalText = this.abnormalContent
+ this.weighData.abnormalText = this.abnormalForm.abnormalContent
this.saveWeigh()
this.abnormalModalShow = false
},
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
- }
- },
confirmWeighConfirm() {
this.changeconfirmWeighVisiable(false)
this.isConfirmWeighLoading = false
+ this.TwoEvacuationLoading = false;
setTimeout(() => {
this.$u.toast('鍗冲皢杩斿洖涓婁竴椤�'),
uni.navigateBack({
delta: 1
})
}, 800)
+ },
+ //鑾峰彇閲嶉噺闃堝��
+ getDept(){
+ uni.request({
+ url: `${BaseUrl}/admin/dept/${this.deptId}`,
+ method: 'GET',
+ header: {
+ 'content-type': 'application/x-www-form-urlencoded'
+ },
+ success: (res) => {
+ console.log(res.data.data,'res.datra')
+ res.data.data.skinSafeValue ? this.weightReal = res.data.data.skinSafeValue : this.weightReal = '';
+ }
+ })
}
}
};
@@ -727,7 +726,8 @@
.slot-content {
width: 96%;
- border: 1rpx solid rgb(220, 223, 230);
+ height: 210rpx;
+ border-bottom: 1rpx solid rgb(220, 223, 230);
}
.table-title {
@@ -982,12 +982,17 @@
}
.three {
- margin: 0 auto vww(30);
- flex: 0.7;
+ width: 60%;
+ height: vww(60);
+ margin: vww(20) auto;
display: flex;
+ justify-content: space-between;
+ align-items: center;
color: #939393;
.u-button {
+ letter-spacing: vww(4);
+
&:nth-of-type(2) {
margin-left: vww(10);
}
@@ -1074,4 +1079,4 @@
justify-content: space-between;
}
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.1