From 0becab45282781f281ad5aa04202b83039ab275e Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期五, 14 四月 2023 17:42:08 +0800
Subject: [PATCH] 增加发运统计页面,修改websocket，增加消息推送
---
pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue | 132 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 122 insertions(+), 10 deletions(-)
diff --git a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
index 06b9046..9e48a5c 100644
--- a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
+++ b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
@@ -2,7 +2,7 @@
<view class="freightForwarder-index">
<view class="freightForwarder-index-body">
<u-empty mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png" textSize="30" iconSize="1000" v-if="orderPlanData.length == 0"></u-empty>
- <card v-for="(item, index) in orderPlanData" :key="index" :name="item.id" @click="cardBodyClick" backgroundType="1">
+ <card v-for="(item, index) in orderPlanData" :key="index" :name="item.id" @click="cardBodyClick(item)" backgroundType="1">
<template v-slot:left>
<view class="card-left__top">
<text>{{ item.carNum }}</text>
@@ -14,29 +14,97 @@
<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" @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>
+ </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,23 +116,58 @@
}
},
methods: {
+ // 鑾峰彇鍘嗗彶鎻愮叅鍗�
+ getJhOrderPlanDataPage() {
+ this.loading = true;
+ this.$reqGet('getJhOrderPlanDataPage', { current: this.pageCurrent, size: this.pageSize }).then(res => {
+ if (res.data.records) {
+ if (this.pageCurrent > 1) {
+ this.historyCoalData = this.historyCoalData.concat(res.data.records);
+ this.loading = false;
+ } else {
+ this.historyCoalData = res.data.records;
+ 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 => {
this.orderPlanData = res.data;
});
},
- cardBodyClick(id) {
+ cardBodyClick(item) {
+ // let code = null;
+ // this.orderPlanData.forEach(item => {
+ // if (item.orderPlanId == id) {
+ // code = item.code;
+ // id = item.orderPlanId;
+ // }
+ // });
uni.navigateTo({
- url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${id}`
+ url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${item.orderPlanId}&code=${item.code}`
});
},
// 杞彂
forwardClick(value) {
uni.navigateTo({
- url: `/pages/public-page/forward/forward?orderPlanId=${value.id}&carNumSurplusHuodai=${value.carNumSurplusHuodai}`
+ url: `/pages/public-page/forward/forward?orderPlanId=${value.orderPlanId}&carNumSurplusHuodai=${value.carNumSurplusHuodai}&carNum=${value.carNum}`
+ });
+ },
+ // 鐐瑰嚮鍘嗗彶鎻愮叅鍗曚竴琛岃幏鍙栬鎯�
+ faYundetail(v) {
+ uni.navigateTo({
+ url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${v.id}&cars2=${v.cars2}`
});
}
}
@@ -72,16 +175,25 @@
</script>
<style lang="scss" scoped>
+.scroll-Y {
+ height: 600rpx;
+ margin-bottom: vww(50);
+ .more_text {
+ color: #999;
+ font-size: 24rpx;
+ text-align: center;
+ }
+}
::v-deep.freightForwarder-index {
width: 94%;
margin: 0 auto;
// 涓讳綋
.freightForwarder-index-body {
- margin-bottom: vww(56);
+ margin-bottom: vww(10);
// 鍗＄墖鏍峰紡
.card-left__top {
- margin-top:vww(26);
+ margin-top: vww(26);
text-align: center;
color: #ffffff;
text {
--
Gitblit v1.9.1