From 1fdf41cc692eb7b208fe647259d4295164280a41 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期五, 21 四月 2023 14:12:09 +0800
Subject: [PATCH] 修改历史提煤单

---
 pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue |   31 ++++++++++++++++++++-----------
 1 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
index 226a699..ce38fc7 100644
--- a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
+++ b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
@@ -8,9 +8,7 @@
 						<text>{{ item.carNum }}</text>
 						寮�
 					</view>
-					<view class="card-left__utils">
-						<u-button text="杞彂" type="primary" @tap.stop="forwardClick(item)" shape="circle" v-if="item.carNumSurplusHuodai !== 0"></u-button>
-					</view>
+					<view class="card-left__utils"><u-button text="杞彂" type="primary" @tap.stop="forwardClick(item)" shape="circle"></u-button></view>
 				</template>
 				<template v-slot:right-top>
 					<view class="right-top">
@@ -45,13 +43,13 @@
 						<uni-th align="center" width="80">鎻愮叅鍗曚釜鏁�</uni-th>
 					</uni-tr>
 					<uni-tr v-for="(item, index) in historyCoalData" :key="index">
-						<uni-td align="center" @row-click="faYundetail(item)">{{ item.sendDate }}</uni-td>
-						<uni-td align="left" @row-click="faYundetail(item)">{{ item.deptName }}</uni-td>
-						<uni-td align="center" @row-click="faYundetail(item)">{{ item.filedName }}</uni-td>
-						<uni-td align="center" @row-click="faYundetail(item)">{{ item.coalName }}</uni-td>
-						<uni-td align="center" @row-click="faYundetail(item)">{{ item.orderCode }}</uni-td>
-						<uni-td align="center" @row-click="faYundetail(item)">{{ item.carNumSurplus }}</uni-td>
-						<uni-td align="center" @row-click="faYundetail(item)">{{ item.tmCount }}</uni-td>
+						<uni-td align="center" @row-click="faYundetail(item)">{{ item.sendDate || '' }}</uni-td>
+						<uni-td align="left" @row-click="faYundetail(item)">{{ item.deptName || '' }}</uni-td>
+						<uni-td align="center" @row-click="faYundetail(item)">{{ item.filedName || '' }}</uni-td>
+						<uni-td align="center" @row-click="faYundetail(item)">{{ item.coalName || '' }}</uni-td>
+						<uni-td align="center" @row-click="faYundetail(item)">{{ item.orderCode || '' }}</uni-td>
+						<uni-td align="center" @row-click="faYundetail(item)">{{ item.carNumSurplus || '' }}</uni-td>
+						<uni-td align="center" @row-click="faYundetail(item)">{{ item.tmCount || '' }}</uni-td>
 					</uni-tr>
 				</uni-table>
 				<view class="more_text" v-if="showMoreData && historyCoalData.length !== 0">娌℃湁鏁版嵁浜�...</view>
@@ -125,6 +123,7 @@
 				if (res.data.records) {
 					if (this.pageCurrent > 1) {
 						this.historyCoalData = this.historyCoalData.concat(res.data.records);
+						this.historyCoalData = this.ArrSet(this.historyCoalData, 'id');
 						this.loading = false;
 					} else {
 						this.historyCoalData = res.data.records;
@@ -138,6 +137,15 @@
 			if (this.pageCurrent * this.pageSize >= this.total) return (this.showMoreData = true);
 			this.pageCurrent++;
 			this.getJhOrderPlanDataPage();
+		},
+		//fix 鐐瑰嚮鎻愮叅鍗曡繑鍥炰細澧炲姞閲嶅鏁版嵁
+		ArrSet(Arr, id) {
+			var obj = {};
+			const arrays = Arr.reduce((setArr, item) => {
+				obj[item[id]] ? '' : (obj[item[id]] = true && setArr.push(item));
+				return setArr;
+			}, []);
+			return arrays;
 		},
 		init() {
 			this.huoDaiList();
@@ -179,6 +187,7 @@
 <style lang="scss" scoped>
 .scroll-Y {
 	height: 600rpx;
+	margin-bottom: vww(50);
 	.more_text {
 		color: #999;
 		font-size: 24rpx;
@@ -190,7 +199,7 @@
 	margin: 0 auto;
 	// 涓讳綋
 	.freightForwarder-index-body {
-		margin-bottom: vww(56);
+		margin-bottom: vww(10);
 
 		// 鍗$墖鏍峰紡
 		.card-left__top {

--
Gitblit v1.9.1