diff --git a/src/components/date-picker/base/date-table.vue b/src/components/date-picker/base/date-table.vue
index aa4822ad..5f6e933d 100644
--- a/src/components/date-picker/base/date-table.vue
+++ b/src/components/date-picker/base/date-table.vue
@@ -7,7 +7,7 @@
         </div>
         <span
                 :class="getCellCls(cell)"
-                v-for="(cell, i) in readCells"
+                v-for="(cell, i) in cells"
                 :key="String(cell.date) + i"
                 @click="handleClick(cell, $event)"
                 @mouseenter="handleMouseMove(cell)"
@@ -61,7 +61,7 @@
                 const weekDays = translatedDays.splice(weekStartDay, 7 - weekStartDay).concat(translatedDays.splice(0, weekStartDay));
                 return this.showWeekNumbers ? [''].concat(weekDays) : weekDays;
             },
-            readCells () {
+            cells () {
                 const tableYear = this.tableDate.getFullYear();
                 const tableMonth = this.tableDate.getMonth();
                 const today = clearHours(new Date());    // timestamp of today
diff --git a/src/components/date-picker/base/mixin.js b/src/components/date-picker/base/mixin.js
index b6b5f1dd..d2dd60c4 100644
--- a/src/components/date-picker/base/mixin.js
+++ b/src/components/date-picker/base/mixin.js
@@ -2,6 +2,7 @@
 import {clearHours} from '../util';
 
 export default {
+    name: 'PanelTable',
     props: {
         tableDate: {
             type: Date,
diff --git a/src/components/date-picker/picker.vue b/src/components/date-picker/picker.vue
index aaaab32e..5be8c468 100644
--- a/src/components/date-picker/picker.vue
+++ b/src/components/date-picker/picker.vue
@@ -385,7 +385,15 @@
                     if (this.type.match(/range/)){
                         this.$refs.pickerPanel.handleRangePick(this.focusedDate, 'date');
                     } else {
-                        this.onPick(this.focusedDate, false, 'date');
+                        const panels = findComponentsDownward(this, 'PanelTable');
+                        const compareDate = (d) => {
+                            const sliceIndex = ['year', 'month', 'date'].indexOf((this.type)) + 1;
+                            return [d.getFullYear(), d.getMonth(), d.getDate()].slice(0, sliceIndex).join('-');
+                        };
+                        const dateIsValid = panels.find(({cells}) => {
+                            return cells.find(({date, disabled}) => compareDate(date) === compareDate(this.focusedDate) && !disabled);
+                        });
+                        if (dateIsValid) this.onPick(this.focusedDate, false, 'date');
                     }
                 }
 
diff --git a/src/styles/components/date-picker.less b/src/styles/components/date-picker.less
index 01a73edd..c9f768e3 100644
--- a/src/styles/components/date-picker.less
+++ b/src/styles/components/date-picker.less
@@ -46,7 +46,7 @@
         }
         &-cell:hover, &-focused{
             em{
-                background: @date-picker-cell-hover-bg;
+                background: @date-picker-cell-hover-bg !important;
             }
         }