From 96db936c641b23897636ff6a15e31f8f87964342 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 11 十月 2023 13:44:05 +0800
Subject: [PATCH] 确定装卸逻辑修改 增加称重时稳定态
---
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
index 3661fb7..e1334a8 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue
@@ -3,7 +3,7 @@
<view class="top-banner"
style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/loadingbanner.png') no-repeat;background-size: cover;">
<u-notice-bar :text="originInfoNotice"
- v-if="originInfoVisible"
+ v-if="haveInputOrigin"
fontSize='36'></u-notice-bar>
<view class="top-information">
<view class="cutomer-name"
@@ -25,7 +25,7 @@
<view class="status-button"
style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/statusbutton.png') no-repeat;
background-size: cover;">
- {{coalStatus[correctStatus]}}
+ {{coalStatus[correctStatus]||''}}
</view>
</view>
<view class="time">
@@ -175,13 +175,13 @@
:disabled="correctStatus>= 3"></u-button>
</view>
<view class="bottom-button">
- <u-button text="鏀剧┖"
+ <!-- <u-button text="鏀剧┖"
type="primary"
plain
@click="evacuation"
throttleTime="500"
shape="circle"
- :disabled="isEvacuation || isapproach"></u-button>
+ :disabled="isEvacuation || isapproach"></u-button> -->
<u-button text="鍛煎彨瀹㈡湇"
type="primary"
plain
@@ -336,7 +336,7 @@
serviecePhone: ''
},
coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅浠�', '鍑虹叅浠�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠',
- '杩涘叆鍦洪櫌', '寮傚父瀹℃牳涓�', '杩斿洖鍔犲噺鍚�', '瓒呮椂', '鎵撳嵃涓�', '鎵撳嵃涓�'
+ '杩涘叆鍦洪櫌', '寮傚父瀹℃牳涓�', '杩斿洖鍔犲噺鍚�', '瓒呮椂', '鎵撳嵃涓�', '鎵撳嵃涓�', '濉啓'
], // 鐘舵��
weighHouseCode: '',
// 鏀剧┖寮圭獥鎺у埗鍙橀噺
@@ -434,7 +434,7 @@
coalContactClean() {
let xx = BigNumber(this.originInfoForm.coalContactHair ? this.originInfoForm.coalContactHair : 0)
let yy = BigNumber(this.originInfoForm.coalContactSkin ? this.originInfoForm.coalContactSkin : 0)
- return xx.minus(yy).toNumber().toFixed(2) || ''
+ return xx.minus(yy).toNumber() > 0 ? xx.minus(yy).toNumber().toFixed(2) : 0
},
currentTime() {
let currentDate = new Date();
@@ -752,7 +752,16 @@
title: '姝ｅ湪鎵撳嵃涓�,璇风◢鍚�'
})
this.enterLoading = true
- this.$reqGet('printer', { type: 2, tmId: this.coalDetailsData.id, weighingNumber: 1 }).then(
+ let form = {
+ deptId: this.getWeightHouseObj.deptId,
+ tmId: this.getWeightHouseObj.tmId,
+ carNo: uni.getStorageSync('carNo'),
+ type: 2,
+ weighingNumber: 1
+ }
+ let form1 = uni.getStorageSync('WeighHouseForm') ? uni.getStorageSync('WeighHouseForm') : '{}'
+ this.$reqPost('printer', Object.assign(form, JSON.parse(form1)),
+ 'json').then(
res => {
uni.hideLoading()
this.enterLoading = false
@@ -1198,8 +1207,7 @@
width: 100%;
margin: 0 auto;
- .top-button,
- .bottom-button {
+ .top-button {
width: 100%;
height: vww(47);
@include flex;
@@ -1213,6 +1221,23 @@
border: 2px solid #3b56eb;
}
}
+
+ .bottom-button {
+ width: 40%;
+ height: vww(47);
+ padding-left: vww(18);
+ @include flex;
+ justify-content: flex-start;
+
+ .u-button {
+ width: 100%;
+ height: 60rpx;
+ font-size: 28rpx;
+ font-weight: 300;
+ color: #497bfb;
+ border: 2px solid #3b56eb;
+ }
+ }
}
}
--
Gitblit v1.9.1