diff --git a/packages/date-picker/src/panel/time-select.vue b/packages/date-picker/src/panel/time-select.vue
index bc0fa0684..dd450acd2 100644
--- a/packages/date-picker/src/panel/time-select.vue
+++ b/packages/date-picker/src/panel/time-select.vue
@@ -124,7 +124,7 @@
             result.push({
               value: current,
               disabled: compareTime(current, this.minTime || '-1:-1') <= 0 ||
-                compareTime(current, this.maxTime || '100:100') > 0
+                compareTime(current, this.maxTime || '100:100') >= 0
             });
             current = nextTime(current, step);
           }
diff --git a/test/unit/specs/time-select.spec.js b/test/unit/specs/time-select.spec.js
index ee500f458..88eb71c47 100644
--- a/test/unit/specs/time-select.spec.js
+++ b/test/unit/specs/time-select.spec.js
@@ -160,7 +160,7 @@ describe('TimeSelect', () => {
     setTimeout(_ => {
       const elm = picker.picker.$el.querySelector('.disabled');
 
-      expect(elm.textContent).to.equal('15:00');
+      expect(elm.textContent).to.equal('14:30');
       destroyVM(vm);
       done();
     }, 50);