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 | 161 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 139 insertions(+), 22 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 f3a19fa..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,16 +20,60 @@
</view> -->
</view>
</view>
- <view class="bottom" v-if="weighList.orderType == '鍐呰喘' || weighList.orderType == '杞嚭'">
+ <view class="bottom" v-if="weighList.orderType == '鍐呰喘' || weighList.orderType == '杞叆'">
<view>
<view style="font-weight: 600;">鍘熷彂淇℃伅</view>
- <text>鐨噸{{ primarySkin || '' }}姣涢噸{{ primaryHair || '' }}鍑�閲峽{ 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>
@@ -37,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">
<!-- 鏀剧┖ -->
@@ -65,11 +109,24 @@
@cancel="evacuationCancel"
></u-modal>
</view>
+ <!-- 澶栬喘绫诲瀷鎵嬪姩杈撳叆寮圭獥 -->
<view class="">
- <u-modal :show="firstHairCustomernameShow" title="濉啓閲嶉噺" @confirm="OutsourcingConfirm">
+ <u-modal :show="firstHairCustomernameShow" title="濉啓鍘熷彂閲嶉噺" @confirm="OutsourcingConfirm">
<view class="">
- <view class=""><u--input placeholder="璇疯緭鍏ユ瘺閲�" border="surround" v-model="CoalContactHair" type="digit"></u--input></view>
- <view class=""><u--input placeholder="璇疯緭鍏ョ毊閲�" border="surround" v-model="CoalContactSkin" type="digit"></u--input></view>
+ <text>姣涢噸:</text>
+ <view class=""><u--input placeholder="璇疯緭鍏ユ瘺閲�" v-model="coalContactHair" type="digit"></u--input></view>
+ <text>鐨噸:</text>
+ <view class=""><u--input placeholder="璇疯緭鍏ョ毊閲�" v-model="coalContactSkin" type="digit"></u--input></view>
+ </view>
+ </u-modal>
+ </view>
+ <!-- 鎵嬪姩杈撳叆涔嬪悗鐨勪簩娆″脊绐� -->
+ <view class="secondary-confirmation">
+ <u-modal :show="secondConfirmShow" title="璇风‘璁ゅ師鍙戦噸閲�" :showCancelButton="true" @confirm="secondConfirm" @cancel="secondCancel">
+ <view class="secondary-confirmation__main">
+ <view class="secondary-child">姣涢噸:{{ coalContactHair }}</view>
+ <view class="secondary-child">鐨噸:{{ coalContactSkin }}</view>
+ <view class="secondary-child">鍑�閲�:{{ (Number(this.coalContactHair) - Number(this.coalContactSkin)).toFixed(2) }}</view>
</view>
</u-modal>
</view>
@@ -105,12 +162,15 @@
equipmentCode: '',
weigh: 0,
tmCode: '',
- sceneInOut: ''
+ sceneInOut: '',
+ coalContactClean: 0,
+ coalContactHair: 0,
+ coalContactSkin: 0
},
takeCoalId: null,
weighHouseCode: '',
isConfirmWeighLoading: false, //纭畾绉伴噸鎸夐挳
- realTimeWeigh: '',
+ realTimeWeigh: 0,
weighList: {},
// 涓存椂绉伴噸瀵硅薄
temporaryWeighObj: {
@@ -131,8 +191,10 @@
isweigh: false,
// 澶栬喘绫诲瀷绉伴噸鍑虹幇寮圭獥濉啓姣涳紝鐨紝
firstHairCustomernameShow: false,
- CoalContactHair: '',
- CoalContactSkin: ''
+ coalContactHair: '',
+ coalContactSkin: '',
+ // 浜屾纭
+ secondConfirmShow: false
};
},
watch: {
@@ -141,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;
@@ -151,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;
@@ -165,12 +229,13 @@
this.weighData.weigh = this.realTimeWeigh = v;
console.log(this.realTimeWeigh, '鐪熷疄閲嶉噺鏀瑰彉浜�');
},
- immediate: true,
- deep: true
+ deep: true,
+ immediate: true
}
},
onShow() {
this.init();
+ this.realTimeWeigh = 0;
// this.initWebSocket();
},
computed: {
@@ -210,17 +275,31 @@
this.weighData.tmId = res.data.id;
this.weighData.carNo = res.data.carNo;
this.weighData.tmCode = res.data.code;
- if (this.weighList.orderType == '澶栭攢' && this.weighList.hair == 0) {
+ if (this.weighList.orderType == '澶栬喘' && this.weighList.hair == 0) {
this.firstHairCustomernameShow = true;
}
}
});
},
+ // 澶栬喘绫诲瀷杈撳叆鐐瑰嚮纭涔嬪悗浜屾纭
OutsourcingConfirm() {
- this.weighData.CoalContactSkin = Number(this.CoalContactSkin);
- this.weighData.CoalContactHair = Number(this.CoalContactHair);
- this.weighData.CoalContactclean = Number(this.CoalContactHair) - Number(this.CoalContactSkin);
- this.saveWeigh();
+ this.weighData.coalContactSkin = Number(this.coalContactSkin);
+ this.weighData.coalContactHair = Number(this.coalContactHair);
+ this.weighData.coalContactClean = Number((Number(this.coalContactHair) - Number(this.coalContactSkin)).toFixed(2));
+ if (Number(this.coalContactSkin) == 0 || Number(this.coalContactHair) == 0) {
+ this.$u.toast('閲嶉噺涓嶈兘涓�0,璇烽噸鏂板～鍐�');
+ } else {
+ this.secondConfirmShow = true;
+ }
+ },
+ // 浜屾纭寮圭獥 鐐瑰嚮纭畾
+ secondConfirm() {
+ this.secondConfirmShow = false;
+ this.firstHairCustomernameShow = false;
+ },
+ // 浜屾寮圭獥鐐瑰嚮鍙栨秷
+ secondCancel() {
+ this.secondConfirmShow = false;
},
/**
* @纭绉伴噸绛夊緟鍚庣鎻愪緵瀹炴椂绉伴噸鎺ュ彛锛岃幏鍙栫毊閲嶏紝姣涢噸
@@ -355,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;
@@ -381,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 {
@@ -391,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);
@@ -417,4 +524,14 @@
flex: 0.5;
}
}
+.secondary-confirmation__main {
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ align-items: center;
+ .secondary-child {
+ display: flex;
+ justify-content: space-between;
+ }
+}
</style>
--
Gitblit v1.9.1