Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web

src/components/outpatient/MedicalQueue.vue

@@ -98,9 +98,9 @@ const initStatusList = () => {
     statusList.value[2].num = res.completeDiaCount
   })
 }
-const clickLi = (item: any) => {
+const clickLi = (item: any,showBox:any = true) => {
   curItem.value = item
-  if (item.status == 1) {
+  if (item.status == 1 && showBox) {
     ElMessageBox.confirm(`您将要接诊${item.name}`, "提示", {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
@@ -114,15 +114,18 @@ const clickLi = (item: any) => {
             curStatus.value = 2
             curItem.value = res
             initStatusList()
+            emit('clickItem', curItem.value)
           })
         }
       },
     })
+  }else {
+    emit('clickItem', curItem.value)
   }
-  emit('clickItem', curItem.value)
+
 }
 const changeCurItemOrStatus = (item:any, status:any) => {
-    curItem.value = item
+    clickLi(item,false)
   if (curStatus != null){
     curStatus.value = status
   }

src/views/outpatient/index.vue

@@ -100,9 +100,9 @@ const save = () => {
     diagnosisMedicalRecord: medicalRecord,
 
   }
-  post('medical/record/save', {data: data}).then(() => {
+  post('medical/record/save', {data: data}).then((res:any) => {
     ElMessage.success("保存成功")
-    medicalQueueRef.value?.changeCurItemOrStatus(null,3);
+    medicalQueueRef.value?.changeCurItemOrStatus(null,2);
 
 
   })
@@ -140,6 +140,7 @@ const clickItem = (item: any) => {
 const medicalQueueRef =ref();
 const cancelReception = () => {
   post('registration/changeStatus', {id: registerId.value, status: 1}).then((res: any) => {
+    debugger
    medicalQueueRef.value?.changeCurItemOrStatus(res,1);
   })
 }