From 2b872bd5a428435dfec2f9e8ee02bd76b5edc378 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 11 六月 2024 13:59:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/task/index.vue | 25 -------------------------
admin/src/views/meeting/bookings.vue | 8 ++++----
2 files changed, 4 insertions(+), 29 deletions(-)
diff --git a/admin/src/views/meeting/bookings.vue b/admin/src/views/meeting/bookings.vue
index 1cb742c..706d8fc 100644
--- a/admin/src/views/meeting/bookings.vue
+++ b/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}`
diff --git a/admin/src/views/task/index.vue b/admin/src/views/task/index.vue
index ca44648..86f5e2f 100644
--- a/admin/src/views/task/index.vue
+++ b/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' },
--
Gitblit v1.9.3