From ac6014d1bde8f6a34b4062bedaa3902eb30e4f38 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期五, 30 六月 2023 14:37:50 +0800
Subject: [PATCH] 提煤单详情，称重页面修改
---
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 261 +++++++++++++++++---------------
pages/tabbar-page/myPage-tabbar/myPage-tabbar.vue | 82 +++++----
pages/customer-page/customer-index/customer-index.vue | 3
pages/tabbar-page/index-tabbar/index-tabbar.vue | 8
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 117 +++++++++-----
5 files changed, 267 insertions(+), 204 deletions(-)
diff --git a/pages/customer-page/customer-index/customer-index.vue b/pages/customer-page/customer-index/customer-index.vue
index 37f6ad4..b9c51ef 100644
--- a/pages/customer-page/customer-index/customer-index.vue
+++ b/pages/customer-page/customer-index/customer-index.vue
@@ -22,7 +22,8 @@
<view class="dispatch-receive">
<view class="dispatch">{{ item.filedName||'' }}</view>
</view>
- <view class="point-number">
+ <view class="point-number"
+ v-if="roleType == 1">
<text class="residue">{{ item.cars2||'' }}</text>
<text>/{{ item.carNum ||''}}</text>
</view>
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 02a916c..3ef21f0 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
@@ -40,32 +40,45 @@
style="color: rgb(73, 123, 251);">
鏌ョ湅鏄庣粏
</view>
+
+ </view>
+ </view>
+
+ <!-- 绉伴噸鍘嗗彶-->
+ <view class="weigh-history"
+ v-if="showWeigh.length!==0">
+ <view class="block-main">
<view class="weigh-item"
v-for='item in showWeigh'
:key="item.id">
- <view class="item">
- <view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/skin.png') no-repeat;background-size: cover;">
- 鐨�</view>
- <view class="num">{{ item.skin }}</view>
+ <view class="weigh-time">
+ <u-tag :text="item.createTime.slice(-8,-3)"
+ plain></u-tag>
</view>
- <view class="item">
- <view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/hair.png') no-repeat;background-size: cover;">
- 姣�</view>
- <view class="num">{{ item.hair }}</view>
- </view>
- <view class="item">
- <view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
- 鍑�</view>
- <view class="num">{{ item.clean }}</view>
+ <view class="item-block">
+ <view class="item">
+ <view class="concrete"
+ style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/skin.png') no-repeat;background-size: cover;">
+ 鐨�</view>
+ <view class="num">{{ item.skin }}</view>
+ </view>
+ <view class="item">
+ <view class="concrete"
+ style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/hair.png') no-repeat;background-size: cover;">
+ 姣�</view>
+ <view class="num">{{ item.hair }}</view>
+ </view>
+ <view class="item">
+ <view class="concrete"
+ style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
+ 鍑�</view>
+ <view class="num">{{ item.clean }}</view>
+ </view>
</view>
</view>
</view>
</view>
-
-
+ <!-- 鏃堕棿绾� -->
<view class="timeLine">
<u-steps :current="dayRZ.length - 1"
direction="column"
@@ -214,7 +227,7 @@
completeOutSaleShow: false,
overTmWaixiao: null,
// 鍒よ缃戠粶鐘舵�侊紝
- normalCode: null
+ normalCode: true
};
},
onShow() {
@@ -611,9 +624,6 @@
height: 100%;
min-height: 380rpx;
margin: vww(18) vww(7) vww(11) vww(17);
- // flex-direction: column;
- // justify-content: space-between;
- // align-items: flex-start;
}
.status-button {
@@ -678,37 +688,58 @@
color: #7d7d7d;
}
- .weigh-item {
- width: 100%;
- height: vww(36);
- @include flex;
- justify-content: space-around;
- .item {
- min-width: vww(50);
- height: vww(45);
- font-size: 21rpx;
- font-weight: 400;
- color: #ffffff;
- text-align: center;
- line-height: vww(30);
+ }
+
+ // 绉伴噸鍘嗗彶
+ .weigh-history {
+ @extend .block-information;
+
+ .block-main {
+ @extend .block-main;
+ gap: 10rpx 20rpx;
+
+ .weigh-item {
+ width: 100%;
+ height: vww(80);
@include flex;
+ flex-direction: column;
+ justify-content: space-around;
+ align-items: flex-start;
- .concrete {
- width: vww(36);
+ .item-block {
+ width: 100%;
height: vww(36);
- }
+ @include flex;
+ justify-content: space-around;
- .num {
- font-size: 40rpx;
- font-weight: 300;
- color: #303030;
+ .item {
+ min-width: vww(50);
+ height: vww(45);
+ font-size: 21rpx;
+ font-weight: 400;
+ color: #ffffff;
+ text-align: center;
+ line-height: vww(30);
+ @include flex;
+
+ .concrete {
+ width: vww(36);
+ height: vww(36);
+ }
+
+ .num {
+ font-size: 40rpx;
+ font-weight: 300;
+ color: #303030;
+ }
+ }
}
}
}
}
-
+ // 鏃堕棿绾�
.timeLine {
height: 300rpx;
min-height: 300rpx;
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 ba94a84..11cfd62 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
@@ -25,82 +25,6 @@
</view>
<view class="bottom"><text>TIP:褰撳墠鐘舵�佷负姝ｅ父鏃跺彲浠ョО閲�</text></view>
</view>
- <!-- <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"
- :class="{ focusClass: isfocus1 }">鐨噸</view>
- <view class="input-container"
- :class="{ inputClass: isfocus1, disabledClass: haveInputOrigin }">
- <u--input placeholder="璇疯緭鍏ョ毊閲�"
- border="surround"
- v-model="weighData.coalContactSkin"
- @focus="inputFocus(1)"
- @blur="inputBlur"
- @change="inputChange"
- :disabled="haveInputOrigin"></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, disabledClass: haveInputOrigin }">
- <u--input placeholder="璇疯緭鍏ユ瘺閲�"
- border="surround"
- v-model="weighData.coalContactHair"
- @focus="inputFocus(2)"
- @blur="inputBlur"
- @change="inputChange"
- :disabled="haveInputOrigin"></u--input>
- </view>
- <view class="unit"
- :class="{ focusClass: isfocus2 }">鍚�</view>
- </view>
- <view class="second-line">
- <view class="label-text">鍑�閲�</view>
- <view class="input-container"
- :class="{ disabledClass: haveInputOrigin }">
- <u--input placeholder="鍑�閲�"
- border="surround"
- v-model="coalContactClean"
- :disabled="haveInputOrigin"></u--input>
- </view>
- <view class="unit">鍚�</view>
- </view>
- </view>
- <view class="block-sideline"
- v-if="sideline">
- <view class="first-line"><combined-title title="鍘熷彂淇℃伅"></combined-title></view>
- <view class="weigh-item">
- <view class="item">
- <view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/skin.png') no-repeat;background-size: cover;">
- 鐨�</view>
- <view class="num">{{ weighList.skinTwo }}</view>
- </view>
- <view class="item">
- <view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/hair.png') no-repeat;background-size: cover;">
- 姣�</view>
- <view class="num">{{ weighList.hairTwo }}</view>
- </view>
- <view class="item">
- <view class="concrete"
- style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
- 鍑�</view>
- <view class="num">{{ weighList.cleanTwo }}</view>
- </view>
- </view>
- </view>
- </view>
- <view v-else
- style="width: 100%;height: 40rpx;"></view> -->
<view class="bottom-block">
<view class="block-main">
<view class="main-information"
@@ -146,17 +70,20 @@
</view>
<view class="main-information">
<view class="prefix">鐨噸:</view>
- <view class="suffix">{{ showWeigh.skin||"" }}
+ <view class="suffix">
+ {{temporaryWeighObj.skin?temporaryWeighObj.skin:showWeigh.skin?showWeigh.skin:''}}
</view>
</view>
<view class="main-information">
<view class="prefix">姣涢噸:</view>
- <view class="suffix">{{showWeigh.hair||""}}
+ <view class="suffix">
+ {{temporaryWeighObj.hair?temporaryWeighObj.hair:showWeigh.hair?showWeigh.hair:''}}
</view>
</view>
<view class="main-information">
<view class="prefix">鍑�閲�:</view>
- <view class="suffix">{{ showWeigh.clean||"" }}
+ <view class="suffix">
+ {{ temporaryWeighObj.clean?temporaryWeighObj.clean:showWeigh.clean?showWeigh.clean:'' }}
</view>
</view>
<view class="main-information">
@@ -165,6 +92,42 @@
</view>
</view>
</view>
+ <!-- 绉伴噸鍘嗗彶-->
+ <transition name="weighHistory">
+ <view class="weigh-history"
+ v-if="weighHistory.length!==0">
+ <view class="block-main">
+ <view class="weigh-item"
+ v-for='item in weighHistory'
+ :key="item.id">
+ <view class="weigh-time">
+ <u-tag :text="item.createTime.slice(-8,-3)"
+ plain></u-tag>
+ </view>
+ <view class="item-block">
+ <view class="item">
+ <view class="concrete"
+ style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/skin.png') no-repeat;background-size: cover;">
+ 鐨�</view>
+ <view class="num">{{ item.skin }}</view>
+ </view>
+ <view class="item">
+ <view class="concrete"
+ style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/hair.png') no-repeat;background-size: cover;">
+ 姣�</view>
+ <view class="num">{{ item.hair }}</view>
+ </view>
+ <view class="item">
+ <view class="concrete"
+ style="background: url('https://mx.jzeg.cn:9095/appimg/image/banner/clean.png') no-repeat;background-size: cover;">
+ 鍑�</view>
+ <view class="num">{{ item.clean }}</view>
+ </view>
+ </view>
+ </view>
+ </view>
+ </view>
+ </transition>
<view class="three">
<!-- 鏀剧┖ -->
<u-button type="primary"
@@ -189,9 +152,10 @@
<u-button type="primary"
text="缁х画鍗歌揣"
@click="UnloadingAgainHandle"
+ :loading="UnloadingAgainLoading"
+ loadingText="纭"
v-if='canUnload'></u-button>
</view>
- <!-- <view class="four" v-if="weighList.orderType !== '澶栬喘'">濡傛偍闇�瑕佽皟鏁磋杞借揣鍝佸惃鏁帮紝璇风偣鍑昏繑鍥炲姞鍑忓惃</view> -->
<!-- 鏀剧┖寮圭獥 -->
<view class="evacuationModal">
<u-modal :show="evacuationModalShow"
@@ -256,9 +220,9 @@
weighList: {},
// 涓存椂绉伴噸瀵硅薄
temporaryWeighObj: {
- skin: 0,
- hair: 0,
- clean: 0
+ skin: null,
+ hair: null,
+ clean: null
},
infraredStatus: false, // 绾㈠鐘舵�侊紝
// 鏀剧┖鎺у埗
@@ -281,30 +245,31 @@
// 澶栬喘绫诲瀷
outBuy: true,
// 缁х画鍗歌揣鎸夐挳
- canUnload: false
+ canUnload: false,
+ UnloadingAgainLoading: false
};
},
watch: {
realTimeWeigh(newV, oldV) {
if (this.weighList.orderType == '澶栭攢' || this.weighList.orderType == '鍐呴攢' || this.weighList.orderType ==
'杞嚭') {
- if (this.weighList.skin == 0) {
+ if (this.showWeigh.skin == 0) {
this.temporaryWeighObj.skin = newV;
} else {
this.temporaryWeighObj.hair = newV;
- this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.weighList.skin).toFixed(2);
+ this.temporaryWeighObj.clean = (this.temporaryWeighObj.hair - this.showWeigh.skin).toFixed(2);
this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this.temporaryWeighObj
.clean < 0;
}
} else if (this.weighList.orderType == '澶栬喘' || this.weighList.orderType == '鍐呰喘' || this.weighList
.orderType == '杞叆') {
- if (this.weighList.hair == 0) {
+ if (this.showWeigh.hair == 0) {
this.temporaryWeighObj.hair = newV;
} else {
this.temporaryWeighObj.skin = newV;
- this.temporaryWeighObj.clean = (this.weighList.hair - this.temporaryWeighObj.skin).toFixed(2);
+ this.temporaryWeighObj.clean = (this.showWeigh.hair - this.temporaryWeighObj.skin).toFixed(2);
this.isweigh = this.temporaryWeighObj.clean > this.weighList.orderSurplus || this.temporaryWeighObj
- .clean < 0;
+ .clean < 0 || this.showWeigh.skin < newV;
}
}
},
@@ -350,6 +315,13 @@
showWeigh() {
return this.weighList.tmTaskCoalItems ? (this.weighList.tmTaskCoalItems[0] ? this
.weighList.tmTaskCoalItems[0] : {}) : {}
+ },
+ nextShowWeigh() {
+ return this.weighList.tmTaskCoalItems ? (this.weighList.tmTaskCoalItems[1] ? this
+ .weighList.tmTaskCoalItems[1] : {}) : {}
+ },
+ weighHistory() {
+ return this.weighList.tmTaskCoalItems ? this.weighList.tmTaskCoalItems : []
}
},
methods: {
@@ -454,6 +426,7 @@
},
// 缁х画鍗歌揣
UnloadingAgainHandle() {
+ this.UnloadingAgainLoading = true
this.$reqPost('continueWeigh', {
deptId: this.weighData.deptId,
sceneId: this.weighData.sceneId,
@@ -467,6 +440,7 @@
sceneInOut: this.weighData.sceneInOut,
weigh: this.realTimeWeigh
}, 'json').then(res => {
+ this.UnloadingAgainLoading = false
if (res.code == 0) {
this.$u.toast('鎿嶄綔鎴愬姛锛屽嵆灏嗚繑鍥炰笂涓�椤�');
setTimeout(() => {
@@ -500,24 +474,6 @@
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;
- },
- inputChange() {
- if (this.weighData.coalContactHair > 0 && this.weighData.coalContactSkin > 0) {
- this.isInputOrigin = true;
- }
- }
}
};
</script>
@@ -530,16 +486,91 @@
align-items: center;
}
+ // 绉伴噸鍘嗗彶
+ .weighHistory-enter-active,
+ .weighHistory-leave-active {
+ transition: opacity 0.5s ease;
+ }
+
+ .weighHistory-enter-from,
+ .weighHistory-leave-to {
+ opacity: 0;
+ }
+
+ .weigh-history {
+ width: 690rpx;
+ height: 100%;
+ min-height: 420rpx;
+ margin: vww(10) auto vww(20);
+ background: #ffffff;
+ box-shadow: 4rpx 6rpx 51rpx 0rpx rgba(73, 120, 240, 0.11);
+ border-radius: 20rpx;
+ position: relative;
+ font-size: 30rpx;
+ font-weight: 300;
+ color: #303030;
+ overflow: hidden;
+
+ .block-main {
+ display: grid;
+ grid-template-columns: auto;
+ grid-template-rows: repeat(auto-fit, minmax(40rpx, 1fr));
+ width: 94%;
+ height: 100%;
+ min-height: 380rpx;
+ margin: vww(18) vww(7) vww(11) vww(17);
+ gap: 10rpx 20rpx;
+
+ .weigh-item {
+ width: 100%;
+ height: vww(80);
+ @include flex;
+ flex-direction: column;
+ justify-content: space-around;
+ align-items: flex-start;
+
+ .item-block {
+ width: 100%;
+ height: vww(36);
+ @include flex;
+ justify-content: space-around;
+
+ .item {
+ min-width: vww(50);
+ height: vww(45);
+ font-size: 21rpx;
+ font-weight: 400;
+ color: #ffffff;
+ text-align: center;
+ line-height: vww(30);
+ @include flex;
+
+ .concrete {
+ width: vww(36);
+ height: vww(36);
+ }
+
+ .num {
+ font-size: 40rpx;
+ font-weight: 300;
+ color: #303030;
+ }
+ }
+ }
+ }
+ }
+ }
+
::v-deep.weighingDevice {
width: 100%;
- height: 100vh;
+ height: 100%;
display: flex;
flex-direction: column;
.one {
// flex: 3;
height: 290rpx;
- margin: vww(20) vww(20) 0 vww(20);
+ margin: vww(20);
border-radius: vww(15);
.top {
@@ -692,7 +723,7 @@
width: calc(100% - 60rpx);
box-sizing: border-box;
height: 630rpx;
- margin: 0 vww(15) vww(25) vww(15);
+ margin: 0 vww(15) vww(15) vww(15);
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;
@@ -745,16 +776,6 @@
.u-button {
width: vww(90);
}
-
- // .u-button {
- // &:nth-of-type(2) {
- // margin-left: vww(10);
- // }
-
- // &:nth-of-type(3) {
- // margin-left: vww(10);
- // }
- // }
}
.four {
diff --git a/pages/tabbar-page/index-tabbar/index-tabbar.vue b/pages/tabbar-page/index-tabbar/index-tabbar.vue
index 16bb79f..1c4698e 100644
--- a/pages/tabbar-page/index-tabbar/index-tabbar.vue
+++ b/pages/tabbar-page/index-tabbar/index-tabbar.vue
@@ -70,7 +70,7 @@
});
}
// 瀹㈡埛鑾峰彇鏃ヨ鍒�
- if (this.roleType == 1) {
+ if (this.roleType == 1 || this.roleType == 4) {
this.$reqGet('GetOrderPlan').then(res => {
if (res.data) {
this.orderPlanDataStore = res.data;
@@ -217,6 +217,12 @@
this.$refs.driverIndexRef.init();
});
break;
+ case 4:
+ console.log('customerIndexRef');
+ this.$nextTick(() => {
+ this.$refs.customerIndexRef.init();
+ });
+ break;
default:
break;
}
diff --git a/pages/tabbar-page/myPage-tabbar/myPage-tabbar.vue b/pages/tabbar-page/myPage-tabbar/myPage-tabbar.vue
index 6c2651f..ff1c1de 100644
--- a/pages/tabbar-page/myPage-tabbar/myPage-tabbar.vue
+++ b/pages/tabbar-page/myPage-tabbar/myPage-tabbar.vue
@@ -1,51 +1,55 @@
<template>
<view>
- <customer-my-page v-if="roleType == 1" ref="customerMyPageRef"></customer-my-page>
- <freight-forwarder-my-page v-if="roleType == 2" ref="freightForwarderMyPageRef"></freight-forwarder-my-page>
- <driver-my-page v-if="roleType == 3" ref="driverMyRef"></driver-my-page>
+ <customer-my-page v-if="roleType == 1||roleType == 4"
+ ref="customerMyPageRef"></customer-my-page>
+ <freight-forwarder-my-page v-if="roleType == 2"
+ ref="freightForwarderMyPageRef"></freight-forwarder-my-page>
+ <driver-my-page v-if="roleType == 3"
+ ref="driverMyRef"></driver-my-page>
<tab-bar :current="2"></tab-bar>
</view>
</template>
<script>
-import customerMyPage from '@/pages/customer-page/customer-my/customer-my.vue';
-import driverMyPage from '@/pages/driver-page/drvier-my/drvier-my.vue';
-import freightForwarderMyPage from '@/pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue';
+ import customerMyPage from '@/pages/customer-page/customer-my/customer-my.vue';
+ import driverMyPage from '@/pages/driver-page/drvier-my/drvier-my.vue';
+ import freightForwarderMyPage from '@/pages/freight-forwarder-page/freightForwarder-my/freightForwarder-my.vue';
-export default {
- components: {
- customerMyPage,
- driverMyPage,
- freightForwarderMyPage
- },
- onShow() {
- this.init();
- },
- data() {
- return {};
- },
- computed: {
- roleType() {
- return uni.getStorageSync('roleType');
- }
- },
- methods: {
- init() {
- switch (this.roleType) {
- case 1:
- this.$refs.customerMyPageRef.init();
- break;
- case 2:
- this.$refs.freightForwarderMyPageRef.init();
- break;
- case 3:
- this.$refs.driverMyRef.init();
- default:
- break;
+ export default {
+ components: {
+ customerMyPage,
+ driverMyPage,
+ freightForwarderMyPage
+ },
+ onShow() {
+ this.init();
+ },
+ data() {
+ return {};
+ },
+ computed: {
+ roleType() {
+ return uni.getStorageSync('roleType');
+ }
+ },
+ methods: {
+ init() {
+ switch (this.roleType) {
+ case 1:
+ this.$refs.customerMyPageRef.init();
+ break;
+ case 2:
+ this.$refs.freightForwarderMyPageRef.init();
+ break;
+ case 3:
+ this.$refs.driverMyRef.init();
+ default:
+ break;
+ }
}
}
- }
-};
+ };
</script>
-<style lang="scss" scoped></style>
+<style lang="scss"
+ scoped></style>
\ No newline at end of file
--
Gitblit v1.9.1