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 | 81 ++++++++++++++++++++++++++++++----------
1 files changed, 60 insertions(+), 21 deletions(-)
diff --git a/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue b/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue
index 37f7a57..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>
@@ -43,16 +43,16 @@
<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-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">娌℃湁鏁版嵁浜�...</view>
+ <view class="more_text" v-if="showMoreData && historyCoalData.length !== 0">娌℃湁鏁版嵁浜�...</view>
</scroll-view>
</view>
</view>
@@ -61,6 +61,32 @@
<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
},
@@ -90,13 +116,18 @@
}
},
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;
+ if (this.pageCurrent > 1) {
+ this.historyCoalData = this.historyCoalData.concat(res.data.records);
+ this.loading = false;
+ } else {
+ this.historyCoalData = res.data.records;
+ this.loading = false;
+ }
}
});
},
@@ -115,21 +146,28 @@
this.orderPlanData = res.data;
});
},
- cardBodyClick(id) {
- let code = null;
- this.orderPlanData.forEach(item => {
- if (item.id == id) {
- code = item.code;
- }
- });
+ 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}&code=${code}`
+ 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.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}`
});
}
}
@@ -139,6 +177,7 @@
<style lang="scss" scoped>
.scroll-Y {
height: 600rpx;
+ margin-bottom: vww(50);
.more_text {
color: #999;
font-size: 24rpx;
@@ -150,7 +189,7 @@
margin: 0 auto;
// 涓讳綋
.freightForwarder-index-body {
- margin-bottom: vww(56);
+ margin-bottom: vww(10);
// 鍗＄墖鏍峰紡
.card-left__top {
--
Gitblit v1.9.1