From af436aa050f76584cd5cb88e413e45cd08c15d50 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 17 五月 2023 14:14:04 +0800
Subject: [PATCH] 修改部分错误，增加新功能
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 74 +++++++++++++++++++++++++++----------
1 files changed, 54 insertions(+), 20 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 0515852..88689f6 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
@@ -39,21 +39,35 @@
<view class="first-line"><combined-title title="鍘熷彂淇℃伅"></combined-title></view>
<view class="second-line">
<view class="label-text" :class="{ focusClass: isfocus1 }">鐨噸</view>
- <view class="input-container" :class="{ inputClass: isfocus1 }">
- <u--input placeholder="璇疯緭鍏ョ毊閲�" border="surround" v-model="weighData.coalContactSkin" @focus="inputFocus(1)" @blur="inputBlur"></u--input>
+ <view class="input-container" :class="{ inputClass: isfocus1, disabledClass: isInputOrigin }">
+ <u--input
+ placeholder="璇疯緭鍏ョ毊閲�"
+ border="surround"
+ v-model="weighData.coalContactSkin"
+ @focus="inputFocus(1)"
+ @blur="inputBlur"
+ :disabled="isInputOrigin"
+ ></u--input>
</view>
<view class="unit" :class="{ focusClass: isfocus1 }">鍚�</view>
</view>
<view class="second-line">
<view class="label-text" :class="{ focusClass: isfocus2 }">姣涢噸</view>
- <view class="input-container" :class="{ inputClass: isfocus2 }">
- <u--input placeholder="璇疯緭鍏ユ瘺閲�" border="surround" v-model="weighData.coalContactHair" @focus="inputFocus(2)" @blur="inputBlur"></u--input>
+ <view class="input-container" :class="{ inputClass: isfocus2, disabledClass: isInputOrigin }">
+ <u--input
+ placeholder="璇疯緭鍏ユ瘺閲�"
+ border="surround"
+ v-model="weighData.coalContactHair"
+ @focus="inputFocus(2)"
+ @blur="inputBlur"
+ :disabled="isInputOrigin"
+ ></u--input>
</view>
<view class="unit" :class="{ focusClass: isfocus2 }">鍚�</view>
</view>
<view class="second-line">
<view class="label-text">鍑�閲�</view>
- <view class="input-container"><u--input placeholder="璇疯緭鍏ュ噣閲�" border="surround" v-model="coalContactClean"></u--input></view>
+ <view class="input-container"><u--input placeholder="鍑�閲�" border="surround" v-model="coalContactClean" :disabled="isInputOrigin"></u--input></view>
<view class="unit">鍚�</view>
</view>
</view>
@@ -75,7 +89,7 @@
</view>
</view>
</view>
- <view v-else style="width: 100%;height: vww(20);"></view>
+ <view v-else style="width: 100%;height: 40rpx;"></view>
<view class="bottom-block">
<view class="block-main">
<view class="main-information">
@@ -119,14 +133,14 @@
<u-button
type="primary"
text="纭畾绉伴噸"
- :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh"
+ :disabled="realTimeWeigh == 0 || globalinfraredStatus || isweigh || isInputOrigin"
:loading="isConfirmWeighLoading"
loadingText="纭"
@click="confirmWeigh"
></u-button>
- <u-button type="primary" text="杩斿洖鍔犲噺鍚�" :disabled="addAndSubtractCoalDisabled" @click="addAndSubtractCoal" class="jiajian"></u-button>
+ <u-button type="primary" text="杩斿洖鍔犲噺鍚�" :disabled="addAndSubtractCoalDisabled" @click="addAndSubtractCoal" class="jiajian" v-if="outBuy"></u-button>
</view>
- <view class="four" v-if="weighList.orderType !== '澶栬喘'">濡傛偍闇�瑕佽皟鏁磋杞借揣鍝佸惃鏁帮紝璇风偣鍑昏繑鍥炲姞鍑忓惃</view>
+ <!-- <view class="four" v-if="weighList.orderType !== '澶栬喘'">濡傛偍闇�瑕佽皟鏁磋杞借揣鍝佸惃鏁帮紝璇风偣鍑昏繑鍥炲姞鍑忓惃</view> -->
<!-- 鏀剧┖寮圭獥 -->
<view class="evacuationModal">
<u-modal
@@ -179,6 +193,8 @@
coalContactHair: 0,
coalContactSkin: 0
},
+ // 鏄惁濉啓鍘熷彂淇℃伅
+ isInputOrigin: false,
takeCoalId: null,
weighHouseCode: '',
isConfirmWeighLoading: false, //纭畾绉伴噸鎸夐挳
@@ -207,7 +223,9 @@
coalContactSkin: '',
// 鑱氱劍鏃舵敼鍙樻牱寮�
isfocus1: false,
- isfocus2: false
+ isfocus2: false,
+ // 澶栬喘绗竴娆＄О姣涢噸涓嶉渶瑕佸姞鍑忓惃
+ outBuy: true
};
},
watch: {
@@ -239,11 +257,8 @@
// 鐩戝惉閲嶉噺鍙樺寲
globalweigh: {
handler(v) {
- // this.weighData.weigh = this.realTimeWeigh = v;
- // console.log(this.realTimeWeigh, '鐪熷疄閲嶉噺鏀瑰彉浜�');
- setTimeout(() => {
- this.weighData.weigh = this.realTimeWeigh = v;
- }, 0);
+ this.weighData.weigh = this.realTimeWeigh = v;
+ console.log(this.realTimeWeigh, '鐪熷疄閲嶉噺鏀瑰彉浜�');
},
deep: true,
immediate: true
@@ -283,7 +298,7 @@
}
},
sideline() {
- return this.weighList.orderType == '鍐呰喘' || this.weighList.orderType == '杞嚭';
+ return this.weighList.orderType == '鍐呰喘' || this.weighList.orderType == '杞叆';
}
},
methods: {
@@ -299,8 +314,19 @@
this.weighData.carNo = res.data.carNo;
this.weighData.tmCode = res.data.code;
this.weighData.filedId = res.data.filedId;
- if (this.weighList.orderType == '澶栬喘' && this.weighList.hair == 0) {
+ this.weighData.coalContactHair = res.data.hairTwo ? res.data.hairTwo : 0;
+ this.weighData.coalContactSkin = res.data.skinTwo ? res.data.skinTwo : 0;
+ if (this.weighList.orderType == '澶栬喘') {
this.firstHairCustomernameShow = true;
+ if (this.weighList.hair == 0) {
+ this.outBuy = false;
+ }
+ }
+ if (this.weighData.coalContactHair > 0 && this.weighData.coalContactSkin > 0) {
+ this.isInputOrigin = true;
+ if (this.isInputOrigin) {
+ this.$u.toast('淇℃伅宸插～鍐�');
+ }
}
}
});
@@ -493,6 +519,9 @@
box-shadow: 0rpx 5rpx 13rpx 0rpx rgba(73, 95, 252, 0.6) !important;
border-radius: 12rpx !important;
}
+ .isInputOrigin {
+ background-color: #f4f4fc;
+ }
.input-container {
border: 2px solid #c5c5c5;
box-shadow: 0rpx 5rpx 13rpx 0rpx #c5c5c5;
@@ -543,7 +572,8 @@
}
}
.bottom-block {
- width: 690rpx;
+ width: calc(100% - 60rpx);
+ box-sizing: border-box;
height: 630rpx;
margin: 0 vww(15) vww(45) vww(15);
background: #ffffff;
@@ -551,6 +581,7 @@
border-radius: 20rpx;
@include flex;
justify-content: center;
+ overflow: hidden;
.block-main {
width: 94%;
height: 565rpx;
@@ -559,6 +590,7 @@
justify-content: space-around;
align-items: flex-start;
flex-direction: column;
+ overflow: hidden;
.main-information {
width: 100%;
height: 28rpx;
@@ -567,6 +599,7 @@
color: #303030;
@include flex;
justify-content: flex-start;
+ overflow: hidden;
.prefix {
min-width: vww(60);
}
@@ -593,8 +626,9 @@
}
}
.four {
- margin: vww(10) auto;
- flex: 0.5;
+ width: 100%;
+ margin-top: vww(5);
+ text-align: center;
}
}
.secondary-confirmation__main {
--
Gitblit v1.9.1