From 97e1b9d6c8d7da0891aa7a1e00116b4b14e1b942 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 05 七月 2024 18:22:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/meetingSubOrder.vue | 43 +++++++++++++++++++++++++------------------
1 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/h5/pages/staff/meetingSubOrder.vue b/h5/pages/staff/meetingSubOrder.vue
index e306e60..1d82d33 100644
--- a/h5/pages/staff/meetingSubOrder.vue
+++ b/h5/pages/staff/meetingSubOrder.vue
@@ -60,7 +60,7 @@
<view class="item">
<view class="name">
鍙備細浜哄憳
- <text class="star">*</text>
+ <text class="star"></text>
</view>
<view class="line" @click="selPeople">
<view class="label">
@@ -140,16 +140,6 @@
title: '浼氳璇︽儏'
})
this.getDetail(option.id)
- } else {
- this.param = { ...option }
- const bookingTimeList = option.bookingTimeList.split(',').map(i => {
- return {
- timeId: Number(i)
- }
- })
- this.$set(this.param, 'bookingTimeList', bookingTimeList)
- this.$set(this.param, 'activeDate', dayjs(option.yudingDate).format('YYYY骞碝鏈圖鏃�'))
- this.initOption()
}
},
mounted() {
@@ -160,6 +150,17 @@
}))
// this.$set(this.param, 'memberIds', res.map(i => i.id).join(','))
// this.$set(this.param, 'memberNames', res.map(i => i.name).join(','))
+ })
+ this.$eventBus.$on('meetingSub', (res) => {
+ this.param = { ...res }
+ this.$set(this.param, 'activeDate', dayjs(res.yudingDate).format('YYYY骞碝鏈圖鏃�'))
+ const bookingTimeList = res.bookingTimeList.split(',').map(i => {
+ return {
+ timeId: Number(i)
+ }
+ })
+ this.$set(this.param, 'bookingTimeList', bookingTimeList)
+ this.initOption()
})
},
methods: {
@@ -214,6 +215,7 @@
})
},
handleBack() {
+ if(this.param.id) return
uni.navigateBack( )
},
onSubmit() {
@@ -222,10 +224,10 @@
title: '璇疯緭鍏ヤ細璁富棰�',
icon: 'none'
})
- if (!param.sysList || param.sysList.length == 0) return uni.showToast({
- title: '璇烽�夋嫨鍙備細浜哄憳',
- icon: 'none'
- })
+ // if (!param.sysList || param.sysList.length == 0) return uni.showToast({
+ // title: '璇烽�夋嫨鍙備細浜哄憳',
+ // icon: 'none'
+ // })
reservationMeeting({
...param,
startTime: `${param.yudingDate} ${param.startTime}:00`,
@@ -248,10 +250,15 @@
},
selPeople() {
const { param } = this
- let startTime = param.yudingDate + ' ' + param.startTime
- let endTime = param.yudingDate + ' ' + param.endTime
+ let startTime = new Date(param.yudingDate + ' ' + param.startTime).getTime()
+ let endTime = new Date(param.yudingDate + ' ' + param.endTime).getTime()
+ if(this.param.sysList && this.param.sysList.length > 0){
+ setTimeout(() => {
+ this.$eventBus.$emit('meetingPeoDetail', this.param.sysList || [])
+ }, 500)
+ }
uni.navigateTo({
- url: `/pages/staff/meetingSel?startTime=${startTime}&endTime=${endTime}`
+ url: `/pages/staff/meetingSel?startTime=${startTime}&endTime=${endTime}&limitNum=${this.param.limitNum}`
})
},
serviceClick(item) {
--
Gitblit v1.9.3