Merge remote-tracking branch 'origin/master'

src/views/service-management/medical-record-management/medical-record-management.vue

@@ -334,6 +334,7 @@
 
     <!-- 添加或修改业务管理-检查管理对话框 -->
     <el-dialog
+      class="book-now-class"
       title="立即预约"
       :visible.sync="open"
       min-width="820px"
@@ -432,6 +433,7 @@
                 class="el-button--success--solid--four"
                 plain
                 @click="handleSubscribeDevice(scope.row)"
+                :disabled="accordingToTime(scope.row.checkTime)"
               >立即预约
               </el-button>
             </template>
@@ -620,7 +622,7 @@ export default {
           // 计算的时间
           const startTime = checkTime.split('-')[0]
           // 当前时间
-          const currentDay = new Date().getHours() + ':' + new Date().getMinutes()
+          const currentDay = new Date().getHours() + ':' + String(new Date().getMinutes()).padStart(2, '0')
           // 计算的时间小于当前时间就false
           if (startTime < currentDay) {
             return true
@@ -1047,15 +1049,20 @@ export default {
 
 .app-container {
   background-color: #FFFFFF;
+  .book-now-class {
+    .el-dialog__body {
+      padding: 0;
+      .dialog-class {
+        min-height: 140px;
+        max-height: 500px;
+        overflow-y: auto;
+      }
+    }
+  }
 }
 
 ::v-deep .el-dialog:not(.is-fullscreen) {
   margin-top: 9vh !important;
 }
 
-.dialog-class {
-  min-height: 140px;
-  overflow-y: auto;
-}
-
 </style>