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

# Conflicts:
#	src/assets/config/apiConfig.ts

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",//详情
+    "RegistrationDetail" ="medical/record/getDetailByRegisId",//详情
-    "DoctorList" ="registration/getListByType",//患者列表
+    "RegistrationList" ="registration/getListByType",//患者列表
 
     /**
      * 科室成员信息

src/components/common/Header.vue

@@ -205,7 +205,7 @@ onMounted(()=>{
 })
 const username=ref<any>('')
 const getInfo=()=>{
-  post(apiConfig.getInfo).then((res: any) => {
+  post(apiConfig.managerUserVerify).then((res: any) => {
     username.value=res.username
   })
 }

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;

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() // 重新初始化数据
 })
 </script>

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({

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