From c234dffcd3adaf7b8d87a5a8301871493c0cadbd Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期四, 21 九月 2023 14:20:35 +0800
Subject: [PATCH] 修改皮重异常弹窗不正确弹出
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 insertions(+), 21 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 d1fad8a..696260a 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
@@ -211,22 +211,23 @@
</view>
</view>
</view>
- <view class="mergeState"
- v-show="mergeStateShow">
- <view class="merge-wrap">
- <view>鏄惁纭鍚堝苟</view>
- <view class="merge-checkbox">
- <u-checkbox-group v-model="checkboxValue1"
- placement="column"
- @change="mergeStateChange">
- <u-checkbox :customStyle="{marginBottom: '8px'}"
- :label="mergeState?'纭':'鍙栨秷'"
- name="confirm"
- label-size="30"
- size="30"
- activeColor="#48a2ff">
- </u-checkbox>
- </u-checkbox-group>
+ <view v-show="mergeStateShow">
+ <view class="mergeState">
+ <view class="merge-wrap">
+ <view>鏄惁纭鍚堝苟</view>
+ <view class="merge-checkbox">
+ <u-checkbox-group v-model="checkboxValue1"
+ placement="column"
+ @change="mergeStateChange">
+ <u-checkbox :customStyle="{marginBottom: '8px'}"
+ :label="mergeState?'纭':'鍙栨秷'"
+ name="confirm"
+ label-size="30"
+ size="30"
+ activeColor="#48a2ff">
+ </u-checkbox>
+ </u-checkbox-group>
+ </view>
</view>
</view>
</view>
@@ -248,7 +249,7 @@
@click="confirmWeigh"
throttleTime="800"></u-button>
<u-button type="primary"
- text="杩斿洖鍔犲噺鍚�"
+ text="杩斿洖瑁呭嵏"
:disabled="addAndSubtractCoalDisabled"
@click="addAndSubtractCoal"
class="jiajian"
@@ -548,6 +549,7 @@
let yy = new BigNumber(this.globalweigh)
if (xx.minus(yy).toNumber() <= -0.2 || xx.minus(yy).toNumber() >= 0.2) {
this.abnormalModalShow = true
+ this.skinAbnormal()
} else {
this.saveWeigh();
}
@@ -565,6 +567,7 @@
// 纭绉伴噸鎺ュ彛
saveWeigh() {
this.weighData.coalContactClean = this.coalContactClean;
+ console.log(this.weighData);
this.$reqPost('saveWeigh', this.weighData, 'json')
.then(res => {
console.log(res, '绉伴噸鎺ュ彛');
@@ -681,13 +684,11 @@
// 鎻愪氦寮傚父鍘熷洜
abnormalConfirm() {
this.weighData.abnormalText = this.abnormalContent
- this.skinAbnormal()
this.saveWeigh()
+ this.abnormalModalShow = false
},
skinAbnormal() {
- this.$reqPost('skinAbnormal', { sceneId: this.weighData.sceneId }, 'params').then(() => {
- this.abnormalModalShow = false
- })
+ this.$reqPost('skinAbnormal', { sceneId: this.weighData.sceneId, tmId: this.weighData.tmId }, 'params')
},
mergeStateChange(e) {
if (e.length !== 0) {
--
Gitblit v1.9.1