From a71f34e6888abdf106b6d20e125eb4569a63b3f0 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期一, 13 十一月 2023 17:27:58 +0800
Subject: [PATCH] 修改签到页面传参，称重页面样式
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 62 ++++++++++++++++++++++++------
1 files changed, 49 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 db2e681..8f2a4fa 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
@@ -60,31 +60,37 @@
<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">
<view class="prefix">璁㈠崟浣欓噺:</view>
<view class="suffix">{{ weighList.orderSurplus || 0 }}</view>
@@ -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,7 +256,17 @@
.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
}
@@ -321,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: {
@@ -719,7 +755,7 @@
.bottom-block {
width: calc(100% - 60rpx);
box-sizing: border-box;
- height: 630rpx;
+ height: 420rpx;
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);
@@ -730,8 +766,8 @@
.block-main {
width: 94%;
- height: 565rpx;
- margin-top: vww(10);
+ height: 420rpx;
+ margin-top: vww(5);
@include flex;
justify-content: space-around;
align-items: flex-start;
--
Gitblit v1.9.1