From e7b0b34176549cfec809c6b89c4cab0999e488b9 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 28 三月 2023 16:40:56 +0800
Subject: [PATCH] 修改大部分问题
---
pages/customer-page/customer-index/customer-index.vue | 83 +++++++++++++++++++++++++++++------------
1 files changed, 58 insertions(+), 25 deletions(-)
diff --git a/pages/customer-page/customer-index/customer-index.vue b/pages/customer-page/customer-index/customer-index.vue
index d35997e..b84232b 100644
--- a/pages/customer-page/customer-index/customer-index.vue
+++ b/pages/customer-page/customer-index/customer-index.vue
@@ -10,7 +10,7 @@
</view>
<view class="card-left__utils">
<u-button @tap.stop="receiveClick(item)" text="棰嗗彇" type="primary" v-if="item.cars2 != item.carNum" shape="circle"></u-button>
- <u-button text="杞彂" type="primary" @tap.stop="forwardClick(item)" shape="circle" v-if="item.carNum != item.carNumSurplus1"></u-button>
+ <u-button text="杞彂" type="primary" @tap.stop="forwardClick(item)" shape="circle"></u-button>
</view>
</template>
<template v-slot:right-top>
@@ -48,7 +48,7 @@
</view>
<view class="history-numbers">
<combined-title title="鍘嗗彶鎻愮叅鍗�"></combined-title>
- <scroll-view :scroll-top="scrollTop" scroll-y="true" class="scroll-Y">
+ <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>
@@ -60,17 +60,17 @@
<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>
</scroll-view>
- <view class="uni-pagination-box"><uni-pagination show-icon :page-size="pageSize" :current="pageCurrent" :total="total" @change="change2" /></view>
</view>
<!-- 棰嗗彇寮瑰嚭妗� -->
<u-popup :show="show" @close="close" @open="open" mode="center" round="10">
@@ -88,9 +88,24 @@
import combinedTitle from '@/components/combined-title/combined-title.vue';
import { customerId } from '@/utils/status';
export default {
+ props: {
+ orderPlanDataStore: {
+ type: Array,
+ default: []
+ }
+ },
components: {
card,
combinedTitle
+ },
+ watch: {
+ orderPlanDataStore: {
+ handler(v) {
+ this.orderPlanData = v;
+ },
+ deep: true,
+ immediate: true
+ }
},
data() {
return {
@@ -106,11 +121,13 @@
loading: false,
scrollTop: 0,
// 姣忛〉鏁版嵁閲�
- pageSize: 5,
+ pageSize: 10,
// 褰撳墠椤�
pageCurrent: 1,
// 鏁版嵁鎬婚噺
- total: 0
+ total: 0,
+ // 鏄惁鏄剧ず鏇村鏁版嵁
+ showMoreData: false
};
},
onLoad() {},
@@ -121,6 +138,7 @@
init() {
this.GetOrderPlan();
this.getJhOrderPlanDataPage();
+ if (this.pageCurrent * this.pageSize >= this.total) return (this.showMoreData = true);
},
// 鑾峰彇鍙戣繍璁″垝鍒楄〃
GetOrderPlan() {
@@ -128,22 +146,27 @@
title: '鍔犺浇涓�...'
});
this.$reqGet('GetOrderPlan').then(res => {
- this.orderPlanData = res.data;
- uni.hideLoading();
+ if (res.data) {
+ this.orderPlanData = res.data;
+ uni.hideLoading();
+ }
});
},
// 鑾峰彇鍘嗗彶鎻愮叅鍗�
getJhOrderPlanDataPage() {
this.loading = true;
this.$reqGet('getJhOrderPlanDataPage', { current: this.pageCurrent, size: this.pageSize }).then(res => {
- this.historyCoalData = res.data.records;
- this.total = res.data.total;
- this.loading = false;
+ if (res.data.records) {
+ this.historyCoalData = [...this.historyCoalData, ...res.data.records];
+ this.total = res.data.total;
+ this.loading = false;
+ }
});
},
- change2(e) {
- console.log(e, '椤电爜鏀瑰彉');
- this.pageCurrent = e.current;
+ // 涓婃媺鍔犺浇
+ historyScrolltolower() {
+ if (this.pageCurrent * this.pageSize >= this.total) return (this.showMoreData = true);
+ this.pageCurrent++;
this.getJhOrderPlanDataPage();
},
popupDetermineClick() {
@@ -192,15 +215,23 @@
},
// 鎻愮叅鍗曡鎯�
cardBodyClick(name) {
- console.log('鎻愮叅鍗曡鎯�', name);
+ console.log(name, 'name');
let code = null;
+ let cars2 = null;
this.orderPlanData.forEach(item => {
if (item.id == name) {
code = item.code;
+ cars2 = item.cars2;
}
});
uni.navigateTo({
- url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${name}&code=${code}`
+ url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${name}&code=${code}&cars2=${cars2}`
+ });
+ },
+ // 鐐瑰嚮鍘嗗彶鎻愮叅鍗曚竴琛岃幏鍙栬鎯�
+ faYundetail(v) {
+ uni.navigateTo({
+ url: `/pages/customer-page/customer-index/fayunPlanDetails/fayunPlanDetails?orderPlanId=${v.id}&cars2=${v.cars2}`
});
},
// 杞彂
@@ -214,11 +245,13 @@
</script>
<style lang="scss" scoped>
-.uni-pagination-box {
- height: 60rpx;
-}
.scroll-Y {
height: 600rpx;
+ .more_text {
+ color: #999;
+ font-size: 24rpx;
+ text-align: center;
+ }
}
::v-deep.customer-index {
width: 94%;
--
Gitblit v1.9.1