From f46eb243908e145da448f65bffb8ba17197d9164 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 25 九月 2023 16:10:12 +0800
Subject: [PATCH] 增加详情原发信息 增加装卸员下拉刷新 修改诸多问题 优化websocket
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 199 ++++++++++++++++++++++++++-----------------------
1 files changed, 105 insertions(+), 94 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..b3b9105 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"
@@ -223,17 +194,25 @@
<!-- 澶栭攢璁㈠崟绉扮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
<u-button type="primary"
text="纭畾绉伴噸"
- :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh || !isInputOrigin||!mergeState"
+ :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh ||!mergeState||isExceedOrigin"
: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>
+ </view>
+ <view class="four">
+ <u-button type="primary"
+ text="鍒锋柊"
+ @click.stop="RefreshHandle"
+ icon="reload"
+ throttle-time="800"
+ :loading="refreshLoading"></u-button>
</view>
<!-- 鏀剧┖寮圭獥 -->
<view class="evacuationModal">
@@ -269,14 +248,6 @@
</u--form>
</view>
</u-modal>
- </view>
- <view class="mergeState">
- <u-modal :show="mergeStateShow"
- title="鍚堝崱纭"
- content="鏄惁纭鍚堝崱"
- :showCancelButton="true"
- @confirm="mergeConfirm"
- @cancel="mergeCancel"></u-modal>
</view>
</view>
</template>
@@ -327,10 +298,6 @@
coalContactSkin: 0,
isMerge: 0 //1鏄� 0涓嶆槸 榛樿0 鏄惁鍚堝崱
},
- // 鏄惁濉啓鍘熷彂淇℃伅
- isInputOrigin: false,
- haveInputOrigin: false,
-
takeCoalId: null,
weighHouseCode: '',
isConfirmWeighLoading: false, //纭畾绉伴噸鎸夐挳
@@ -356,11 +323,6 @@
orderSurplusLess: false,
// 澶栬喘绫诲瀷绉伴噸濉啓姣涳紝鐨紝
firstHairCustomernameShow: false,
- coalContactHair: '',
- coalContactSkin: '',
- // 鑱氱劍鏃舵敼鍙樻牱寮�
- isfocus1: false,
- isfocus2: false,
// 澶栬喘绗竴娆＄О姣涢噸涓嶉渶瑕佸姞鍑忓惃
outBuy: true,
// 鐨噸寮傚父鐩稿叧
@@ -396,6 +358,9 @@
},
mergeState: true, //鍚堝崱鐘舵��
mergeStateShow: false, //鍚堝崱寮圭獥
+ checkboxValue1: [],
+ isExceedOrigin: false, //鏄惁瓒呭嚭鍘熷彂姣涢噸
+ refreshLoading: false
};
},
watch: {
@@ -412,7 +377,8 @@
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.temporaryWeighObj.hair = newV;
@@ -429,12 +395,21 @@
if (this.weighList.hair == 0) {
this.isSkinWeigh = false;
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
+ }
+ }
} 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.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
@@ -448,7 +423,9 @@
}
},
computed: {
- ...mapState(['globalweigh', 'globalinfraredStatus']),
+ ...mapState(['globalweigh', 'globalinfraredStatus', 'globalisconnect', 'globalisUploadimg', 'globalisLogin',
+ 'is_open_socket'
+ ]),
coalContactClean() {
let xx = BigNumber(this.weighData.coalContactHair)
let yy = BigNumber(this.weighData.coalContactSkin)
@@ -476,8 +453,21 @@
return this.weighList.orderType == '鍐呰喘' || this.weighList.orderType == '杞叆';
}
},
+
methods: {
...mapMutations(['changeweighHouseCode', 'changeisLogin', 'changeWeigh']),
+ RefreshHandle() {
+ if (this.globalisconnect) return this.$u.toast('宸茶繛鎺ワ紝鏃犻渶鍒锋柊')
+ this.refreshLoading = true
+ if (!this.globalisconnect && !this.globalisUploadimg && this.globalisLogin) {
+ if (!this.is_open_socket) {
+ this.$store.dispatch('websocketInit')
+ this.changeisconnect(true);
+ this.refreshLoading = false
+ this.$u.toast('鍒锋柊鎴愬姛')
+ }
+ }
+ },
init() {
uni.showLoading({
title: "鍔犺浇涓�"
@@ -534,6 +524,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();
}
@@ -551,6 +542,7 @@
// 纭绉伴噸鎺ュ彛
saveWeigh() {
this.weighData.coalContactClean = this.coalContactClean;
+ console.log(this.weighData);
this.$reqPost('saveWeigh', this.weighData, 'json')
.then(res => {
console.log(res, '绉伴噸鎺ュ彛');
@@ -667,27 +659,24 @@
// 鎻愪氦寮傚父鍘熷洜
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
- },
- mergeCancel() {
- this.mergeStateShow = false
- this.weighData.isMerge = 0
- this.MergeState = false
- this.isweigh = true
- this.orderSurplusLess = true
+ 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
+ }
},
}
};
@@ -893,7 +882,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 +929,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 +970,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