From bb52e0d4baffe8e0486c951e525b6614bd4aaa28 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 24 四月 2023 14:08:56 +0800
Subject: [PATCH] 修改样式，修复已知bug
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 99 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 86 insertions(+), 13 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 077c4e2..56c8f25 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
@@ -20,19 +20,60 @@
</view> -->
</view>
</view>
- <view class="bottom" v-if="weighList.orderType == '澶栭攢' || weighList.orderType == '杞嚭' || weighList.orderType == '澶栬喘'">
+ <view class="bottom" v-if="weighList.orderType == '鍐呰喘' || weighList.orderType == '杞叆'">
<view>
<view style="font-weight: 600;">鍘熷彂淇℃伅</view>
- <text v-if="weighList.orderType == '澶栬喘' && weighList.hair == 0">
- 姣涢噸:{{ coalContactHair || '' }}鐨噸:{{ coalContactSkin || '' }}鍑�閲�:{{ (Number(this.coalContactHair) - Number(this.coalContactSkin)).toFixed(2) || '' }}
- </text>
- <text v-else>姣涢噸:{{ primaryHair || '' }}鐨噸:{{ primarySkin || '' }}鍑�閲�:{{ primaryClean || '' }}</text>
+
+ <text>姣涢噸:{{ primaryHair || '' }}鐨噸:{{ primarySkin || '' }}鍑�閲�:{{ primaryClean || '' }}</text>
</view>
+ </view>
+ <view class="bottom" v-else-if="weighList.orderType == '澶栬喘' && weighList.hair == 0">
+ <text>
+ 姣涢噸:{{ coalContactHair || '' }}鐨噸:{{ coalContactSkin || '' }}鍑�閲�:{{ (Number(this.coalContactHair) - Number(this.coalContactSkin)).toFixed(2) || '' }}
+ </text>
</view>
<view class="bottom"><text>TIP:褰撳墠鐘舵�佷负姝ｅ父鏃跺彲浠ョО閲�</text></view>
</view>
<view class="two">
- <p>璁㈠崟缂栧彿锛歿{ weighList.code || '' }}</p>
+ <uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁">
+ <uni-tr>
+ <uni-th align="left">璁㈠崟缂栧彿</uni-th>
+ <uni-td align="right">{{ weighList.code || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">璁㈠崟绫诲瀷</uni-th>
+ <uni-td align="right">{{ weighList.orderType || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">璁㈠崟浣欓噺</uni-th>
+ <uni-td align="right">{{ weighList.orderSurplus || 0 }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">姣涢噸</uni-th>
+ <uni-td align="right">{{ temporaryWeighObj.hair == 0 ? weighList.hair : temporaryWeighObj.hair }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鐨噸</uni-th>
+ <uni-td align="right">{{ temporaryWeighObj.skin == 0 ? weighList.skin : temporaryWeighObj.skin }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鍑�閲�</uni-th>
+ <uni-td align="right">{{ temporaryWeighObj.clean == 0 ? weighList.clean : temporaryWeighObj.clean }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鐓ょ鍚嶇О</uni-th>
+ <uni-td align="right">{{ weighList.coalName || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鐭垮満鍚嶇О</uni-th>
+ <uni-td align="right">{{ weighList.deptName || '' }}</uni-td>
+ </uni-tr>
+ <uni-tr>
+ <uni-th align="left">鐓ゅ満鍚嶇О</uni-th>
+ <uni-td align="right">{{ weighList.filedName || '' }}</uni-td>
+ </uni-tr>
+ </uni-table>
+ <!-- <p>璁㈠崟缂栧彿锛歿{ weighList.code || '' }}</p>
<p>璁㈠崟绫诲瀷锛歿{ weighList.orderType || '' }}</p>
<p>璁㈠崟浣欓噺锛歿{ weighList.orderSurplus || 0 }}</p>
<p>鐨噸锛歿{ temporaryWeighObj.skin == 0 ? weighList.skin : temporaryWeighObj.skin }}</p>
@@ -40,7 +81,7 @@
<p>鍑�閲嶏細{{ temporaryWeighObj.clean == 0 ? weighList.clean : temporaryWeighObj.clean }}</p>
<p>鐓ょ鍚嶇О锛歿{ weighList.coalName || '' }}</p>
<p>鍗曚綅鍚嶇О锛歿{ weighList.deptName || '' }}</p>
- <p>鐭垮満鍚嶇О锛歿{ weighList.filedName || '' }}</p>
+ <p>鐭垮満鍚嶇О锛歿{ weighList.filedName || '' }}</p> -->
</view>
<view class="three">
<!-- 鏀剧┖ -->
@@ -129,7 +170,7 @@
takeCoalId: null,
weighHouseCode: '',
isConfirmWeighLoading: false, //纭畾绉伴噸鎸夐挳
- realTimeWeigh: '',
+ realTimeWeigh: 0,
weighList: {},
// 涓存椂绉伴噸瀵硅薄
temporaryWeighObj: {
@@ -162,6 +203,7 @@
if (this.weighList.skin == 0) {
// this.temporaryWeighObj.skin = this.realTimeWeigh;
this.temporaryWeighObj.skin = newV;
+ this.isweigh = this.temporaryWeighObj.skin > this.weighList.orderSurplus;
} else {
// this.temporaryWeighObj.hair = this.realTimeWeigh;
this.temporaryWeighObj.hair = newV;
@@ -172,6 +214,7 @@
if (this.weighList.hair == 0) {
// this.temporaryWeighObj.hair = this.realTimeWeigh;
this.temporaryWeighObj.hair = newV;
+ this.isweigh = this.temporaryWeighObj.hair > this.weighList.orderSurplus;
} else {
// this.temporaryWeighObj.skin = this.realTimeWeigh;
this.temporaryWeighObj.skin = newV;
@@ -186,11 +229,13 @@
this.weighData.weigh = this.realTimeWeigh = v;
console.log(this.realTimeWeigh, '鐪熷疄閲嶉噺鏀瑰彉浜�');
},
- deep: true
+ deep: true,
+ immediate: true
}
},
onShow() {
this.init();
+ this.realTimeWeigh = 0;
// this.initWebSocket();
},
computed: {
@@ -389,12 +434,12 @@
display: flex;
flex-direction: column;
.one {
- flex: 2;
+ flex: 3;
border: vww(2) solid #dddddd;
margin: vww(20) vww(20) 0 vww(20);
border-radius: vww(15);
.top {
- height: 80%;
+ height: 75%;
display: flex;
.top_left {
flex: 3;
@@ -415,8 +460,13 @@
}
.bottom {
text-align: center;
- position: relative;
- top: vww(-30);
+ height: 25%;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ flex-direction: column;
+ // position: relative;
+ // top: vww(-10);
}
}
.two {
@@ -425,6 +475,29 @@
margin: vww(20);
border-radius: vww(10);
padding: vww(20);
+ .uni-table {
+ .uni-table-tr {
+ padding: 0;
+ border: vww(1) solid #c6c6c6;
+ .uni-table-th {
+ font-size: vww(14);
+ height: vww(30);
+ line-height: vww(30);
+ padding: vww(5) vww(10);
+ color: #111111;
+ font-weight: 500;
+ background: #e2e2e2;
+ }
+ .uni-table-td {
+ font-size: vww(14);
+ font-weight: 400;
+ height: vww(30);
+ line-height: vww(30);
+ padding: vww(5) vww(10);
+ color: #111111;
+ }
+ }
+ }
p {
text-align: center;
font-size: vww(20);
--
Gitblit v1.9.1