''
liukangdong
2024-06-27 535a3629e76496db46c6db11968c87f8d41f3d25
''
已添加1个文件
已修改5个文件
58 ■■■■ 文件已修改
h5/pages/staff/meetingCalendar.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
h5/pages/staff/meetingSel.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
h5/pages/staff/meetingSub.vue 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
h5/pages/staff/meetingSubOrder.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
h5/pages/staff/memberSel.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
h5/static/default_avatar.png 补丁 | 查看 | 原始文档 | blame | 历史
h5/pages/staff/meetingCalendar.vue
@@ -265,6 +265,7 @@
      this.activeTab = val
      if (val === '1') {
        this.recordPage = 1
        this.recordList = []
        this.getRecordList()
      } else {
        this.myMeetingList = []
h5/pages/staff/meetingSel.vue
@@ -18,9 +18,9 @@
      <view v-for="item in memberList" :key="item.id" class="line">
        <image
          :src="
            item.prefixUrl
              ? item.prefixUrl
              : require('@/static/logo@2x.png')
            item.avatar
              ? item.prefixUrl + item.avatar
              : require('@/static/default_avatar.png')
          "
          class="avatar"
          mode=""
@@ -35,7 +35,7 @@
        <image
          @click="changeMem(item, index)"
          v-if="item.checked"
          src="@/static/meeting/icon/ic_choose_sel@2x.png"
          src="@/static/checkbox_sel@2x.png"
          mode="widthFix"
          class="checked"
        ></image>
h5/pages/staff/meetingSub.vue
@@ -3,14 +3,14 @@
    <view class="heade_title">
      <image
        class="icon"
        src="../../static/staff/ar_left@2x.png"
        src="@/static/staff/ar_left@2x.png"
        @click="changeDate(-1)"
        mode="widthFix"
      ></image>
      <text class="date">{{ activeDateCum }}</text>
      <image
        class="icon"
        src="../../static/staff/ar_right@2x.png"
        src="@/static/staff/ar_right@2x.png"
        @click="changeDate(1)"
        mode="widthFix"
      ></image>
@@ -33,7 +33,11 @@
      <view
        @click="datetimeClick(item, i)"
        class="item"
        :class="{ disable: item.isUse, active: item.checked == '1' }"
        :class="{
          disable: item.isUse,
          active: item.checked == '1',
          hasSub: item.bookingTimeId,
        }"
        v-for="(item, i) in timeList"
        :key="i"
      >
@@ -68,7 +72,7 @@
        <view class="h1">{{ activeInfo.meetingName }}</view>
        <view class="line">
          <view class="label">会议时间</view>
          <view class="value">{{ activeInfo.meetingTime }}</view>
          <view class="value" v-if="activeInfo.meetingDate">{{ activeInfo.meetingDate.slice(5) }} {{ activeInfo.meetingTime }}</view>
        </view>
        <view class="line">
          <view class="label">会议室</view>
@@ -126,6 +130,8 @@
    roomClick(item) {
      this.$set(this.activeRoom, 'roomId', item.id)
      this.$set(this.activeRoom, 'roomName', item.name)
      this.$set(this.activeRoom, 'limitNum', item.limitNum)
      this.getRoomTime()
    },
    onSubmit() {
      const { activeRoom } = this
@@ -139,10 +145,12 @@
      const obj = {
        startTime: selTimeList[0].startTime,
        endTime: selTimeList[selTimeList.length - 1].endTime,
        bookingTimeList: selTimeList.map(i => i.id).join(',')
        bookingTimeList: selTimeList.map(i => i.id).join(','),
      }
      uni.navigateTo({
        url: `/pages/staff/meetingSubOrder?yudingDate=${activeRoom.yudingDate}&roomName=${activeRoom.roomName}&roomId=${activeRoom.roomId}&startTime=${obj.startTime}&endTime=${obj.endTime}&bookingTimeList=${obj.bookingTimeList}`
        url: `/pages/staff/meetingSubOrder?yudingDate=${activeRoom.yudingDate}&roomName=${activeRoom.roomName}
        &roomId=${activeRoom.roomId}&startTime=${obj.startTime}&endTime=${obj.endTime}
        &bookingTimeList=${obj.bookingTimeList}&limitNum=${activeRoom.limitNum}`
      })
      // this.$jump('/pages/staff/vehicle/apply')
    },
