From 8fc9e2cb7c40ff840ca40e0491124bc1d166a15e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 六月 2025 10:20:23 +0800
Subject: [PATCH] 最新版本541200007
---
h5/pages/staff/meetingCalendar.vue | 47 +++++++++++++++++++++++++++++++++--------------
1 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/h5/pages/staff/meetingCalendar.vue b/h5/pages/staff/meetingCalendar.vue
index 1a6b653..d516073 100644
--- a/h5/pages/staff/meetingCalendar.vue
+++ b/h5/pages/staff/meetingCalendar.vue
@@ -89,7 +89,7 @@
<view class="value">{{ item.bookingUser }}</view>
</view>
<view class="line">
- <view class="label">澶囨敞锛�</view>
+ <view class="label">浼氳闇�姹傦細</view>
<view class="value">{{ item.remark || item.meetingRemark }}</view>
</view>
</view>
@@ -131,7 +131,11 @@
<view class="status" v-if="item.meetingStatus == '5'"
>宸叉挙閿�</view
>
- </view>
+ </view>
+ <view class="line">
+ <view class="label">浼氳鏃ユ湡锛�</view>
+ <view class="value">{{ item.meetingDate }}</view>
+ </view>
<view class="line">
<view class="label">浼氳鏃堕棿锛�</view>
<view class="value">{{ item.meetingTime }}</view>
@@ -144,10 +148,10 @@
<view class="label">棰勭害浜猴細</view>
<view class="value">{{ item.bookingUser }}</view>
</view>
- <view class="line">
+<!-- <view class="line">
<view class="label">澶囨敞锛�</view>
<view class="value">{{ item.remark || item.meetingRemark }}</view>
- </view>
+ </view> -->
</view>
<view v-if="recordList.length === 0" style="text-align: center">
<image
@@ -204,7 +208,8 @@
data() {
return {
activeTab: '0',
- recordList: [],
+ recordList: [],
+ total: 0,
recordPage: 1,
myPage: 1,
myMeetingList: [],
@@ -224,18 +229,21 @@
},
onLoad() {
this.currentDate = dayja().format('YYYY-MM-DD')
- this.initData()
- this.getRoomList()
+ this.getRoomList()
},
onShow() {
- this.tabClick('0')
+ // this.tabClick('0')
+ this.initData()
+ this.tabClick(this.activeTab)
},
onReachBottom() {
- const { activeTab } = this
- if (activeTab == '0') {
+ const { activeTab, total, myMeetingList, recordList } = this
+ if (activeTab == '0') {
+ if(total <= myMeetingList.length) return this.showToast('鏆傛棤鏇村鏁版嵁')
this.myPage = this.myPage + 1
this.getDayMeeting()
- } else {
+ } else {
+ if(total <= recordList.length) return this.showToast('鏆傛棤鏇村鏁版嵁')
this.recordPage = this.recordPage + 1
this.getRecordList()
}
@@ -244,7 +252,8 @@
initData() {
// 褰撴湀鏁版嵁
monthMeetingPage({
- yearMonth: this.currentDate.slice(0, 7)
+ yearMonth: this.currentDate.slice(0, 7),
+ queryType: 1
}).then(res => {
this.monthMark = res.data.filter(i => i.meetingNum > 0).map(j => {
return {
@@ -335,7 +344,8 @@
queryType: 2
}
}).then(res => {
- this.recordList = [...this.recordList, ...res.data.records]
+ this.recordList = [...this.recordList, ...res.data.records]
+ this.total = res.data.total
})
},
getDayMeeting() {
@@ -350,7 +360,8 @@
page: myPage,
capacity: 10
}).then(res => {
- this.myMeetingList = [...this.myMeetingList, ...res.data.records]
+ this.myMeetingList = [...this.myMeetingList, ...res.data.records]
+ this.total = res.data.total
})
},
}
@@ -463,6 +474,10 @@
font-weight: 600;
font-size: 32rpx;
color: #222222;
+ flex: 1;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
}
.status {
height: 38rpx;
@@ -472,6 +487,10 @@
border: 1rpx solid #999999;
font-size: 22rpx;
color: #999999;
+ margin-left: 20rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
}
.padding {
color: $uni-color-primary;
--
Gitblit v1.9.3