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 | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 109 insertions(+), 9 deletions(-)
diff --git a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
index 63b5d9d..c49a730 100644
--- a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
+++ b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
@@ -8,35 +8,103 @@
<text>{{ item.carNum }}</text>
寮�
</view>
- <view class="card-left__utils"><u-button text="杞彂" type="primary" @tap.stop="forwardClick(item.id)" shape="circle"></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">
<view class="card-right-top-row">
<view>
- <text>杞彂鍓╀綑锛歿{ item.carNumSurplusHuodai||'' }}</text>
+ <text>杞彂鍓╀綑锛歿{ item.carNumSurplusHuodai || 0 }}</text>
</view>
<view>
- <text>{{ item.coalName||'' }}</text>
+ <text>{{ item.coalName || '' }}</text>
</view>
</view>
</view>
</template>
<template v-slot:right-bottom>
<view class="code">
- <text>缂栧彿锛歿{ item.orderCode||'' }}</text>
+ <text>缂栧彿锛歿{ item.orderCode || '' }}</text>
</view>
</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 => {
@@ -57,14 +143,20 @@
});
},
cardBodyClick(id) {
+ let code = null;
+ this.orderPlanData.forEach(item => {
+ if (item.id == id) {
+ code = item.code;
+ }
+ });
uni.navigateTo({
- url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${id}`
+ url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${id}&code=${code}`
});
},
// 杞彂
- forwardClick(id) {
+ forwardClick(value) {
uni.navigateTo({
- url: `/pages/public-page/forward/forward?orderPlanId=${id}`
+ url: `/pages/public-page/forward/forward?orderPlanId=${value.orderPlanId}&carNumSurplusHuodai=${value.carNumSurplusHuodai}&carNum=${value.carNum}`
});
}
}
@@ -72,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;
@@ -81,7 +181,7 @@
// 鍗＄墖鏍峰紡
.card-left__top {
- margin-top:vww(26);
+ margin-top: vww(26);
text-align: center;
color: #ffffff;
text {
--
Gitblit v1.9.1