From e5a13eed116694aaff9ee341a3f85a81add9aa84 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Fri, 21 Jul 2023 13:22:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=A1=B5=E9=87=8D?= =?UTF-8?q?=E7=BD=AE=E4=B8=BA1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/admin/sys-api/index.vue | 2 +- src/views/admin/sys-config/index.vue | 1 + src/views/admin/sys-post/index.vue | 1 + src/views/admin/sys-role/index.vue | 1 + src/views/admin/sys-user/index.vue | 7 ++++--- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/views/admin/sys-api/index.vue b/src/views/admin/sys-api/index.vue index 5ea3d6d..46889a6 100644 --- a/src/views/admin/sys-api/index.vue +++ b/src/views/admin/sys-api/index.vue @@ -178,8 +178,8 @@ const handleDrawerCancel = () => { // 查询 const handleQuery = async () => { + currentPage.value=1; getSysApiInfo(queryForm); - currentPage.value = 1; }; // 重置查询 diff --git a/src/views/admin/sys-config/index.vue b/src/views/admin/sys-config/index.vue index 5f6a8bf..0817fb6 100644 --- a/src/views/admin/sys-config/index.vue +++ b/src/views/admin/sys-config/index.vue @@ -157,6 +157,7 @@ function useQueryForm() { const queryForm = reactive({}); const handleQuery = () => { + currentPage.value=1; getSysConfigInfo(queryForm); }; diff --git a/src/views/admin/sys-post/index.vue b/src/views/admin/sys-post/index.vue index e1b595d..fce2647 100644 --- a/src/views/admin/sys-post/index.vue +++ b/src/views/admin/sys-post/index.vue @@ -242,6 +242,7 @@ const getPostInfo = async (params = {}) => { // 查询岗位信息 const handleQuery = async () => { + pager.page=1; const params = { page: pager.page, page_size: pager.page_size, diff --git a/src/views/admin/sys-role/index.vue b/src/views/admin/sys-role/index.vue index 25312de..0dcdb55 100644 --- a/src/views/admin/sys-role/index.vue +++ b/src/views/admin/sys-role/index.vue @@ -296,6 +296,7 @@ // 查询 const handleQuery = async () => { + pager.page=1; const res = await getRole({ ...pager, ...queryForm diff --git a/src/views/admin/sys-user/index.vue b/src/views/admin/sys-user/index.vue index 85d123d..6871a16 100644 --- a/src/views/admin/sys-user/index.vue +++ b/src/views/admin/sys-user/index.vue @@ -351,17 +351,18 @@ function useQueryData() { // 查询 const handleQuery = () => { - getSysUserInfo(queryForm); + pager.page=1; + getSysUserInfo({ ...pager, ...queryForm }); }; // 重置查询 const handleResetQuery = () => { - + pager.page=1; proxy.$refs.queryFormRef.resetFields(); treeRef_parent.value.resetTree(); queryForm.dept_id=''; queryForm.nick_name=''; - getSysUserInfo(queryForm); + getSysUserInfo({ ...pager, ...queryForm }); }; return { queryForm, handleQuery, handleResetQuery }; From 84892d810fcf207864a2b9870fc43ffedf4b6fa6 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Fri, 21 Jul 2023 14:08:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=93=B6=E8=A1=8Cid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/doctor/doctor-list/index.vue | 56 +++++++++++--------------- 1 file changed, 24 insertions(+), 32 deletions(-) diff --git a/src/views/doctor/doctor-list/index.vue b/src/views/doctor/doctor-list/index.vue index 20123ca..cecbad4 100644 --- a/src/views/doctor/doctor-list/index.vue +++ b/src/views/doctor/doctor-list/index.vue @@ -322,7 +322,7 @@ - 省 + 省 {{item.area_name}} @@ -918,10 +918,7 @@ modalForm.id_card_back = ''; modalForm.sign_image = ''; modalForm.doctor_bank_card = { - bank_card_province_id: '', - bank_card_city_id: '', - bank_card_county_id: '', - bank_id: '' + } //$refs.modalFormRef.resetFields(); }; @@ -959,25 +956,19 @@ handleDecryptBank(); if (data.doctor_bank_card && data.doctor_bank_card.province_id) { handelAreaList('', data.doctor_bank_card.province_id, 3); - } else { - modalForm.doctor_bank_card = { - province_id: '', - city_id: '', - county_id: '', - bank_id: '' - } - }; + } if (data.doctor_bank_card && data.doctor_bank_card.city_id) { handelAreaList('', data.doctor_bank_card.city_id, 4); } - if (!data.doctor_bank_card) { - modalForm.doctor_bank_card = { - province_id: '', - city_id: '', - county_id: '', - bank_id: '' - } - } + if(data.doctor_bank_card){ + let obj=data.doctor_bank_card; + for (const key in obj) { + if(obj[key]==0){ + modalForm.doctor_bank_card[key]='' + } + + } + } modalForm.cur_doctor_expertise = arr; } } @@ -1005,14 +996,15 @@ if (!data.hospital) { modalForm.hospital = {}; } - if (!data.doctor_bank_card) { - modalForm.doctor_bank_card = { - province_id: '', - city_id: '', - county_id: '', - bank_id: '' - } - }; + if(data.doctor_bank_card){ + let obj=data.doctor_bank_card; + for (const key in obj) { + if(obj[key]==0){ + modalForm.doctor_bank_card[key]='' + } + + } + } if(data.doctor_title==0){ modalForm.doctor_title=''; } @@ -1102,9 +1094,9 @@ is_platform_deep_cooperation: modalForm.is_platform_deep_cooperation, is_sys_diagno_cooperation: modalForm.is_sys_diagno_cooperation, bank_card_code: modalForm.bank_card_code, - bank_card_province_id: modalForm.doctor_bank_card.province_id, - bank_card_city_id: modalForm.doctor_bank_card.city_id, - bank_card_county_id: modalForm.doctor_bank_card.county_id, + bank_card_province_id: modalForm.doctor_bank_card.province_id?modalForm.doctor_bank_card.province_id:0, + bank_card_city_id: modalForm.doctor_bank_card.city_id?modalForm.doctor_bank_card.city_id:0, + bank_card_county_id: modalForm.doctor_bank_card.county_id?modalForm.doctor_bank_card.county_id:0, bank_id: modalForm.doctor_bank_card.bank_id } if (!modalForm.doctor_id) { From a1eefcbd15d0b0693b2a53d6e9c7493b6c922356 Mon Sep 17 00:00:00 2001 From: zoujiandong <10130823232@qq.com> Date: Fri, 21 Jul 2023 14:36:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89token=E8=BF=87=E6=9C=9F?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 5 +++++ src/utils/request.js | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 7f3b374..dc4e1a9 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -90,7 +90,12 @@ router.beforeEach(async(to, from, next) => { const menuList= permissionStore.menuList; next({ path: menuList[0].children[0].path }); } else { + if(to.path=="/" || to.path=="/admin"){ + const menuList= permissionStore.menuList; + next({ path: menuList[0].children[0].path }); + }else{ next(); + } } } diff --git a/src/utils/request.js b/src/utils/request.js index f53d54e..f1cc41f 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -42,11 +42,11 @@ service.interceptors.response.use( const { code, message } = response.data; console.log(code); if (code == 401 || code==403 || code==405 || code==406) { - Message.clear(); - Message.error({ - content: message, - duration: 3000 - }); + //Message.clear(); + // Message.error({ + // content: message, + // duration: 3000 + // }); // 重定向路由到登陆页面 store.clearInfo(); window.location.href="/login";