Merge remote-tracking branch 'origin/master'

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

@@ -197,7 +197,7 @@
           </el-row>
           <!-- 第三行:描述 -->
           <el-row :gutter="41">
-            <el-col :span="24">
+            <el-col :span="24" style="padding-left: inherit !important;">
               <el-form-item
                 :ref="'settingList.'+index+'.content'"
                 label="描述"

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

@@ -359,7 +359,7 @@
                 size="mini"
                 type="success"
                 plain
-                :disabled="parseInt(scope.row.price) > parseInt(currentHospital.currentBalance) || currentHospital.currentBalance === 0"
+                :disabled="accordingToTime(scope.row.checkTime) || parseInt(scope.row.price) > parseInt(currentHospital.currentBalance) || currentHospital.currentBalance === 0"
                 @click="handleSubscribeDevice(scope.row)"
               >立即预约
               </el-button>
@@ -550,6 +550,27 @@ export default {
       this.currentUser.userType = this.$store.state.user.userType
       this.currentUser.name = this.$store.state.user.name
     },
+    // 根据当前条数据时间段判断能不能点击
+    accordingToTime(checkTime) {
+      const currentTime = parseTime(new Date(), '{y}-{m}-{d}')
+      if (this.form.checkDate === null || this.form.checkDate === currentTime) {
+        if (checkTime !== null && checkTime !== '') {
+          // 计算的时间
+          const startTime = checkTime.split('-')[0]
+          // 当前时间
+          const currentDay = new Date().getHours() + ':' + new Date().getMinutes()
+          // 计算的时间小于当前时间就false
+          if (startTime < currentDay) {
+            return true
+          } else {
+            return false
+          }
+        }
+      } else {
+        return false
+      }
+      return false
+    },
     // 立即预约对话框关闭回调函数
     closeSubscribe() {
       this.form = {

src/views/service-management/treatment-management/treatment-item.vue

@@ -170,7 +170,7 @@
           </el-row>
           <!-- 第三行:描述 -->
           <el-row :gutter="41">
-            <el-col :span="24">
+            <el-col :span="24" style="padding-left: inherit !important;">
               <el-form-item
                 :ref="'settingList.'+index+'.content'"
                 label="描述"