From 9579955eecf9584697c546eae6ba90fb33795e40 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期四, 29 六月 2023 18:18:23 +0800
Subject: [PATCH] 称重修改
---
pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue | 83 ++++++++++++++++++++---------------------
1 files changed, 40 insertions(+), 43 deletions(-)
diff --git a/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue b/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
index da4f78a..0285a75 100644
--- a/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
+++ b/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
@@ -32,9 +32,11 @@
<view class="left"><combined-title :title="item.condition"></combined-title></view>
<view class="card-top_num">
{{ item.taskCoalList.length }}杞{
- item.taskCoalList.reduce((prev, cur) => {
- return prev + cur.clean;
- }, 0)
+ item.taskCoalList
+ .reduce((prev, cur) => {
+ return prev + cur.clean;
+ }, 0)
+ .toFixed(2)
}}鍚�
</view>
</view>
@@ -43,40 +45,19 @@
<view class="main-information">
<view class="sign">瑁�</view>
<view class="filedname">
- <text v-if="value.orderType == '澶栭攢' || value.orderType == '鍐呴攢' || value.orderType == '杞嚭'">{{ value.deptName.slice(0, 16) }}</text>
- <text v-else-if="value.orderType == '澶栬喘' || value.orderType == '鍐呰喘' || value.orderType == '杞叆'">
- {{ value.customerName.slice(0, 16) }}
- </text>
- <text v-show="value.deptName.length >= 15 || value.customerName.length >= 15">...</text>
+ <text v-if="value.orderType == '澶栭攢' || value.orderType == '鍐呴攢' || value.orderType == '杞嚭'">{{ value.deptName || '' }}</text>
+ <text v-else-if="value.orderType == '澶栬喘' || value.orderType == '鍐呰喘' || value.orderType == '杞叆'">{{ value.customerName || '' }}</text>
</view>
</view>
<view class="main-divider"></view>
<view class="point-number">{{ value.clean.toFixed(2) || 0 }}</view>
- <!-- <view class="dispatch-receive">
- <view v-if="value.orderType == '澶栭攢' || value.orderType == '鍐呴攢' || value.orderType == '杞嚭'" class="container">
- <view class="dispatch">{{ value.deptName }}</view>
- <view class="receive-icon"></view>
- <view class="receive">{{ value.customerName }}</view>
- </view>
- <view v-else-if="value.orderType == '澶栬喘' || value.orderType == '鍐呰喘' || value.orderType == '杞叆'" class="container">
- <view class="dispatch">{{ value.customerName }}</view>
- <view class="receive-icon"></view>
- <view class="receive">{{ value.deptName }}</view>
- </view>
- </view> -->
- <!-- <view class="point-number">{{ value.clean.toFixed(2) || 0 }}</view> -->
</view>
<view class="first-extra">
<view class="main-information">
<view class="sign">鍗�</view>
<view class="filedname">
- <text v-if="value.orderType == '澶栭攢' || value.orderType == '鍐呴攢' || value.orderType == '杞嚭'">
- {{ value.customerName.slice(0, 16) }}
- </text>
- <text v-else-if="value.orderType == '澶栬喘' || value.orderType == '鍐呰喘' || value.orderType == '杞叆'">
- {{ value.deptName.slice(0, 16) }}
- </text>
- <text v-show="value.customerName.length >= 15 || value.deptName.length >= 15">...</text>
+ <text v-if="value.orderType == '澶栭攢' || value.orderType == '鍐呴攢' || value.orderType == '杞嚭'">{{ value.customerName || '' }}</text>
+ <text v-else-if="value.orderType == '澶栬喘' || value.orderType == '鍐呰喘' || value.orderType == '杞叆'">{{ value.deptName || '' }}</text>
</view>
</view>
</view>
@@ -580,10 +561,10 @@
return uni.getStorageSync('roleType');
},
dateRange() {
- return `${this.firstFilter}-${this.lastFilter}`;
+ return `${this.firstFilter}鑷�${this.lastFilter}`;
},
dateselect() {
- return `${this.first}-${this.last}`;
+ return `${this.first}鑷�${this.last}`;
},
coalTotal() {
return this.coalList.length;
@@ -609,8 +590,8 @@
},
watch: {
dateselect(newV, old) {
- let tempDate = `${this.first}-${this.last}`;
- if (newV != old && old != '-') {
+ let tempDate = `${this.first}鑷�${this.last}`;
+ if (newV != old && old != '鑷�') {
this.first = newV.slice(0, 10);
this.last = newV.slice(11);
this.getTmTaskCoalData();
@@ -637,7 +618,9 @@
width: vww(40);
}
.scroll-Y {
- height: 900rpx;
+ height: 1000rpx;
+ position: relative;
+ top: 20rpx;
}
.utils-button {
width: 94%;
@@ -696,10 +679,13 @@
align-items: center;
.content-text {
height: vww(40);
- @include flex flex-direction: column;
+ @include flex;
+ flex-direction: column;
+ margin-top: 31rpx;
+ margin-bottom: 31rpx;
.content-container {
width: 100%;
- height: vww(16);
+ min-height: vww(16);
font-size: 40rpx;
font-weight: bold;
color: #3b56eb;
@@ -707,7 +693,7 @@
}
.content-num {
width: 96rpx;
- height: 24rpx;
+ min-height: 24rpx;
font-size: 24rpx;
font-weight: 400;
color: #333333;
@@ -735,11 +721,11 @@
flex-direction: column;
overflow: hidden;
position: relative;
- top: -170rpx;
+ top: -145rpx;
.data-filter {
width: 635rpx;
height: 68rpx;
- border: 2px solid #5b95fd;
+ border: 2px solid rgba(73, 95, 252, 0.6);
box-shadow: 0rpx 5rpx 13rpx 0rpx rgba(73, 95, 252, 0.6);
border-radius: 34rpx;
margin-top: vww(21);
@@ -769,6 +755,15 @@
@include flex;
flex-direction: column;
margin-top: vww(5);
+ margin-bottom: vww(5);
+ overflow: hidden;
+ &:last-child {
+ .card-main {
+ &:last-child {
+ border-bottom: 0;
+ }
+ }
+ }
.card-top {
width: 96%;
@include flex;
@@ -788,6 +783,7 @@
height: vww(150);
border-bottom: vww(1) solid #d6d6d6;
margin-top: vww(12);
+ margin-left: vww(20);
padding-bottom: vww(12);
position: relative;
@include flex flex-direction: column;
@@ -819,7 +815,7 @@
}
}
.main-divider {
- width: 548rpx;
+ width: 530rpx;
height: 1rpx;
background: #e3e3e3;
position: absolute;
@@ -832,7 +828,7 @@
font-weight: 400;
color: #f81414;
position: absolute;
- right: -10rpx;
+ right: 12rpx;
display: flex;
flex-wrap: wrap;
}
@@ -894,10 +890,10 @@
}
.third-line {
width: 40%;
- height: vww(14);
+ min-height: vww(15);
display: flex;
justify-content: flex-start;
- align-items: center;
+ align-items: flex-start;
.carnum-icon {
width: 28rpx;
height: 28rpx;
@@ -919,6 +915,7 @@
display: flex;
justify-content: flex-start;
align-items: center;
+ color: #515151;
.time-icon {
margin-right: vww(10);
}
@@ -928,7 +925,7 @@
}
}
.filter-main {
- height: 950rpx;
+ min-height: 950rpx;
width: 100%;
display: flex;
flex-direction: column;
--
Gitblit v1.9.1