From f52085a9bc8c61cf7097426d7a6b2985d890da68 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 12 七月 2023 16:52:34 +0800
Subject: [PATCH] 增加用户隐私协议，验质增加字段，优化ws
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 13 ++++++-------
1 files changed, 6 insertions(+), 7 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 4510c28..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
@@ -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>
@@ -104,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>
@@ -252,11 +252,10 @@
},
onShow() {
this.init();
- this.changeisLogin(true)
// this.realTimeWeigh = 0
},
computed: {
- ...mapState(['globalweigh', 'globalinfraredStatus']),
+ ...mapState(['globalweigh', 'globalinfraredStatus', 'globalWarning']),
token() {
return uni.getStorageSync('token');
},
--
Gitblit v1.9.1