From bb52e0d4baffe8e0486c951e525b6614bd4aaa28 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 24 四月 2023 14:08:56 +0800
Subject: [PATCH] 修改样式，修复已知bug
---
pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue | 176 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 140 insertions(+), 36 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..b34a2f0 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>
@@ -32,27 +32,40 @@
<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>
+ <view class="history-information" v-for="(item, index) in historyCoalData" :key="index" @click="faYundetail(item)">
+ <view class="history-sendate">
+ <text>鍙戣繍鏃ユ湡 {{ item.sendDate || '' }}</text>
+ <view class="view-more">
+ <text style="color: #449cfc;">璇︽儏</text>
+ <view class="arrow-right"><u-icon name="arrow-right" size="40" color="#449cfc"></u-icon></view>
+ </view>
+ </view>
+ <view class="history-main">
+ <view class="main-left">
+ <view class="history-body">
+ <text>鎵�灞炲崟浣� {{ item.deptName || '' }}</text>
+ </view>
+ <view class="history-body">
+ <text>鐓ゅ満鍚嶇О {{ item.filedName || '' }}</text>
+ </view>
+ <view class="history-body">
+ <text>鐓ょ鍚嶇О {{ item.coalName || '' }}</text>
+ </view>
+ </view>
+ <view class="main-right">
+ <view class="history-body">
+ <text style="word-break: break-all;">璁㈠崟缂栧彿 {{ item.orderCode || '' }}</text>
+ </view>
+ <view class="history-body">
+ <text>璁㈠崟鍓╀綑閲� {{ item.carNumSurplus || '' }}</text>
+ </view>
+ <view class="history-body">
+ <text>鎻愮叅鍗曚釜鏁� {{ item.tmCount || '' }}</text>
+ </view>
+ </view>
+ </view>
+ </view>
+ <view class="more_text" v-if="showMoreData && historyCoalData.length !== 0">娌℃湁鏁版嵁浜�...</view>
</scroll-view>
</view>
</view>
@@ -61,6 +74,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 +129,19 @@
}
},
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.historyCoalData = this.ArrSet(this.historyCoalData, 'id');
+ this.loading = false;
+ } else {
+ this.historyCoalData = res.data.records;
+ this.loading = false;
+ }
}
});
},
@@ -105,6 +150,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();
@@ -115,21 +169,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}`
});
}
}
@@ -138,9 +199,52 @@
<style lang="scss" scoped>
.scroll-Y {
- height: 600rpx;
+ height: 900rpx;
+ background-color: #e2e2e2;
+ border-radius: vww(10);
+ .history-information {
+ width: 94%;
+ display: flex;
+ flex-direction: column;
+ border: 1px solid #e2e2e2;
+ background-color: #fff;
+ border-radius: vww(10);
+ margin: vww(10);
+ .history-sendate {
+ height: vww(40);
+ border-bottom: 1px solid #e2e2e2;
+ line-height: vww(40);
+ padding-left: vww(8);
+ position: relative;
+ .view-more {
+ display: flex;
+ width: vww(80);
+ position: absolute;
+ right: vww(10);
+ top: vww(-1);
+ .arrow-right {
+ position: absolute;
+ right: vww(27);
+ top: vww(12);
+ }
+ }
+ }
+ .history-main {
+ min-height: vww(120);
+ display: flex;
+ justify-content: space-between;
+ .main-left,
+ .main-right {
+ width: 45%;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ padding: vww(4) vww(4);
+ }
+ }
+ }
.more_text {
- color: #999;
+ color: #333;
font-size: 24rpx;
text-align: center;
}
@@ -150,7 +254,7 @@
margin: 0 auto;
// 涓讳綋
.freightForwarder-index-body {
- margin-bottom: vww(56);
+ margin-bottom: vww(10);
// 鍗＄墖鏍峰紡
.card-left__top {
--
Gitblit v1.9.1