细节修改1

src/views/service-management/registration-queue/components/prescribing-modle.vue

@@ -348,6 +348,16 @@ export default {
     }
 
   },
+  watch: {
+    registerForm(val) {
+      if (val.checkManageBos.length > 0) {
+        this.prescribingForm.inspect = [...val.checkManageBos]
+      }
+      if (val.treatManageBo.length > 0) {
+        this.prescribingForm.treatment = [...val.treatManageBo]
+      }
+    }
+  },
   data() {
     const validNum = (rule, value, callback) => {
       console.log('这是自定义校验', value)
@@ -452,7 +462,8 @@ export default {
           return {
             label: item.name,
             value: item.id,
-            type: item.type
+            type: item.type,
+            price: item.price
           }
         })
         console.log('treatItemOptions!!!!!!!!!!!!!', this.treatItemOptions)

src/views/service-management/registration-queue/components/register-modle.vue

@@ -56,7 +56,7 @@
       <el-table-column align="center" class-name="small-padding fixed-width" label="操作" min-width="160">
         <template #default="{row}">
           <el-button
-            :disabled="!inTimeRange(row.hours.split('~')[0], row.hours.split('~')[1])"
+            :disabled="registrationType !== '0' ? !inTimeRange(row.hours.split('~')[0], row.hours.split('~')[1]) : afterTime(row.hours.split('~')[0], row.hours.split('~')[1])"
             icon="el-icon-document"
             plain
             size="mini"
@@ -180,6 +180,7 @@ export default {
      * @param end 结束时间 时:分
      */
     inTimeRange(start, end) {
+      console.log(start, end)
       const current = moment()
       const startTime = moment({ hour: start.split(':')[0], minute: start.split(':')[1] })
       const endTime = moment({ hour: end.split(':')[0], minute: end.split(':')[1] })
@@ -191,6 +192,17 @@ export default {
       console.log(`endTime.format('YYYY/MM/DD HH:mm:ss')`, endTime.format('YYYY/MM/DD HH:mm:ss'))
       return current.isBetween(startTime, endTime, 'minute')
     },
+    /**
+     * 判断当前时间是否在传入的时间范围后
+     * @param start 开始时间 时:分
+     * @param end 结束时间 时:分
+     */
+    afterTime(start, end) {
+      console.log(start, end)
+      const current = moment()
+      const endTime = moment({ hour: end.split(':')[0], minute: end.split(':')[1] })
+      return current.isAfter(endTime)
+    },
     parseTime,
     /**
      * 获取医生当日排班列表