From 0c3e40c399a00fe6405f7b9a79eb1c93b7cc660e Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 11 七月 2023 16:23:33 +0800
Subject: [PATCH] 更改字眼，增加非稳定态下不可称重，增加验质字段
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 72 +++++++++++-------------------------
1 files changed, 22 insertions(+), 50 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 1defe30..b775edd 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
@@ -4,8 +4,8 @@
:style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/weighbanner.png)`, backgroundSize: 'cover', backgroundRepeat: 'no-repeat' }">
<view class="top">
<view class="top_left">
- <text>{{ realTimeWeigh }}</text>
- <!-- <text>{{ globalweigh }}</text> -->
+ <!-- <text>{{ realTimeWeigh }}</text> -->
+ <text>{{ globalweigh }}</text>
</view>
<view class="top_right">
<view class="">
@@ -51,18 +51,18 @@
</view>
<view class="main-information"
v-if="weighList.orderType!=='杞叆'||weighList.orderType!=='杞嚭'">
- <view class="prefix">鐭垮満:</view>
+ <view class="prefix">浠撳簱:</view>
<view class="suffix">{{ weighList.deptName || '' }}</view>
</view>
<view class="main-information"
v-if="weighList.orderType!=='杞叆'||weighList.orderType!=='杞嚭'">
- <view class="prefix">鐓ゅ満:</view>
+ <view class="prefix">鍩哄湴:</view>
<view class="suffix">{{ weighList.filedName || '' }}</view>
</view>
- <view class="main-information">
+ <!-- <view class="main-information">
<view class="prefix">鐓ょ鍚嶇О:</view>
<view class="suffix">{{ weighList.coalName || '' }}</view>
- </view>
+ </view> -->
<view class="main-information">
<view class="prefix">璁㈠崟绫诲瀷:</view>
<view class="suffix">{{ weighList.orderType || '' }}</view>
@@ -92,41 +92,7 @@
</view>
</view>
<!-- 绉伴噸鍘嗗彶-->
- <transition name="weighHistory">
- <view class="weigh-history"
- v-if="weighHistory.length!==0">
- <view class="block-main">
- <view class="weigh-item"
- v-for='item in weighHistory'
- :key="item.id">
- <view class="weigh-time">
- <u-tag :text="item.createTime.slice(-8,-3)"
- plain></u-tag>
- </view>
- <view class="item-block">
- <view class="item">
- <view class="concrete"
- :style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/skin.png)`, backgroundSize: 'cover', backgroundRepeat: 'no-repeat' }">
- 鐨�</view>
- <view class="num">{{ item.skin }}</view>
- </view>
- <view class="item">
- <view class="concrete"
- :style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/hair.png)`, backgroundSize: 'cover', backgroundRepeat: 'no-repeat' }">
- 姣�</view>
- <view class="num">{{ item.hair }}</view>
- </view>
- <view class="item">
- <view class="concrete"
- :style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/clean.png)`, backgroundSize: 'cover', backgroundRepeat: 'no-repeat' }">
- 鍑�</view>
- <view class="num">{{ item.clean }}</view>
- </view>
- </view>
- </view>
- </view>
- </view>
- </transition>
+ <weigh-item :list="weighHistory"></weigh-item>
<view class="three">
<!-- 鏀剧┖ -->
<u-button type="primary"
@@ -138,7 +104,7 @@
<!-- 澶栭攢璁㈠崟绉扮毊鏃讹紝杩斿洖鍔犲噺鍚ㄦ寜閽疆鐏般�傜О姣涙椂鍙敤.澶栬喘璁㈠崟锛屼笉鍑虹幇杩斿洖鍔犲噺鍚ㄧ殑鎸夐挳 -->
<u-button type="primary"
text="纭畾绉伴噸"
- :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh "
+ :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh ||globalWarning"
:loading="isConfirmWeighLoading"
loadingText="纭"
@click="confirmWeigh"></u-button>
@@ -153,6 +119,7 @@
@click="UnloadingAgainHandle"
:loading="UnloadingAgainLoading"
loadingText="纭"
+ :disabled="isweigh||realTimeWeigh == 0"
v-if='canUnload'></u-button>
</view>
<!-- 鏀剧┖寮圭獥 -->
@@ -172,6 +139,7 @@
import { webSocketUrl, onlineurl } from '@/api/request.js';
import { mapState, mapMutations } from 'vuex';
import combinedTitle from '@/components/combined-title/combined-title.vue';
+ import weighItem from '@/components/weighItem.vue'
export default {
onLoad(params) {
this.takeCoalId = params.takeCoalId;
@@ -187,9 +155,11 @@
this.weighData.overTmWaixiao = 1
}
this.changeweighHouseCode(params.weighHouseCode);
+ this.changeWeigh(0)
},
components: {
- combinedTitle
+ combinedTitle,
+ weighItem
},
data() {
return {
@@ -272,18 +242,20 @@
}
},
// 鐩戝惉閲嶉噺鍙樺寲
- globalweigh(newV) {
- this.weighData.weigh = this.realTimeWeigh = newV;
- console.log(this.realTimeWeigh, '鐪熷疄閲嶉噺鏀瑰彉浜�');
+ globalweigh: {
+ handler: function(newV) {
+ this.weighData.weigh = this.realTimeWeigh = newV;
+ console.log(this.realTimeWeigh, '鐪熷疄閲嶉噺鏀瑰彉浜�');
+ },
+ deep: true
}
},
onShow() {
this.init();
- this.changeisLogin(true)
- this.realTimeWeigh = 0
+ // this.realTimeWeigh = 0
},
computed: {
- ...mapState(['globalweigh', 'globalinfraredStatus']),
+ ...mapState(['globalweigh', 'globalinfraredStatus', 'globalWarning']),
token() {
return uni.getStorageSync('token');
},
@@ -326,7 +298,7 @@
}
},
methods: {
- ...mapMutations(['changeweighHouseCode', 'changeisLogin']),
+ ...mapMutations(['changeweighHouseCode', 'changeisLogin', 'changeWeigh']),
init() {
uni.showLoading({
title: '鍔犺浇涓�'
--
Gitblit v1.9.1