From ae1aad66a165ee7253bed2127a3b53baa40c2361 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 17 五月 2023 08:35:33 +0800
Subject: [PATCH] 修复错误，增加验证
---
pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue | 178 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 107 insertions(+), 71 deletions(-)
diff --git a/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue b/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
index 6af93fb..81124d6 100644
--- a/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
+++ b/pages/customer-page/customer-my/faYunstatistics/faYunstatistics.vue
@@ -26,6 +26,7 @@
</view>
<view class="filter-condition"></view>
<view class="date-information">
+ <u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" textSize="30" iconSize="1000" v-if="filterList.length == 0"></u-empty>
<view class="statistics-card" v-for="(item, index) in filterList" :key="index">
<view class="card-top">
<view class="left"><combined-title :title="item.condition"></combined-title></view>
@@ -39,19 +40,24 @@
</view>
<view class="card-main" v-for="(value, i) in item.taskCoalList" :key="i" @click="faYunDetail(value.id)">
<view class="first-line">
- <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 class="main-information">
+ <view class="sign">瑁�</view>
+ <view class="filedname">
+ <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>
+ <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 || '' }}</text>
+ <text v-else-if="value.orderType == '澶栬喘' || value.orderType == '鍐呰喘' || value.orderType == '杞叆'">{{ value.deptName || '' }}</text>
+ </view>
+ </view>
</view>
<view class="second-line">
<view class="coal-name">
@@ -218,6 +224,8 @@
},
first: '',
last: '',
+ firstFilter: '',
+ lastFilter: '',
taskList: [],
filterList: [],
totalLength: 0,
@@ -242,7 +250,7 @@
// 鐐瑰嚮鍙崇澶磋鎯呭脊绐�
faYunDetailobj: {},
modalShow: false,
- coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅鍦�', '鍑虹叅浠�']
+ coalStatus: ['棰嗗彇', '棰勭害', '绛惧埌', '鍏ュ満', '绉扮毊', '绉版瘺', '绂诲満', '鍏ョ鎴�', '鍑虹鎴�', '鍏ョ叅浠�', '鍑虹叅浠�', '鏀剧┖', '浣滃簾', '鍏ュ満鐢宠', '杩涘叆鍦洪櫌']
};
},
onShow() {
@@ -258,6 +266,7 @@
let d = '01';
m = m < 10 ? '0' + m : m; //鏈堜唤琛� 0
this.first = [y, m, d].join('-');
+ this.firstFilter = [y, m, d].join('-');
},
lastDate() {
let y = new Date().getFullYear(); //鑾峰彇骞翠唤
@@ -266,6 +275,7 @@
m = m < 10 ? '0' + m : m; //鏈堜唤琛� 0
d = d < 10 ? '0' + d : d; //鏃ユ暟琛� 0
this.last = [y, m, d].join('-');
+ this.lastFilter = [y, m, d].join('-');
},
// 绛涢�夋潯浠�
getShipping() {
@@ -431,19 +441,8 @@
// 閲嶇疆绛涢��
resetCondition() {
this.conditinonShow = false;
- this.filterList = this.taskList;
- if (this.filterList.length != 0) {
- 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;
- }, 0)
- );
- this.totalTon = this.totalTon.reduce((x, y) => x + y);
- } else {
- this.totalLength = 0;
- this.totalTon = 0;
- }
+ this.first = this.dateRange.slice(0, 10);
+ this.last = this.dateRange.slice(11);
this.coalList.forEach(v => {
v.active = false;
});
@@ -560,10 +559,10 @@
return uni.getStorageSync('roleType');
},
dateRange() {
- return `鏃ユ湡:${this.first}-${this.last}`;
+ return `${this.firstFilter}鑷�${this.lastFilter}`;
},
dateselect() {
- return `${this.first}-${this.last}`;
+ return `${this.first}鑷�${this.last}`;
},
coalTotal() {
return this.coalList.length;
@@ -589,8 +588,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();
@@ -605,6 +604,13 @@
display: flex;
justify-content: space-between;
align-items: center;
+}
+@mixin firstLine {
+ width: 80%;
+ height: vww(68);
+ margin: vww(10) vww(16) 0 0;
+ display: flex;
+ justify-content: space-between;
}
::v-deep .toggle-button .u-button {
width: vww(40);
@@ -669,21 +675,22 @@
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-family: Source Han Sans CN;
font-weight: bold;
color: #3b56eb;
text-align: center;
}
.content-num {
width: 96rpx;
- height: 24rpx;
+ min-height: 24rpx;
font-size: 24rpx;
- font-family: Source Han Sans CN;
font-weight: 400;
color: #333333;
}
@@ -693,7 +700,6 @@
width: 160rpx;
height: 38rpx;
font-size: 40rpx;
- font-family: Adobe Heiti Std;
font-weight: normal;
color: #ffffff;
line-height: 69rpx;
@@ -711,11 +717,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);
@@ -724,7 +730,6 @@
width: 330rpx;
height: 40rpx;
font-size: 28rpx;
- font-family: Source Han Sans CN;
font-weight: 400;
color: #494949;
}
@@ -746,72 +751,105 @@
@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;
.left {
font-size: 30rpx;
- font-family: Microsoft YaHei;
font-weight: 400;
color: #494949;
}
.card-top_num {
font-size: 40rpx;
- font-family: CTCuHeiSJ;
font-weight: 400;
color: #6074ee;
}
}
.card-main {
width: 100%;
- height: vww(120);
+ 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;
align-items: flex-start;
.first-line {
- width: 94%;
+ width: 80%;
height: vww(32);
color: #303030;
display: flex;
justify-content: space-between;
align-items: center;
- .dispatch-receive {
- width: 90%;
+ .main-information {
+ width: 88%;
+ height: vww(28);
display: flex;
- justify-content: space-between;
+ justify-content: flex-start;
align-items: center;
- margin-right: vww(12);
- .container {
- width: 100%;
- display: flex;
- justify-content: space-between;
- align-items: center;
+ .sign {
+ width: vww(28);
+ height: vww(28);
+ line-height: vww(28);
+ text-align: center;
+ background: url('https://mx.jzeg.cn:9095/appimg/image/banner/blueblock.png') no-repeat;
+ background-size: contain;
+ font-size: 30rpx;
+ font-weight: 400;
+ color: #ffffff;
+ margin-right: vww(20);
}
- .receive-icon {
- width: 62rpx;
- height: 14rpx;
- border-bottom: 3px solid #275fa5;
- position: relative;
- &:after {
- content: '';
- position: absolute;
- width: 3px;
- height: 10px;
- background-color: #275fa5;
- right: 0;
- transform: rotate(-45deg);
- }
- }
+ }
+ .main-divider {
+ width: 530rpx;
+ height: 1rpx;
+ background: #e3e3e3;
+ position: absolute;
+ top: 80rpx;
+ left: vww(50);
}
.point-number {
width: 20%;
font-size: 40rpx;
- font-family: CTCuHeiSJ;
font-weight: 400;
color: #f81414;
+ position: absolute;
+ right: -10rpx;
+ display: flex;
+ flex-wrap: wrap;
+ }
+ }
+ .first-extra {
+ @include firstLine;
+ height: vww(32);
+ .main-information {
+ width: 100%;
+ height: vww(28);
+ display: flex;
+ justify-content: flex-start;
+ align-items: center;
+ .sign {
+ width: vww(28);
+ height: vww(28);
+ line-height: vww(28);
+ text-align: center;
+ background: url('https://mx.jzeg.cn:9095/appimg/image/banner/redblock.png') no-repeat;
+ background-size: contain;
+ font-size: 30rpx;
+ font-weight: 400;
+ color: #ffffff;
+ margin-right: vww(20);
+ }
}
}
.second-line {
@@ -824,7 +862,6 @@
flex-grow: 1;
height: 30rpx;
font-size: 30rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #515151;
position: relative;
@@ -842,7 +879,6 @@
height: 30rpx;
line-height: 30rpx;
font-size: 30rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #515151;
}
@@ -850,10 +886,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;
@@ -865,7 +901,6 @@
}
.carnum-text {
font-size: 28rpx;
- font-family: Microsoft YaHei;
font-weight: 300;
color: #515151;
}
@@ -876,6 +911,7 @@
display: flex;
justify-content: flex-start;
align-items: center;
+ color: #515151;
.time-icon {
margin-right: vww(10);
}
--
Gitblit v1.9.1