~wangchengrui/unattended-app.git

			@@ -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>
			@@ -218,6 +219,8 @@
			},
			first: '',
			last: '',
			firstFilter: '',
			lastFilter: '',
			taskList: [],
			filterList: [],
			totalLength: 0,
			@@ -242,7 +245,7 @@
			// 点击右箭头详情弹窗
			faYunDetailobj: {},
			modalShow: false,
			coalStatus: ['领取', '预约', '签到', '入场', '称皮', '称毛', '离场', '入磅房', '出磅房', '入煤场', '出煤仓']
			coalStatus: ['领取', '预约', '签到', '入场', '称皮', '称毛', '离场', '入磅房', '出磅房', '入煤仓', '出煤仓', '放空', '作废', '入场申请', '进入场院']
			};
			},
			onShow() {
			@@ -258,6 +261,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 +270,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 +436,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,7 +554,7 @@
			return uni.getStorageSync('roleType');
			},
			dateRange() {
			return `日期:${this.first}-${this.last}`;
			return `${this.firstFilter}-${this.lastFilter}`;
			},
			dateselect() {
			return `${this.first}-${this.last}`;
			@@ -674,7 +668,6 @@
			width: 100%;
			height: vww(16);
			font-size: 40rpx;
			font-family: Source Han Sans CN;
			font-weight: bold;
			color: #3b56eb;
			text-align: center;
			@@ -683,7 +676,6 @@
			width: 96rpx;
			height: 24rpx;
			font-size: 24rpx;
			font-family: Source Han Sans CN;
			font-weight: 400;
			color: #333333;
			}
			@@ -693,7 +685,6 @@
			width: 160rpx;
			height: 38rpx;
			font-size: 40rpx;
			font-family: Adobe Heiti Std;
			font-weight: normal;
			color: #ffffff;
			line-height: 69rpx;
			@@ -724,7 +715,6 @@
			width: 330rpx;
			height: 40rpx;
			font-size: 28rpx;
			font-family: Source Han Sans CN;
			font-weight: 400;
			color: #494949;
			}
			@@ -751,13 +741,11 @@
			@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;
			}
			@@ -809,7 +797,6 @@
			.point-number {
			width: 20%;
			font-size: 40rpx;
			font-family: CTCuHeiSJ;
			font-weight: 400;
			color: #f81414;
			}
			@@ -824,7 +811,6 @@
			flex-grow: 1;
			height: 30rpx;
			font-size: 30rpx;
			font-family: Microsoft YaHei;
			font-weight: 300;
			color: #515151;
			position: relative;
			@@ -842,7 +828,6 @@
			height: 30rpx;
			line-height: 30rpx;
			font-size: 30rpx;
			font-family: Microsoft YaHei;
			font-weight: 300;
			color: #515151;
			}
			@@ -865,7 +850,6 @@
			}
			.carnum-text {
			font-size: 28rpx;
			font-family: Microsoft YaHei;
			font-weight: 300;
			color: #515151;
			}