From 5a8575299f1cc6b4bf0601025d17273e92c2d8cf Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期三, 08 十一月 2023 17:23:42 +0800
Subject: [PATCH] 日计划增加磅单类型
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 76 +++++++++++++++++++++++++++++++------
1 files changed, 63 insertions(+), 13 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 f294eaf..ba460ac 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
@@ -29,7 +29,7 @@
<view class="main-information"
v-if="weighList.orderType=='杞叆'||weighList.orderType=='杞嚭'">
<view class="prefix">
- 鍙戣揣鍦扮叅鍦�:
+ 鍙戣揣鍦板熀鍦�:
</view>
<view class="suffix">
{{ weighList.filedName || '' }}
@@ -38,7 +38,7 @@
<view class="main-information"
v-if="weighList.orderType=='杞叆'||weighList.orderType=='杞嚭'">
<view class="prefix">
- 鏀惰揣鍦扮叅鍦�:
+ 鏀惰揣鍦板熀鍦�:
</view>
<view class="suffix">
{{ weighList.toFiledName || '' }}
@@ -60,29 +60,35 @@
<view class="suffix">{{ weighList.filedName || '' }}</view>
</view>
<!-- <view class="main-information">
- <view class="prefix">鐓ょ鍚嶇О:</view>
+ <view class="prefix">鐗╂枡鍚嶇О:</view>
<view class="suffix">{{ weighList.coalName || '' }}</view>
</view> -->
<view class="main-information">
<view class="prefix">璁㈠崟绫诲瀷:</view>
<view class="suffix">{{ weighList.orderType || '' }}</view>
</view>
- <view class="main-information">
+ <view class="main-information" v-if="isweight">
<view class="prefix">鐨噸:</view>
<view class="suffix">
{{currentSkin}}
</view>
</view>
- <view class="main-information">
+ <view class="main-information" v-if="isweight">
<view class="prefix">姣涢噸:</view>
<view class="suffix">
{{currentHair}}
</view>
</view>
- <view class="main-information">
+ <view class="main-information" v-if="isweight">
<view class="prefix">鍑�閲�:</view>
<view class="suffix">
{{ currentClean}}
+ </view>
+ </view>
+ <view class="main-information" v-else>
+ <view class="prefix">鍑�閲�:</view>
+ <view class="suffix">
+ {{ isWeightclean}}
</view>
</view>
<!-- <view class="main-information">
@@ -143,6 +149,8 @@
import weighItem from '@/components/weighItem.vue'
export default {
onLoad(params) {
+
+ this.isWeighing = params.isWeighing; // 褰撳墠鏄笉鏄洖纾呯殑
this.takeCoalId = params.takeCoalId;
this.weighData.sceneId = params.sceneId;
this.weighData.gateCameraId = params.gateCameraId;
@@ -164,6 +172,7 @@
},
data() {
return {
+ isWeighing:'',
weighData: {
//纭绉伴噸鎺ュ彛鍙傛暟
deptId: '',
@@ -192,7 +201,8 @@
temporaryWeighObj: {
skin: null,
hair: null,
- clean: null
+ clean: null,
+ isWeightclean:null,
},
infraredStatus: false, // 绾㈠鐘舵�侊紝
// 鏀剧┖鎺у埗
@@ -228,16 +238,16 @@
globalweigh: {
handler: function(newV) {
this.weighData.weigh = this.realTimeWeigh = newV;
- if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList
- .orderType == '杞嚭') {
+ if ((this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList
+ .orderType == '杞嚭')) {
if (!this.showWeigh.skin) {
this.temporaryWeighObj.skin = newV;
} else {
this.temporaryWeighObj.hair = newV;
this.isweigh = Number(this.currentClean) < 0;
}
- } else if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList
- .orderType == '杞叆') {
+ } else if ( (this.isweight) && (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList
+ .orderType == '杞叆')) {
if (!this.showWeigh.hair) {
this.temporaryWeighObj.hair = newV;
} else {
@@ -246,9 +256,31 @@
.showWeigh
.skin > 0;
}
- }
+ }else if((this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList
+ .orderType == '杞叆') && (!this.isweight)){
+ if (!this.showWeigh.skin) {
+ this.temporaryWeighObj.skin = newV;
+ this.temporaryWeighObj.isWeightclean = newV;
+ } else {
+ this.temporaryWeighObj.isWeightclean = newV;
+
+ this.isweigh = Number(this.currentClean) < 0;
+ }
+ }
},
deep: true
+ }
+ },
+ onPullDownRefresh() {
+ if (!this.globalisconnect && !this.globalisUploadimg && this.globalisLogin) {
+ if (!this.is_open_socket) {
+ this.$store.dispatch('websocketInit')
+ this.changeisconnect(false);
+ console.log('绉伴噸鐨剋s');
+ uni.stopPullDownRefresh();
+ } else {
+ uni.stopPullDownRefresh();
+ }
}
},
onShow() {
@@ -256,7 +288,9 @@
// this.realTimeWeigh = 0
},
computed: {
- ...mapState(['globalweigh', 'globalinfraredStatus', 'globalWarning']),
+ ...mapState(['globalweigh', 'globalinfraredStatus', 'globalWarning', 'globalisconnect', 'globalisUploadimg',
+ 'globalisLogin', 'is_open_socket'
+ ]),
token() {
return uni.getStorageSync('token');
},
@@ -307,6 +341,22 @@
.currentHair - this.currentSkin).toFixed(2) : ''
}
+ },
+ isWeightclean(){
+ console.log(this.temporaryWeighObj,'his.temporaryWeighObj')
+ return this.temporaryWeighObj.skin || ''
+ },
+ isweight(){
+ if(this.isWeighing){
+ if(this.isWeighing == '涓嶅洖纾�'){
+ return false
+ }else{
+ return true
+ }
+
+ }else{
+ return true
+ }
}
},
methods: {
--
Gitblit v1.9.1