diff --git a/src/router/module/base-routes.ts b/src/router/module/base-routes.ts index 379d66b..9b399f6 100644 --- a/src/router/module/base-routes.ts +++ b/src/router/module/base-routes.ts @@ -233,15 +233,15 @@ export default [ ] }, { path: '/file_bag', - redirect: '/file_bag/index', + redirect: '/file_bag', component: BasicLayout, meta: { title: '医德医风档案' }, children: [ { - path: '/file_bag/index/:id*', + path: '/file_bag/index/:id?', name: 'fileBagIndex', component: () => import('../../views/file_bag/index.vue'), - meta: { title: '我的档案',closable: true }, + meta: { title: '我的档案', closable: true }, }, { path: '/file_bag/examine', name: 'fileBagExamine', diff --git a/src/views/file_bag/examine.vue b/src/views/file_bag/examine.vue index 2b8f76c..bf0124f 100644 --- a/src/views/file_bag/examine.vue +++ b/src/views/file_bag/examine.vue @@ -26,14 +26,14 @@ - + - + @@ -47,34 +47,17 @@ - - + - @@ -94,10 +77,7 @@ import { import { useUserStore } from "@/store/user"; import { useRouter } from 'vue-router'; const router = useRouter(); - - const userStore = useUserStore() - onMounted(() => { getLeftList(); }) @@ -111,7 +91,6 @@ const getUserList = () => { page.total = res.data.count; } else { dataSource.value = []; - layer.msg(res.msg, { icon: 2 }) } }) } @@ -129,8 +108,6 @@ const getLeftList = () => { data.value = res.data; leftId.value = res.data[0].id; getUserList(); - } else { - layer.msg(res.msg, { icon: 2 }) } }) } @@ -156,7 +133,6 @@ function handleClick(node: any) { getUserList(); } -const loading = ref(false) const page = reactive({ current: 1, limit: 10, total: 1 }) const columns = ref([ { title: '编号', width: '80px', key: 'id', align: 'center' }, @@ -169,23 +145,19 @@ const columns = ref([ { title: '操作', width: '250px', customSlot: 'operator', key: 'operator', fixed: 'right', align: 'center' } ]) -const addShow = ref(false) -const title = ref('新增') - // 搜索功leftId能 const toSearch = () => { page.current = 1; - leftId.value = 0; getUserList(); } -const userInfo = ref(); const getInfo = (row) => { - router.push({ path: '/file_bag/index/' + row.id}); + console.log(row.id); + router.push({ path: '/file_bag/index/' + row.id }); } - \ No newline at end of file diff --git a/src/views/file_bag/index.vue b/src/views/file_bag/index.vue index 542ad92..9e1a7e6 100644 --- a/src/views/file_bag/index.vue +++ b/src/views/file_bag/index.vue @@ -261,11 +261,6 @@ const genderText = computed(() => { } }); -// 格式化日期 -const formatDate = (dateString) => { - if (!dateString) return '暂无'; - return dateString; -}; const jiaList = ref([]); // 获取用户详情(使用模拟数据) const getUserDetail = () => { @@ -292,8 +287,9 @@ const toSearchHz = () => { // 使用模拟数据,延迟一秒模拟加载效果 onMounted(() => { //查询是否有query参数,没有则使用userStore.userInfo.id - if (route.query.id) { - user_id.value = route.query.id; + console.log(route.params.id); + if (route.params.id != '') { + user_id.value = route.params.id; } else { user_id.value = userStore.userInfo.id; }