reedliuqing_i 5 年之前
父節點
當前提交
c2be479df4

+ 1 - 1
src/views/workbench/person/calendarFormDialog.vue

@@ -132,7 +132,7 @@ export default {
           }
         } else {
           this.form = {
-            time: [this.data.date, this.data.date],
+            time: [this.data.start, this.data.end],
             isJoin: 0,
             noHoliday: 1,
             syncTeam: 1

+ 8 - 5
src/views/workbench/person/index.vue

@@ -21,7 +21,7 @@
           <div class="module_title__sign" />
           <div class="module_title__caption">我的日程</div>
         </div>
-        <MyFullCalendar :events="calendarEvents" @dateClick="dateClick" @expand="calendarDialogVisible = true" @change="queryWorkListByTime" />
+        <MyFullCalendar :events="calendarEvents" @dateClick="dateClick" @expand="calendarDialogVisible = true" @change="queryWorkListByTime" @select="select" />
       </el-aside>
       <el-aside width="32.8%" style="margin-right: 10px" class="layout_aside">
         <div class="module_title">
@@ -46,7 +46,7 @@
     >
       <el-tabs v-model="tabsActiveName" @tab-click="handleTabsClick">
         <el-tab-pane label="日历视图" name="1" style="padding: 31px 146px">
-          <MyFullCalendar :events="calendarEvents" type="big" @dateClick="dateClick" @change="queryWorkListByTime" />
+          <MyFullCalendar :events="calendarEvents" type="big" @dateClick="dateClick" @change="queryWorkListByTime" @select="select" />
         </el-tab-pane>
         <el-tab-pane label="列表视图" name="2" style="padding: 31px 146px">
           <div>
@@ -271,9 +271,8 @@ export default {
       this.queryWorkList()
     },
     dateClick(arg) {
-      this.createSelfScheduleDialog.data = arg
-      this.createSelfScheduleDialog.visible = true
-      console.log(arg)
+      // this.createSelfScheduleDialog.data = arg
+      // this.createSelfScheduleDialog.visible = true
     },
     openUpdateSelfScheduleDialog(val) {
       this.updateSelfScheduleDialog.data = val
@@ -283,6 +282,10 @@ export default {
       this.deleteSelfScheduleDialog.data = val
       this.deleteSelfScheduleDialog.visible = true
     },
+    select(selectionInfo) {
+      this.createSelfScheduleDialog.data = selectionInfo
+      this.createSelfScheduleDialog.visible = true
+    },
     // 删除日程
     deleteSelfSchedule() {
       workbenchApi.deleteSelfSchedule(this.deleteSelfScheduleDialog.data.id)

+ 7 - 2
src/views/workbench/person/myFullCalendar.vue

@@ -36,8 +36,9 @@
       :custom-buttons="customButtons"
       :button-text="buttonText"
       locale="zh-cn"
-      editable="true"
-      droppable="true"
+      editable="false"
+      droppable="false"
+      selectable="true"
       display-event-end="true"
       event-color="#409EFF"
       event-limit="true"
@@ -45,6 +46,7 @@
       :plugins="calendarPlugins"
       :weekends="calendarWeekends"
       :events="events"
+      @select="select"
       @dateClick="dateClick"
       @eventClick="eventClick"
       @eventDrop="eventDrop"
@@ -201,6 +203,9 @@ export default {
         this.todayClassName = 'today'
       }
     },
+    select(selectionInfo) {
+      this.$emit('select', selectionInfo)
+    },
     datesRender(arg) {
       // console.log(arg)
     },