From 5c01be6370291febe52adfa74fad8101a197c388 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 28 三月 2023 18:27:19 +0800
Subject: [PATCH] 微信绑定测试

---
 pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue |  100 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 97 insertions(+), 3 deletions(-)

diff --git a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
index eaec294..c49a730 100644
--- a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
+++ b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
@@ -14,7 +14,7 @@
 					<view class="right-top">
 						<view class="card-right-top-row">
 							<view>
-								<text>杞彂鍓╀綑锛歿{ item.carNumSurplusHuodai || '' }}</text>
+								<text>杞彂鍓╀綑锛歿{ item.carNumSurplusHuodai || 0 }}</text>
 							</view>
 							<view>
 								<text>{{ item.coalName || '' }}</text>
@@ -29,14 +29,82 @@
 				</template>
 			</card>
 		</view>
+		<view class="history-numbers">
+			<combined-title title="鍘嗗彶鎻愮叅鍗�"></combined-title>
+			<scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-Y" @scrolltolower="historyScrolltolower">
+				<uni-table border stripe emptyText="鏆傛棤鏇村鏁版嵁" :loading="loading">
+					<uni-tr>
+						<uni-th width="100" align="center">鍙戣繍鏃ユ湡</uni-th>
+						<uni-th width="100" align="center">鎵�灞炲崟浣�</uni-th>
+						<uni-th align="center" width="150">鐓ゅ満鍚嶇О</uni-th>
+						<uni-th align="center" width="100">鐓ょ鍚嶇О</uni-th>
+						<uni-th align="center" width="150">璁㈠崟缂栧彿</uni-th>
+						<uni-th align="center" width="100">璁㈠崟鍓╀綑閲�</uni-th>
+						<uni-th align="center" width="80">鎻愮叅鍗曚釜鏁�</uni-th>
+					</uni-tr>
+					<uni-tr v-for="(item, index) in historyCoalData" :key="index">
+						<uni-td align="center">{{ item.sendDate }}</uni-td>
+						<uni-td align="left">{{ item.deptName }}</uni-td>
+						<uni-td align="center">{{ item.filedName }}</uni-td>
+						<uni-td align="center">{{ item.coalName }}</uni-td>
+						<uni-td align="center">{{ item.orderCode }}</uni-td>
+						<uni-td align="center">{{ item.carNumSurplus }}</uni-td>
+						<uni-td align="center">{{ item.tmCount }}</uni-td>
+					</uni-tr>
+				</uni-table>
+				<view class="more_text" v-if="showMoreData">娌℃湁鏁版嵁浜�...</view>
+			</scroll-view>
+		</view>
 	</view>
 </template>
 
 <script>
+import combinedTitle from '@/components/combined-title/combined-title.vue';
 export default {
+	props: {
+		indexHistoryCoalData: {
+			type: Array,
+			default: []
+		},
+		indexHuoDaiOrderPlanData: {
+			type: Array,
+			default: []
+		}
+	},
+	watch: {
+		indexHistoryCoalData: {
+			handler(v) {
+				this.historyCoalData = v;
+			},
+			deep: true,
+			immediate: true
+		},
+		indexHuoDaiOrderPlanData: {
+			handler(v) {
+				this.orderPlanData = v;
+			},
+			deep: true,
+			immediate: true
+		}
+	},
+	components: {
+		combinedTitle
+	},
 	data() {
 		return {
-			orderPlanData: []
+			orderPlanData: [],
+			historyCoalData: [],
+			// 琛ㄦ牸鍔犺浇鐘舵��
+			loading: false,
+			scrollTop: 0,
+			// 姣忛〉鏁版嵁閲�
+			pageSize: 10,
+			// 褰撳墠椤�
+			pageCurrent: 1,
+			// 鏁版嵁鎬婚噺
+			total: 0,
+			// 鏄惁鏄剧ず鏇村鏁版嵁
+			showMoreData: false
 		};
 	},
 	onShow() {
@@ -48,8 +116,26 @@
 		}
 	},
 	methods: {
+		// 鑾峰彇鍘嗗彶鎻愮叅鍗�
+		getJhOrderPlanDataPage() {
+			this.loading = true;
+			this.$reqGet('getJhOrderPlanDataPage', { current: this.pageCurrent, size: this.pageSize }).then(res => {
+				if (res.data.records) {
+					this.historyCoalData = [...this.historyCoalData, ...res.data.records];
+					this.total = res.data.total;
+					this.loading = false;
+				}
+			});
+		},
+		// 涓婃媺鍔犺浇
+		historyScrolltolower() {
+			if (this.pageCurrent * this.pageSize >= this.total) return (this.showMoreData = true);
+			this.pageCurrent++;
+			this.getJhOrderPlanDataPage();
+		},
 		init() {
 			this.huoDaiList();
+			this.getJhOrderPlanDataPage();
 		},
 		huoDaiList() {
 			this.$reqGet('huoDaiList').then(res => {
@@ -70,7 +156,7 @@
 		// 杞彂
 		forwardClick(value) {
 			uni.navigateTo({
-				url: `/pages/public-page/forward/forward?orderPlanId=${value.orderPlanId}&carNumSurplusHuodai=${value.carNumSurplusHuodai}`
+				url: `/pages/public-page/forward/forward?orderPlanId=${value.orderPlanId}&carNumSurplusHuodai=${value.carNumSurplusHuodai}&carNum=${value.carNum}`
 			});
 		}
 	}
@@ -78,6 +164,14 @@
 </script>
 
 <style lang="scss" scoped>
+.scroll-Y {
+	height: 600rpx;
+	.more_text {
+		color: #999;
+		font-size: 24rpx;
+		text-align: center;
+	}
+}
 ::v-deep.freightForwarder-index {
 	width: 94%;
 	margin: 0 auto;

--
Gitblit v1.9.1