From fa9d6d873f252894b668aae8525a3d83b7175ca5 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期五, 28 七月 2023 15:56:33 +0800
Subject: [PATCH] 修改验质
---
pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue b/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
index 96537cd..298be09 100644
--- a/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
+++ b/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
@@ -10,7 +10,7 @@
<view class="content-num">鍙戣繍杞︽暟</view>
</view>
<view class="content-text">
- <view class="content-container">{{ totalTon.toFixed(2) }}</view>
+ <view class="content-container">{{totalTon}}</view>
<view class="content-num">鍙戣繍鍚ㄦ暟</view>
</view>
</view>
@@ -42,13 +42,12 @@
<view class="card-top">
<view class="left"><combined-title :title="item.condition"></combined-title></view>
<view class="card-top_num">
- {{ item.taskCoalList.length }}杞{
- item.taskCoalList
+ {{ item.taskCoalList.length }}杞�
+ {{Number(item.taskCoalList
.reduce((prev, cur) => {
+ cur.clean=cur.clean||0
return prev + cur.clean;
- }, 0)
- .toFixed(2)
- }}鍚�
+ }, 0)).toFixed(2)}}鍚�
</view>
</view>
<view class="card-main"
@@ -66,7 +65,7 @@
</view>
</view>
<view class="main-divider"></view>
- <view class="point-number">{{ value.clean.toFixed(2) || 0 }}</view>
+ <view class="point-number">{{ Number(value.clean).toFixed(2) || 0 }}</view>
</view>
<view class="first-extra">
<view class="main-information">
@@ -134,7 +133,7 @@
</view>
</view>
<view class="filter-body">
- <view class="condition-name">鐓ょ</view>
+ <view class="condition-name">鍝佺</view>
<view class="filter-name">
<view class="filter-button"
v-for="(item, index) in coalList"
@@ -207,7 +206,7 @@
</view>
</view>
<view class="filter-body"
- v-if="roleType != 3">
+ v-if="roleType !== 3&&roleType !== 4">
<view class="condition-name">杞﹂槦</view>
<view class="filter-name">
<view class="filter-button"
@@ -223,8 +222,9 @@
</view> -->
</view>
</view>
- <view class="filter-body">
- <view class="condition-name">鐭垮満</view>
+ <view class="filter-body"
+ v-if="roleType != 4">
+ <view class="condition-name">浠撳簱</view>
<view class="filter-name">
<view class="filter-button"
v-for="(item, index) in filedList"
@@ -240,7 +240,7 @@
</view>
</view>
<view class="filter-body"
- v-if="roleType == 2">
+ v-if="roleType == 2||roleType == 4">
<view class="condition-name">杞︾墝鍙�</view>
<view class="filter-name">
<view class="filter-button"
@@ -279,6 +279,7 @@
</template>
<script>
+ import BigNumber from "bignumber.js"
import combinedTitle from '@/components/combined-title/combined-title.vue';
import { onlineurl } from '@/api/request.js'
export default {
@@ -431,10 +432,15 @@
this.totalLength = this.filterList.map(v => v.taskCoalList.length).reduce((x, y) => x + y);
this.totalTon = this.filterList.map(v =>
v.taskCoalList.reduce((prev, cur) => {
- return cur.clean + prev;
+ const cleanvalue = cur.clean || 0
+ return cleanvalue + prev
}, 0)
);
- this.totalTon = this.totalTon.reduce((x, y) => x + y);
+ this.totalTon = this.totalTon.reduce((x, y) => {
+ let xx = new BigNumber(x)
+ let yy = new BigNumber(y)
+ return xx.plus(yy).toNumber().toFixed(2)
+ }, new BigNumber(0));
} else {
this.totalLength = 0;
this.totalTon = 0;
@@ -507,10 +513,15 @@
this.totalLength = this.filterList.map(v => v.taskCoalList.length).reduce((x, y) => x + y);
this.totalTon = this.filterList.map(v =>
v.taskCoalList.reduce((prev, cur) => {
- return cur.clean + prev;
+ const cleanvalue = cur.clean || 0
+ return cleanvalue + prev
}, 0)
);
- this.totalTon = this.totalTon.reduce((x, y) => x + y);
+ this.totalTon = this.totalTon.reduce((x, y) => {
+ let xx = new BigNumber(x)
+ let yy = new BigNumber(y)
+ return xx.plus(yy).toNumber().toFixed(2)
+ }, new BigNumber(0));
} else {
this.totalLength = 0;
this.totalTon = 0;
@@ -624,7 +635,7 @@
// 璺宠浆鍙戣繍璇︽儏
faYunDetail(takeCoalId) {
uni.navigateTo({
- url: `/pages/public-page/faYunstatisticsDetails/faYunstatisticsDetails?id=${takeCoalId}`
+ url: `/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail?orderPlanId=${takeCoalId}`
});
},
// 鎵撳紑绛涢�夋潯浠跺脊绐�
--
Gitblit v1.9.1