Merge branch 'chronic-master' of…

Merge branch 'chronic-master' of http://gitlab.yiboshi.com/nightkis1995/frontend-h5 into chronic-master

src/doctor/followUp/generalFU/form/BaseInfo.vue

@@ -572,7 +572,7 @@ export default {
                 residentName: [{ required: true, message: '请填写姓名' }],
                 genderName: [{ required: true, message: '请选择性别' }],
                 dataBirth: [{ required: true, message: '请选择出生日期' }],
-                nationalName: [{ required: true, message: '请选择名族' }],
+                nationalName: [{ required: true, message: '请选择民族' }],
                 currentAge: [{ required: true, message: '请填写年龄' }],
                 telephone: [{ required: true, message: '请填写本人电话' }],
                 contactName: [{ required: false, message: '请填写联系人姓名' }],

src/router/index.js

 import { createRouter, createWebHashHistory } from 'vue-router'
 
 const routes = [
+    {
+        path: '/doctor',
+        name: 'Home',
+        redirect: '/doctor/followUp/list'
+    },
     {
         path: '/resident',
         name: 'resident',
@@ -65,7 +70,7 @@ const routes = [
                         path: 'visit',
                         name: 'doctor-resident-visit',
                         component: () => import(/* webpackChunkName: "page-doctor" */ '@/doctor/resident/Visit.vue')
-                    },
+                    }
                 ]
             },
             //修改基本信息
@@ -73,14 +78,14 @@ const routes = [
                 path: 'resident/base/update',
                 name: 'doctor-resident-base-update',
                 component: () => import(/* webpackChunkName: "page-doctor" */ '@/doctor/resident/form/BaseInfo.vue')
-            },
+            }
         ]
     }
 ]
 
 const router = createRouter({
-  history: createWebHashHistory(),
-  routes
+    history: createWebHashHistory(),
+    routes
 })
 
 export default router