diff --git a/src/assets/config/apiConfig.ts b/src/assets/config/apiConfig.ts index 1762c9b..af5c5f7 100644 --- a/src/assets/config/apiConfig.ts +++ b/src/assets/config/apiConfig.ts @@ -2,15 +2,15 @@ export enum apiConfig{ /** * 用户操作 */ - "ManagerLogin"="manager/user/login",//登录 + "ManagerUserLogin"="manager/user/login",//登录 "signIn"="sign/in",//签到 "signOut"="sign/out",//签退 - "getInfo"="manager/user/verify",//获取用户信息 + "managerUserVerify"="manager/user/verify",//获取用户信息 /** * 接诊操作 */ - "DoctorDetail" ="medical/record/getDetailByRegisId",//详情 - "DoctorList" ="registration/getListByType",//患者列表 + "RegistrationDetail" ="medical/record/getDetailByRegisId",//详情 + "RegistrationList" ="registration/getListByType",//患者列表 /** * 科室成员信息 @@ -19,4 +19,4 @@ export enum apiConfig{ "organizationMemberSearch"="organization/member/search",//搜索成员 "OrganizationSectionAllList"="organization/section/allList",//获取所有科室列表 "OrganizationSectionListByMemberId"="organization/section/listByMemberId",//获取当前成员所属科室列表 -} \ No newline at end of file +} diff --git a/src/components/common/Header.vue b/src/components/common/Header.vue index 91aa20d..4f7a2c8 100644 --- a/src/components/common/Header.vue +++ b/src/components/common/Header.vue @@ -205,7 +205,7 @@ onMounted(()=>{ }) const username=ref('') const getInfo=()=>{ - post(apiConfig.getInfo).then((res: any) => { + post(apiConfig.managerUserVerify).then((res: any) => { username.value=res.username }) } diff --git a/src/components/home/index/ValidityWarning.vue b/src/components/home/index/ValidityWarning.vue index fcb242b..bbc9297 100644 --- a/src/components/home/index/ValidityWarning.vue +++ b/src/components/home/index/ValidityWarning.vue @@ -138,7 +138,6 @@ const isExpire = (item: any) => { .item-right { width: 100px; - .item-right-num { font-size: 28px; font-weight: bold; diff --git a/src/components/outpatient/MedicalQueue.vue b/src/components/outpatient/MedicalQueue.vue index dc3fc74..d470b9e 100644 --- a/src/components/outpatient/MedicalQueue.vue +++ b/src/components/outpatient/MedicalQueue.vue @@ -82,11 +82,14 @@ const itemId = defineModel() onMounted(() => { initStatusList() curItem.value = itemId + if(props.status==1){ + init() + } }) const loading = ref(true) const init = () => { loading.value = true - post(apiConfig.DoctorList, { + post(apiConfig.RegistrationList, { query: { status: props.status, beginTime: '2024-05-07 23:59:59', @@ -111,6 +114,7 @@ const clickLi = (item: any) => { } watch(() => props.status, () => { + console.log('status', props.status) init() // 重新初始化数据 }) diff --git a/src/views/Login.vue b/src/views/Login.vue index 3886e40..fde85e6 100644 --- a/src/views/Login.vue +++ b/src/views/Login.vue @@ -35,7 +35,7 @@ const handleLogin = () => { duration: 1000, }) } - post(apiConfig.ManagerLogin, {username: username.value, password: password.value},{catch_error: true}).then((token: any) => { + post(apiConfig.ManagerUserLogin, {username: username.value, password: password.value},{catch_error: true}).then((token: any) => { localStorage.setItem('token', token) //签到,如果 签到成功,则直接调用success,如果失败,调用error ElMessage({ diff --git a/src/views/outpatient/index.vue b/src/views/outpatient/index.vue index b84fca4..bb44f27 100644 --- a/src/views/outpatient/index.vue +++ b/src/views/outpatient/index.vue @@ -117,7 +117,7 @@ const getId = (item: any) => { }) } if (item.status == 3) { - post(apiConfig.DoctorDetail, { + post(apiConfig.RegistrationDetail, { regisId: item.id }).then((res: any) => { formData.value = res.diagnosisMedicalRecord