dev

src/components/outpatient/MedicalQueue.vue

@@ -70,7 +70,6 @@ const clickTab = (item: any) => {
   curStatus.value = item.status
   emit('changeTab')
   curItem.value = {}
-
 }
 const setDate = function () {
   if (datePickerRef.value) {
@@ -99,7 +98,6 @@ const itemId = defineModel()
 onMounted(() => {
   selectedDate.value = getCurrentDate()
   initStatusList()
-  curItem.value = itemId
   if (curStatus.value == 1) {
     init()
   }
@@ -117,8 +115,15 @@ const init = async () => {
         endTime: getEndOfDay(new Date(selectedDate.value))
       }
     }, {catch_error: true});
-
     list.value = data.list
+    if (itemId.value != null) {
+      list.value.forEach((item: any, index: any) => {
+        if (item.id == itemId.value) {
+          clickLi(item, false)
+        }
+      })
+    }
+
   } catch (e) {
 
   } finally {
@@ -138,7 +143,7 @@ const initStatusList = () => {
 }
 const clickLi = (item: any, showBox: any = true) => {
   curItem.value = item
-  if (item!=null&&item.status == 1 && showBox) {
+  if (item != null && item.status == 1 && showBox) {
     ElMessageBox.confirm(`您将要接诊${item.name}`, "提示", {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
@@ -225,6 +230,7 @@ watch(() => selectedDate.value, (newValue, oldValue) => {
   position: relative;
   margin: 16px 0;
   padding: 0 16px;
+
   .search-icon {
     position: absolute;
     left: 32px;
@@ -234,6 +240,7 @@ watch(() => selectedDate.value, (newValue, oldValue) => {
     height: 16px; // 调整图标大小
     z-index: 1;
   }
+
   .search-input {
     width: 100%;
     height: 42px;
@@ -255,9 +262,11 @@ watch(() => selectedDate.value, (newValue, oldValue) => {
   display: flex;
   min-height: 0;
   flex-direction: column;
+
   ul {
     flex: 1;
     min-height: 0;
+
     .list-item {
       height: 48px;
       display: flex;
@@ -269,9 +278,11 @@ watch(() => selectedDate.value, (newValue, oldValue) => {
       color: rgba(34, 42, 57, 0.7);
       font-style: normal;
       cursor: pointer;
+
       span {
         display: flex;
         align-items: center;
+
         .avatar {
           width: 26px;
           height: 26px;

src/components/registration/Edit.vue

@@ -110,6 +110,14 @@
                 </el-select>
               </el-form-item>
             </el-descriptions-item>
+            <el-descriptions-item label="费用类型">
+              <el-form-item prop="type">
+               <el-select v-model="edit_data.type">
+                 <el-option label="普通" :value="1"></el-option>
+                 <el-option label="医保" :value="2"></el-option>
+               </el-select>
+              </el-form-item>
+            </el-descriptions-item>
             <el-descriptions-item
                 label="备注">
               <el-form-item>

src/views/outpatient/index.vue

@@ -110,11 +110,10 @@ const patientCardRef = ref()
 const patientRegistration = ref<any>({})
 const clickItem = (item: any) => {
   curRegister.value = item
-  if(!item)return
+  if (!item) return
   registerId.value = item.id
   itemId.value = item.id
   patientId.value = item.patientInfoId
-
   if (item.status == 2) {
     initFormData()
   }
@@ -132,7 +131,7 @@ const clickItem = (item: any) => {
   }
   nextTick(() => {
     medicalHistoryRef.value?.init(patientId.value);
-    patientCardRef.value?.init(curRegister.value.id)
+    patientCardRef.value?.init(curRegister.value?.id)
   })
 
 }
@@ -145,6 +144,7 @@ const cancelReception = () => {
 const changeTab = (e: any) => {
   initFormData()
   patientRegistration.value = {}
+  itemId.value = null
   nextTick(() => {
     medicalHistoryRef.value?.clearList();
   })