@@ -152,6 +160,7 @@
        if (this.meetingList.length > 0) {
          this.$set(this.activeRoom, 'roomId', this.meetingList[0].id)
          this.$set(this.activeRoom, 'roomName', this.meetingList[0].name)
          this.$set(this.activeRoom, 'limitNum', this.meetingList[0].limitNum)
          this.getRoomTime()
        }
      })
@@ -222,8 +231,10 @@
    },
    changeDate(num) {
      const yudingDate = this.activeRoom.yudingDate
      if (num < 0 && yudingDate === dayjs().format('YYYY-MM-DD')) return
      let fn = num > 0 ? 'add' : 'subtract'
      this.yudingDate = dayjs(yudingDate)[fn](1, 'days').format('YYYY-MM-DD')
      this.activeRoom.yudingDate = dayjs(yudingDate)[fn](1, 'days').format('YYYY-MM-DD')
      console.log('yudingDate', this.activeRoom.yudingDate)
      this.getRoomList()
    },
    getDetail(id) {
@@ -341,6 +352,10 @@
    background-color: #cccccc;
    color: #999999;
  }
  .hasSub{
    color: #fff;
    background-color: #2d5c65;
  }
}
.meeting_list {
  display: flex;
h5/pages/staff/meetingSubOrder.vue
@@ -3,7 +3,7 @@
    <view class="module_list">
      <view class="item">
        <view class="name">会议时间</view>
        <view class="line">
        <view class="line" @click="handleBack">
          <view class="label">
            {{ param.activeDate || param.meetingDate }} 
            <text class="ml12" v-if="!param.id">{{ param.startTime }}-{{ param.endTime }}</text>
@@ -15,7 +15,7 @@
      <view class="item">
        <view class="name">会议室</view>
        <view class="line">
          <view class="label">{{ param.roomName }}</view>
          <view class="label">{{ param.roomName }}(可容纳{{ param.limitNum }}人)</view>
        </view>
      </view>
      <view class="item">
@@ -58,7 +58,10 @@
      </view>
      <view class="empty"></view>
      <view class="item">
        <view class="name">参会人员</view>
        <view class="name">
          参会人员
           <text class="star">*</text>
        </view>
        <view class="line" @click="selPeople">
          <view class="label">
            <text v-if="param.sysList && param.sysList.length > 0">
@@ -210,10 +213,17 @@
        }
      })
    },
    handleBack() {
      uni.navigateBack( )
    },
    onSubmit() {
      const { param, info } = this
      if (!param.name) return uni.showToast({
        title: '请输入会议主题',
        icon: 'none'
      })
      if (!param.sysList || param.sysList.length == 0) return uni.showToast({
        title: '请选择参会人员',
        icon: 'none'
      })
      reservationMeeting({
@@ -283,6 +293,7 @@
      .label {
        flex: 1;
        display: flex;
        flex-wrap: wrap;
        align-items: center;
        .service_item {
          height: 64rpx;
@@ -291,6 +302,7 @@
          border-radius: 4rpx;
          padding: 0 24rpx;
          margin-right: 20rpx;
          margin-bottom: 12rpx;
        }
        .active {
          background-color: #4d99a8;
h5/pages/staff/memberSel.vue
@@ -21,7 +21,7 @@
            :src="
              item.faceImgFull
                ? item.faceImgFull
                : require('@/static/logo@2x.png')
                : require('@/static/default_avatar.png')
            "
            class="avatar"
            mode=""
h5/static/default_avatar.png