From cff9aa6a3a5d9dab0c97cf9154382d1a69aa1cf5 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 20 十一月 2025 12:17:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
h5/pages/staff/meetingManager.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/h5/pages/staff/meetingManager.vue b/h5/pages/staff/meetingManager.vue
index b7c7bef..9d6dfdd 100644
--- a/h5/pages/staff/meetingManager.vue
+++ b/h5/pages/staff/meetingManager.vue
@@ -70,7 +70,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>
@@ -165,7 +165,8 @@
initData() {
// 褰撴湀鏁版嵁
monthMeetingPage({
- yearMonth: this.currentDate.slice(0, 7)
+ yearMonth: this.currentDate.slice(0, 7),
+ queryType: 3
}).then(res => {
this.monthMark = res.data.filter(i => i.meetingNum > 0).map(j => {
return {
@@ -234,7 +235,7 @@
// 褰撳ぉ鎴戝弬涓庣殑浼氳
myMeetingPage({
model: {
- queryType: '1',
+ queryType: '3',
roomsId: activeRoom.id,
queryDate: currentDate
},
--
Gitblit v1.9.3