From 07b5244ba8572922728f2663883915861554e7e0 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期日, 02 七月 2023 17:30:54 +0800
Subject: [PATCH] 验质逻辑修改
---
pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock.vue | 223 ++++++++++++++++++++++---------------------
pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue | 2
pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue | 25 +++-
pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue | 2
pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan.vue | 35 ++++--
pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue | 2
pages/driver-page/driver-index/bill-of-lading-details/bill-of-lading-details.vue | 2
pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue | 2
8 files changed, 156 insertions(+), 137 deletions(-)
diff --git a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
index 905def3..6713d78 100644
--- a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
+++ b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails.vue
@@ -122,7 +122,7 @@
orderPlanId: null,
orderCode: null,
orderPlanDetail: {},
- coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚'],
+ coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚', '楠岃川瀹屾垚'],
yyDailyList: [],
// 棰嗗彇鏁伴噺
cars2: '',
diff --git a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue
index 754bcd2..cb10d83 100644
--- a/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue
+++ b/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanMore/fayunPlanMore.vue
@@ -112,7 +112,7 @@
id: '',
yyDailyList: {},
orderPlanDetail: {},
- coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚'],
+ coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚', '楠岃川瀹屾垚'],
index: '',
onlineurl,
};
diff --git a/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue b/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
index 97fce5d..96537cd 100644
--- a/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
+++ b/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
@@ -330,7 +330,7 @@
// 鐐瑰嚮鍙崇澶磋鎯呭脊绐�
faYunDetailobj: {},
modalShow: false,
- coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚'],
+ coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚', '楠岃川瀹屾垚'],
onlineurl,
};
},
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 69817f9..78d101b 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
@@ -195,7 +195,7 @@
openId: null,
openName: ''
},
- coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚'], // 鐘舵��
+ coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚', '楠岃川瀹屾垚'], // 鐘舵��
weighHouseCode: '',
// 鏀剧┖寮圭獥鎺у埗鍙橀噺
evacuationModalShow: false,
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock.vue b/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock.vue
index ac4ef2e..51c1a5e 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/punchTheClock/punchTheClock.vue
@@ -3,9 +3,10 @@
<view class="punchTheClock">
<!-- 鎵撳崱鎸夐挳 -->
<view class="punchTheClock_container">
- <view class="punchTheClock_btn" @click="arrive">
+ <view class="punchTheClock_btn"
+ @click="arrive">
<view>
- <p>{{ coalStatus == 2 ? '宸茬鍒�' : '绛惧埌/鎵撳崱' }}</p>
+ <p>{{ coalStatus == 1 ? '宸茬鍒�' : '绛惧埌/鎵撳崱' }}</p>
<p>{{ nowTime }}</p>
</view>
</view>
@@ -18,123 +19,127 @@
</template>
<script>
-import { todayDate } from '@/utils/util.js';
-export default {
- onLoad(params) {
- this.punchTheClockObj.tmcoa = params.tmId.toString();
- this.coalStatus = params.coalStatus;
- },
- data() {
- return {
- nowTime: '',
- coalStatus: 0,
- punchTheClockObj: {
- tmcoa: null,
- latA: null,
- latB: null
- }
- };
- },
- onShow() {
- this.getSetting(); //鑾峰彇鎺堟潈
- this.getFuzzyLocation(); //鑾峰彇浣嶇疆
- this.todayDate(); //褰撳墠鏃堕棿
- },
- methods: {
- getSetting() {
- // 鑾峰彇鏉冮檺淇℃伅
- wx.getSetting({
- success(res) {
- if (!res.authSetting['scope.userFuzzyLocation']) {
- wx.authorize({
- scope: 'scope.userFuzzyLocation',
- success(res) {
- uni.showToast({
- title: '鎺堟潈鎴愬姛锛�'
- });
- }
- });
- }
- },
- fail() {
- console.log('鑾峰彇澶辫触');
+ import { todayDate } from '@/utils/util.js';
+ export default {
+ onLoad(params) {
+ this.punchTheClockObj.tmcoa = params.tmId.toString();
+ this.coalStatus = params.coalStatus;
+ },
+ data() {
+ return {
+ nowTime: '',
+ coalStatus: 0,
+ punchTheClockObj: {
+ tmcoa: null,
+ latA: null,
+ latB: null
}
- });
+ };
},
- getFuzzyLocation() {
- let that = this;
- wx.getFuzzyLocation({
- type: 'wgs84',
- success(res) {
- console.log(res, '鑾峰彇浣嶇疆', that);
- that.punchTheClockObj.latB = res.latitude;
- that.punchTheClockObj.latA = res.longitude;
- }
- });
+ onShow() {
+ this.getSetting(); //鑾峰彇鎺堟潈
+ this.getFuzzyLocation(); //鑾峰彇浣嶇疆
+ this.todayDate(); //褰撳墠鏃堕棿
},
- todayDate() {
- setInterval(() => {
- this.nowTime = todayDate('hms');
- }, 1000);
- },
- // 绛惧埌
- arrive() {
- if (this.punchTheClockObj.latA && this.punchTheClockObj.latB) {
- console.log(this.punchTheClockObj);
- this.$reqPost('arrive', this.punchTheClockObj, 'params').then(res => {
- console.log(res, '绛惧埌');
- if (res.code == 0) {
- this.$u.toast('绛惧埌鎴愬姛');
- setTimeout(() => {
- uni.navigateBack(
- {
- delta: 1
- },
- 500
- );
- });
- } else {
- this.$u.toast(res.msg ? res.msg : '绛惧埌澶辫触');
+ methods: {
+ getSetting() {
+ // 鑾峰彇鏉冮檺淇℃伅
+ wx.getSetting({
+ success(res) {
+ if (!res.authSetting['scope.userFuzzyLocation']) {
+ wx.authorize({
+ scope: 'scope.userFuzzyLocation',
+ success(res) {
+ uni.showToast({
+ title: '鎺堟潈鎴愬姛锛�'
+ });
+ }
+ });
+ }
+ },
+ fail() {
+ console.log('鑾峰彇澶辫触');
}
});
- } else {
- this.$u.toast('鏆傝幏鍙栦笉鍒板埌褰撳墠浣嶇疆');
+ },
+ getFuzzyLocation() {
+ let that = this;
+ wx.getFuzzyLocation({
+ type: 'wgs84',
+ success(res) {
+ console.log(res, '鑾峰彇浣嶇疆', that);
+ that.punchTheClockObj.latB = res.latitude;
+ that.punchTheClockObj.latA = res.longitude;
+ }
+ });
+ },
+ todayDate() {
+ setInterval(() => {
+ this.nowTime = todayDate('hms');
+ }, 1000);
+ },
+ // 绛惧埌
+ arrive() {
+ if (this.punchTheClockObj.latA && this.punchTheClockObj.latB) {
+ console.log(this.punchTheClockObj);
+ this.$reqPost('arrive', this.punchTheClockObj, 'params').then(res => {
+ console.log(res, '绛惧埌');
+ if (res.code == 0) {
+ this.$u.toast('绛惧埌鎴愬姛');
+ setTimeout(() => {
+ uni.navigateBack({
+ delta: 1
+ },
+ 500
+ );
+ });
+ } else {
+ this.$u.toast(res.msg ? res.msg : '绛惧埌澶辫触');
+ }
+ });
+ } else {
+ this.$u.toast('鏆傝幏鍙栦笉鍒板埌褰撳墠浣嶇疆');
+ }
}
}
- }
-};
+ };
</script>
-<style lang="scss" scoped>
-.punchTheClock {
- height: 100vh;
- display: flex;
- justify-content: center;
- align-items: center;
- .punchTheClock_container {
- .punchTheClock_btn {
- width: vww(240);
- height: vww(240);
- color: #ffffff;
- font-size: vww(20);
- border-radius: 50%;
- background-color: #36d4e5;
- display: flex;
- justify-content: center;
- align-items: center;
- p {
- text-align: center;
+<style lang="scss"
+ scoped>
+ .punchTheClock {
+ height: 100vh;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ .punchTheClock_container {
+ .punchTheClock_btn {
+ width: vww(240);
+ height: vww(240);
+ color: #ffffff;
+ font-size: vww(20);
+ border-radius: 50%;
+ background-color: #36d4e5;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ p {
+ text-align: center;
+ }
}
- }
- .punchTheClock_text {
- display: flex;
- justify-content: center;
- margin-top: vww(20);
- color: #b8b8b8;
- .text {
- margin-left: vww(5);
+
+ .punchTheClock_text {
+ display: flex;
+ justify-content: center;
+ margin-top: vww(20);
+ color: #b8b8b8;
+
+ .text {
+ margin-left: vww(5);
+ }
}
}
}
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan.vue b/pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan.vue
index e1f2bb1..d6e8dbd 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan.vue
@@ -55,7 +55,7 @@
</view>
</view>
<view class="history-numbers">
- <combined-title title="鍘嗗彶鎻愮叅鍗�"></combined-title>
+ <combined-title title="鍘嗗彶楠岃川瀹屾垚"></combined-title>
<scroll-view :scroll-top="scrollTop"
scroll-y="true"
class="scroll-Y"
@@ -70,7 +70,7 @@
:key="index"
@click="faYundetail(item)">
<view class="first">
- <view class="">{{ item.deptName || '' }}</view>
+ <view class="">{{ item.filedName || '' }}</view>
<view class=""><u-icon name="arrow-right"
color="#999999"
size="40"></u-icon></view>
@@ -81,19 +81,11 @@
</view>
<view class="third">
<view class="third-line">
- <view class="third-line_text">棰嗗彇鏁�:</view>
- <view class="third-line_num">{{ item.cars2 }}</view>
- </view>
- <view class="third-line">
- <view class="third-line_text">鍓╀綑鏁�:</view>
+ <view
+ :style="{backgroundImage: `url(${onlineurl}/appimg/image/banner/carNO.png)`,backgroundSize: 'cover',backgroundRepeat: 'no-repeat',width:'24rpx',height:'24rpx',lineHeight:'24rpx'}">
+ </view>
<view class="third-line_num"
- v-if="roleType == 1">{{ item.carNumSurplus1 }}</view>
- <view class="third-line_num"
- v-else-if="roleType == 2">{{ item.carNumSurplus }}</view>
- </view>
- <view class="third-line">
- <view class="third-line_text">鎻愮叅鍗曚釜鏁�:</view>
- <view class="third-line_num">{{ item.tmCount }}</view>
+ style=" color: #303030;">{{ item.carNo }}</view>
</view>
</view>
<view class="fourth">
@@ -203,6 +195,11 @@
uni.navigateTo({
url: `/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail?orderPlanId=${item.id}`
})
+ },
+ faYundetail(item) {
+ uni.navigateTo({
+ url: `/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail?orderPlanId=${item.id}&flag=${true}`
+ })
}
},
}
@@ -221,6 +218,16 @@
margin: 0 auto;
}
+ .scroll-Y {
+ height: 900rpx;
+
+ .more_text {
+ color: #333;
+ font-size: 24rpx;
+ text-align: center;
+ }
+ }
+
.history-numbers {
width: 100%;
position: relative;
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue b/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue
index dcdb4c7..c30bfb4 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue
@@ -37,7 +37,7 @@
<view class="label-text">
鎶樻墸鐜�
</view>
- <view v-if='roleType===4'
+ <view v-if='roleType===4&&!flag'
class="count-input">
<u--input placeholder="璇疯緭鍏ユ姌鎵ｇ巼"
border="bottom"
@@ -45,7 +45,7 @@
v-model="item.discount"
@input='v=>discountInputHandle(v,i,item.clean)'></u--input>
</view>
- <view v-else
+ <view v-else-if='flag'
class="count">{{ item.discount }}%
</view>
</view>
@@ -99,7 +99,6 @@
data() {
return {
orderPlanId: "",
- index: null,
coalDetailsData: {},
showWeigh: [],
discountrate: "",
@@ -115,6 +114,8 @@
actionShow: false,
actionIndex: null,
onlineurl,
+ havedInput: false,
+ flag: false
};
},
computed: {
@@ -124,7 +125,7 @@
},
onLoad(params) {
this.orderPlanId = params.orderPlanId ? params.orderPlanId : ''
- this.index = params.index ? params.index : ''
+ this.flag = params.flag ? params.flag : false
},
onShow() {
this.roleType === 1 ? this.GetOrderPlan() : this.getTakeCoal()
@@ -180,7 +181,12 @@
res => {
if (res.code == 0) {
this.loading = false
- this.$u.toast('鎿嶄綔鎴愬姛')
+ this.$u.toast('鎿嶄綔鎴愬姛,鍗冲皢杩斿洖涓婁竴椤�')
+ setTimeout(() => {
+ uni.navigateBack({
+ delta: 1
+ })
+ }, 800)
} else {
this.loading = false
this.$u.toast('鎿嶄綔澶辫触')
@@ -189,14 +195,14 @@
},
// 閫夋嫨璐ㄩ噺
popoverShow(i) {
- if (this.roleType === 4) {
+ if (this.roleType === 4 && !flag) {
this.show = true
this.selectIndex = i
}
},
// 閫夋嫨浜у搧
productNamePopoverShow(i) {
- if (this.roleType === 4) {
+ if (this.roleType === 4 && !flag) {
this.actionShow = true
this.actionIndex = i
}
@@ -237,11 +243,11 @@
}
.main {
- width: 100%;
+ width: 96%;
height: 100%;
min-height: 400rpx;
background-color: #fff;
- margin: 0 auto;
+ margin: 10rpx auto;
display: flex;
flex-direction: column;
@@ -328,6 +334,7 @@
width: 100%;
@include flex;
justify-content: center;
+ margin-bottom: 40rpx;
/deep/ .u-button {
width: 180 rpx !important;
diff --git a/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue b/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue
index 2feb0b8..96c7575 100644
--- a/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue
+++ b/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails.vue
@@ -93,7 +93,7 @@
return {
id: '',
faYunDetailobj: {},
- coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚']
+ coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚', '楠岃川瀹屾垚']
};
},
methods: {},
--
Gitblit v1.9.1