diff --git a/src/components/360View/medicalRecord/callMedical/index.vue b/src/components/360View/medicalRecord/callMedical/index.vue index 3591ac6..ee338d8 100644 --- a/src/components/360View/medicalRecord/callMedical/index.vue +++ b/src/components/360View/medicalRecord/callMedical/index.vue @@ -83,7 +83,7 @@ export default { }, watch: { typeName(val) { - if (val === '门诊病历' && !this.formList.length && !this.onlyRead) { + if (val === '门诊病历' && !this.formList.length) { this.getFormList() } } @@ -176,7 +176,7 @@ export default { const first = this.formList[0] this.setForm(0, first) } else { - if (this.isSearch === '1') { + if (this.isSearch === '1' && !this.onlyRead) { this.addRecord('门急诊电子病历') } } diff --git a/src/components/360View/medicalRecord/outPatientRecord/index.vue b/src/components/360View/medicalRecord/outPatientRecord/index.vue index 26dfe0e..1b56cfd 100644 --- a/src/components/360View/medicalRecord/outPatientRecord/index.vue +++ b/src/components/360View/medicalRecord/outPatientRecord/index.vue @@ -9,7 +9,7 @@ - + diff --git a/src/components/bread-crumb/index.vue b/src/components/bread-crumb/index.vue index cd483c5..a6d05fb 100644 --- a/src/components/bread-crumb/index.vue +++ b/src/components/bread-crumb/index.vue @@ -49,7 +49,7 @@ export default { breadcrumbClick(item) { console.log(item) if (item.meta.title === '首页') { - this.$store.commit('activeIndexFun', window.SITE_CONFIG.menuList[0].id) + this.$store.commit('activeIndexFun', window.SITE_CONFIG.menuList[0].children[0].id) } } } diff --git a/src/page-subspecialty/views/main-navbar.vue b/src/page-subspecialty/views/main-navbar.vue index 33a2904..e2c27d4 100644 --- a/src/page-subspecialty/views/main-navbar.vue +++ b/src/page-subspecialty/views/main-navbar.vue @@ -92,8 +92,9 @@ export default { }, methods: { logoClick() { - this.$store.commit('activeIndexFun', window.SITE_CONFIG.menuList[0].id) - this.$router.push({ name: 'patientManagement' }) + console.log(window.SITE_CONFIG.menuList) + this.$store.commit('activeIndexFun', window.SITE_CONFIG.menuList[0].children[0].id) + this.$router.push({ name: 'outpatientManagement-call' }) }, myNoticeRouter() { this.$router.replace('') @@ -143,7 +144,7 @@ export default { clearLoginInfo() resetRouter() this.$router.push({ name: 'login' }) - // location.reload() + this.$store.commit('activeIndexFun', window.SITE_CONFIG.menuList[0].children[0].id) }).catch(() => {}) }).catch(() => {}) } diff --git a/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue b/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue index 6218260..068945a 100644 --- a/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue +++ b/src/page-subspecialty/views/modules/outpatientManagement/call/index.vue @@ -40,7 +40,7 @@ :value="item.value" /> - {{ item.label }} + {{ item.label }}
新增 @@ -205,7 +205,7 @@ export default { }, { value: '300', label: '未诊' - },{ + }, { value: '400', label: '已诊' }],