jiangping
2024-06-11 2b872bd5a428435dfec2f9e8ee02bd76b5edc378
Merge remote-tracking branch 'origin/master'
已修改2个文件
33 ■■■■ 文件已修改
admin/src/views/meeting/bookings.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/task/index.vue 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/meeting/bookings.vue
@@ -229,15 +229,15 @@
      if (e === '0') {
        this.searchForm.startTime = timeForMat(0)[0]
        this.searchForm.endTime = timeForMat(0)[1]
        this.time = timeForMat(0)
        this.date = timeForMat(0)
      } else if (e === '1') {
        this.searchForm.startTime = timeForMat(6)[0]
        this.searchForm.endTime = timeForMat(6)[1]
        this.time = timeForMat(6)
        this.date = timeForMat(6)
      } else if (e === '2') {
        this.searchForm.startTime = timeForMat(29)[0]
        this.searchForm.endTime = timeForMat(29)[1]
        this.time = timeForMat(29)
        this.date = timeForMat(29)
      }
      this.search()
    },
@@ -269,7 +269,7 @@
      this.searchForm.radio = '0'
      this.searchForm.startTime = ''
      this.searchForm.endTime = ''
      this.search()
      this.changeRadio('0')
    },
    copy (row) {
      const text = `${row.realName} 邀请您加入会议\n会议主题:${row.name}\n会议室:${row.roomName}\n会议时间:${row.meetingTime}\n点击链接直接加入会议:\n${this.link}?id=${row.id}`
admin/src/views/task/index.vue
@@ -36,32 +36,8 @@
        </template>
      </el-tab-pane>
      <el-tab-pane :value="headData.noticeDealNum" label="已处理" name="1">
        <template #label>
          <span
            >已处理
            <el-badge
              v-if="headData.noticeDealNum"
              :value="headData.noticeDealNum"
              class="item"
              type="danger"
            >
            </el-badge>
          </span>
        </template>
      </el-tab-pane>
      <el-tab-pane :value="headData.noticeCreateNum" label="我发起的" name="2">
        <template #label>
          <span
            >我发起的
            <el-badge
              v-if="headData.noticeCreateNum"
              :value="headData.noticeCreateNum"
              class="item"
              type="danger"
            >
            </el-badge>
          </span>
        </template>
      </el-tab-pane>
      <el-tab-pane :value="headData.noticeCopyNum" label="抄送我的" name="3">
        <template #label>
@@ -173,7 +149,6 @@
            filed: 'type',
            type: 'select',
            label: '任务类型',
            clearable: false,
            options: [
              { label: '访客申请', value: '0' },
              { label: '访客报备', value: '1' },