From 6087ba7d24f2353c2d01a5e5a384d5a20f97a19b Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 15 五月 2023 08:10:53 +0800
Subject: [PATCH] 增加路线规划，样式修改
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 151 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 111 insertions(+), 40 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 e6bbd9d..138a077 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
@@ -34,26 +34,44 @@
</view> -->
<view class="bottom"><text>TIP:褰撳墠鐘舵�佷负姝ｅ父鏃跺彲浠ョО閲�</text></view>
</view>
- <view class="middle-block">
+ <view class="middle-block" v-if="firstHairCustomernameShow || sideline">
<view class="block-main" v-if="firstHairCustomernameShow">
<view class="first-line"><combined-title title="鍘熷彂淇℃伅"></combined-title></view>
<view class="second-line">
- <view class="label-text">鐨噸</view>
- <view class="input-container"><u--input placeholder="璇疯緭鍏ョ毊閲�" border="surround" v-model="weighData.coalContactSkin"></u--input></view>
- <view class="unit">鍚�</view>
+ <view class="label-text" :class="{ focusClass: isfocus1 }">鐨噸</view>
+ <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">姣涢噸</view>
- <view class="input-container"><u--input placeholder="璇疯緭鍏ユ瘺閲�" border="surround" v-model="weighData.coalContactHair"></u--input></view>
- <view class="unit">鍚�</view>
+ <view class="label-text" :class="{ focusClass: isfocus2 }">姣涢噸</view>
+ <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>
- <view class="block-sideline" v-if="weighList.orderType == '鍐呰喘' || weighList.orderType == '杞嚭'">
+ <view class="block-sideline" v-if="sideline">
<view class="first-line"><combined-title title="鍘熷彂淇℃伅"></combined-title></view>
<view class="weigh-item">
<view class="item">
@@ -71,6 +89,7 @@
</view>
</view>
</view>
+ <view v-else style="width: 100%;height: 40rpx;"></view>
<view class="bottom-block">
<view class="block-main">
<view class="main-information">
@@ -114,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
@@ -174,6 +193,8 @@
coalContactHair: 0,
coalContactSkin: 0
},
+ // 鏄惁濉啓鍘熷彂淇℃伅
+ isInputOrigin: false,
takeCoalId: null,
weighHouseCode: '',
isConfirmWeighLoading: false, //纭畾绉伴噸鎸夐挳
@@ -199,8 +220,12 @@
// 澶栬喘绫诲瀷绉伴噸濉啓姣涳紝鐨紝
firstHairCustomernameShow: false,
coalContactHair: '',
- coalContactSkin: ''
- // 浜屾纭
+ coalContactSkin: '',
+ // 鑱氱劍鏃舵敼鍙樻牱寮�
+ isfocus1: false,
+ isfocus2: false,
+ // 澶栬喘绗竴娆＄О姣涢噸涓嶉渶瑕佸姞鍑忓惃
+ outBuy: true
};
},
watch: {
@@ -232,11 +257,11 @@
// 鐩戝惉閲嶉噺鍙樺寲
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, '鐪熷疄閲嶉噺鏀瑰彉浜�');
+ // setTimeout(() => {
+ // this.weighData.weigh = this.realTimeWeigh = v;
+ // }, 0);
},
deep: true,
immediate: true
@@ -257,13 +282,14 @@
},
// 鍔犲噺鐓ゆ寜閽鐢ㄤ笌鍚�
addAndSubtractCoalDisabled() {
- if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList.orderType == '杞嚭') {
- if (this.weighList.hair == 0) {
- return true;
- } else if (this.weighList.hair != 0) {
- return false;
- }
- }
+ return this.realTimeWeigh == 0;
+ // if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList.orderType == '杞嚭') {
+ // if (this.weighList.hair == 0) {
+ // return true;
+ // } else if (this.weighList.hair != 0) {
+ // return false;
+ // }
+ // }
},
// 鏄惁鏀剧┖鎸夐挳绂佺敤
isEvacuation() {
@@ -273,6 +299,9 @@
if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList.orderType == '杞叆') {
return this.weighList.hair == this.temporaryWeighObj.skin || this.temporaryWeighObj.skin == this.temporaryWeighObj.hair;
}
+ },
+ sideline() {
+ return this.weighList.orderType == '鍐呰喘' || this.weighList.orderType == '杞嚭';
}
},
methods: {
@@ -288,8 +317,16 @@
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;
}
}
});
@@ -375,6 +412,19 @@
// 鏀剧┖寮圭獥鍙栨秷
evacuationCancel() {
this.evacuationModalShow = false;
+ },
+ // input鑱氱劍
+ inputFocus(v) {
+ if (v == 1) {
+ this.isfocus1 = true;
+ } else {
+ this.isfocus2 = true;
+ }
+ },
+ // input澶辩劍
+ inputBlur() {
+ this.isfocus1 = false;
+ this.isfocus2 = false;
}
}
};
@@ -406,11 +456,13 @@
align-items: center;
justify-content: center;
font-size: 74rpx;
- font-family: Determination Sans;
font-weight: 400;
color: #ffffff;
line-height: 69rpx;
text-shadow: 0rpx 3rpx 14rpx rgba(0, 0, 0, 0.33);
+ text {
+ font-family: weighting;
+ }
}
.top_right {
display: flex;
@@ -418,7 +470,6 @@
justify-content: center;
flex: 2;
font-size: 31rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #ffffff;
view {
@@ -435,11 +486,8 @@
align-items: center;
flex-direction: column;
font-size: 28rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #d9e1fe;
- // position: relative;
- // top: vww(-10);
}
}
.middle-block {
@@ -449,17 +497,31 @@
background: #ffffff;
box-shadow: 0rpx 0rpx 14rpx 0rpx rgba(73, 120, 240, 0.14), 0rpx 7rpx 45rpx 0rpx rgba(73, 120, 240, 0.12);
border-radius: 20rpx;
- @include flex justify-content: center;
+ @include flex;
+ justify-content: center;
overflow: hidden;
.block-main {
width: 650rpx;
height: 350rpx;
- @include flex flex-direction: column;
+ @include flex;
+ flex-direction: column;
margin-bottom: vww(20);
+ position: relative;
.first-line,
.second-line {
width: 90%;
height: vww(44);
+ .focusClass {
+ color: #5b95fd;
+ }
+ .inputClass {
+ border: 1px solid rgba(73, 95, 252, 0.6) !important;
+ 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;
@@ -468,6 +530,8 @@
}
.first-line {
@include flex;
+ position: relative;
+ top: vww(8);
}
.second-line {
@include flex;
@@ -489,7 +553,6 @@
min-width: vww(50);
height: vww(45);
font-size: 21rpx;
- font-family: Microsoft YaHei;
font-weight: 400;
color: #ffffff;
text-align: center;
@@ -501,7 +564,6 @@
}
.num {
font-size: 40rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #303030;
}
@@ -527,13 +589,21 @@
align-items: flex-start;
flex-direction: column;
.main-information {
- width: 50%;
+ width: 100%;
height: 28rpx;
font-size: 28rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #303030;
@include flex;
+ justify-content: flex-start;
+ .prefix {
+ min-width: vww(60);
+ }
+ .suffix {
+ flex: 1;
+ margin-left: vww(12);
+ text-align: left;
+ }
}
}
}
@@ -552,8 +622,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