Merge remote-tracking branch 'origin/master'

jiangping

2024-06-28 43942a545271345ce26e40d82bb97138c5ea7611

 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;