From 35254b3ff03ee616d77dc1d2ef8f37b3e2c1742b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=9D=99?= <sco@didichuxing.com>
Date: Sat, 28 Apr 2018 18:24:59 +0800
Subject: [PATCH] a

---
 .../haomo/components/calendar/HmFullCalendar.vue    | 13 +++++++++----
 src/views/haomo/components/calendar/index.vue       |  8 +++++---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/views/haomo/components/calendar/HmFullCalendar.vue b/src/views/haomo/components/calendar/HmFullCalendar.vue
index 284552a..6c088e7 100644
--- a/src/views/haomo/components/calendar/HmFullCalendar.vue
+++ b/src/views/haomo/components/calendar/HmFullCalendar.vue
@@ -274,6 +274,9 @@
       title: {
         required: false
       },
+      events: {
+        required: false
+      },
       date: {
         required: false
       }
@@ -443,12 +446,12 @@
               dateItem.active = !dateItem.active
             }
             // 向上发送本次点击的行程数据
-            console.log(result)
+            console.log(result, '--------------------')
             if (result.schedule) {
               const currentTime = this.timestampToTime(result.schedule.date)
               console.log(currentTime)
               this.currentDate = currentTime
-              this.event = result.schedule.title
+              this.event = result.schedule.event
             }
             // this.$emit('dateChange', result)
           } else { // 已激活行程提示的，不作反应
@@ -490,18 +493,20 @@
             item.time = moment(item[self.date]).format('YYYY-MM-DD')
             item.date = moment(item[self.date]).format('X') * 1000
             item.title = item[self.title]
+            item.allEvents = item[self.events]
             if (saveTime === item.time) {
-              self.schedules[self.schedules.length - 1].event.push(item)
+              self.schedules[self.schedules.length - 1].allEvents.push(item.allEvents)
             } else {
               saveTime = item.time
               self.schedules.push({
                 date: item.date,
                 title: item.title,
-                event: [item]
+                allEvents: [item.allEvents]
               })
             }
           })
         })
+        console.log(self.schedules, '+++++最终+++++++++')
       }
     },
     created() {
diff --git a/src/views/haomo/components/calendar/index.vue b/src/views/haomo/components/calendar/index.vue
index 64c404c..9ebab82 100644
--- a/src/views/haomo/components/calendar/index.vue
+++ b/src/views/haomo/components/calendar/index.vue
@@ -4,6 +4,7 @@
       :width="width"
       :schema="schema['HmUser']"
       :title="title"
+      :events="events"
       :date="date"
       @dateChange="datechange"
       @monthChange="monthchange"
@@ -26,9 +27,10 @@
       return {
         show: false,
         width: '300px',
-        // title为需要传入的事件所对应的的字段名，date为时间所对应的字段
-        title: 'username',
-        date: 'createTime'
+        // title为需要传入的事件名所对应的的字段名，date为时间所对应的字段，events为事件所对应的字段，都不是必传
+        title: '',
+        date: 'createTime',
+        events: 'email'
       }
     },
     filters: {
-- 
2.21.0