From 1ef0e393913961c11ea05f868a537015572d7b7c Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 12 四月 2023 08:07:04 +0800
Subject: [PATCH] 微信小程序增加查看消息
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 15 ++++++++-------
1 files changed, 8 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 7363ee3..47564df 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
@@ -24,7 +24,7 @@
</view>
<view class="two">
<p>璁㈠崟缂栧彿锛歿{ weighList.code || '' }}</p>
- <p>璁㈠崟绫诲瀷锛歿{ weighList.orderTye || '' }}</p>
+ <p>璁㈠崟绫诲瀷锛歿{ weighList.orderType || '' }}</p>
<p>璁㈠崟浣欓噺锛歿{ weighList.orderSurplus || 0 }}</p>
<p>鐨噸锛歿{ temporaryWeighObj.skin == 0 ? weighList.skin : temporaryWeighObj.skin }}</p>
<p>姣涢噸锛歿{ temporaryWeighObj.hair == 0 ? weighList.hair : temporaryWeighObj.hair }}</p>
@@ -47,7 +47,7 @@
></u-button>
<u-button type="primary" text="杩斿洖鍔犲噺鍚�" :disabled="addAndSubtractCoalDisabled" @click="addAndSubtractCoal" class="jiajian"></u-button>
</view>
- <view class="four" v-if="weighList.orderTye !== '澶栬喘'">濡傛偍闇�瑕佽皟鏁磋杞借揣鍝佸惃鏁帮紝璇风偣鍑昏繑鍥炲姞鍑忓惃</view>
+ <view class="four" v-if="weighList.orderType !== '澶栬喘'">濡傛偍闇�瑕佽皟鏁磋杞借揣鍝佸惃鏁帮紝璇风偣鍑昏繑鍥炲姞鍑忓惃</view>
<!-- 鏀剧┖寮圭獥 -->
<view class="evacuationModal">
<u-modal
@@ -118,7 +118,7 @@
},
watch: {
realTimeWeigh(newV, oldV) {
- if (this.weighList.orderTye == '澶栭攢' || this.weighList.orderTye == '鍐呴攢') {
+ if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢') {
if (this.weighList.skin == 0) {
// this.temporaryWeighObj.skin = this.realTimeWeigh;
this.temporaryWeighObj.skin = newV;
@@ -127,7 +127,7 @@
this.temporaryWeighObj.hair = newV;
this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.weighList.skin).toFixed(2);
}
- } else if (this.weighList.orderTye == '澶栬喘' || this.weighList.orderTye == '杞嚭') {
+ } else if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '杞嚭') {
if (this.weighList.hair == 0) {
// this.temporaryWeighObj.hair = this.realTimeWeigh;
this.temporaryWeighObj.hair = newV;
@@ -149,7 +149,7 @@
},
// 鍔犲噺鐓ゆ寜閽鐢ㄤ笌鍚�
addAndSubtractCoalDisabled() {
- if (this.weighList.orderTye == '澶栭攢' || this.weighList.orderTye == '鍐呴攢' || this.weighList.orderTye == '杞嚭') {
+ if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList.orderType == '杞嚭') {
if (this.weighList.hair == 0) {
return true;
} else if (this.weighList.hair != 0) {
@@ -187,7 +187,7 @@
if (this.isConfirmWeighLoading == false) {
this.isConfirmWeighLoading = true;
if (this.weighData.weigh != 0) {
- if (this.weighList.orderTye == '澶栭攢') {
+ if (this.weighList.orderType == '澶栭攢') {
if (this.weighList.skin ? (this.weighList.skin < this.realTimeWeigh ? true : false) : true) {
this.saveWeigh();
} else {
@@ -207,6 +207,7 @@
saveWeigh() {
this.$reqPost('saveWeigh', this.weighData, 'json')
.then(res => {
+ console.log(res, '绉伴噸鎺ュ彛');
if (res.code == 0) {
this.$u.toast('绉伴噸鎴愬姛');
setTimeout(() => {
@@ -260,7 +261,7 @@
let nowWeighObj = JSON.parse(res.data.slice(7));
console.log(nowWeighObj);
// 涓�寮�濮嬫槸weighHouseCode
- if (nowWeighObj.eqCode == this.weighData.equipmentCode) {
+ if (nowWeighObj.eqCode == this.weighHouseCode) {
if (nowWeighObj.eqInfraredStatus) {
this.infraredStatus = true;
this.weighData.weigh = this.realTimeWeigh = nowWeighObj.weigh;
--
Gitblit v1.9.1