Merge remote-tracking branch 'origin/dev-20210517' into dev-20210517

src/views/IM/diagnosis-admin/diagnosis-editor.vue

@@ -628,4 +628,4 @@ export default {
   }
 
 }
-</style>
+</style>
\ No newline at end of file

src/views/IM/diagnosis-admin/diagnosis-list.vue

@@ -498,6 +498,23 @@ export default {
         },
         // 预约时间
         timeHandle(row) {
+            let bTime = new Date(row.userAppointBeginTime)
+            let eTime = new Date(row.userAppointEndTime)
+            if (this.activeName == 'three' &&  (new Date() - bTime) && (eTime - new Date())) {
+                this.$confirm('	当前问诊正在进行中，一旦将立即关闭进行中的问诊且无法恢复，确定继续更改时间?', '提醒', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    this.timeHandleFn(row)
+                }).catch(() => {
+
+                })
+            } else {
+                this.timeHandleFn(row)
+            }
+        },
+        timeHandleFn(row) {
             this.beginFlag = false
             this.endFlag = false
             this.timeVisible = true