From ecc31679c9b599506e8c999b4d2f96f3bdf4d946 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Mon, 1 Jul 2024 14:09:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/tagsView.js | 12 ++--- src/views/manage/patientInfo/index.vue | 1 + src/views/manage/preHospitalized/index.vue | 7 +-- src/views/manage/signRecord/index.vue | 12 +++-- src/views/manage/visitin/index.vue | 10 +--- src/views/manage/visitout/index.vue | 1 + src/views/system/followup/index.vue | 62 +++++----------------- 7 files changed, 32 insertions(+), 73 deletions(-) diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js index 418a63f..5a196c3 100644 --- a/src/store/modules/tagsView.js +++ b/src/store/modules/tagsView.js @@ -113,13 +113,13 @@ const actions = { delView({ dispatch, state }, view) { if (view.fullPath == '/task/manualReview') { - localStorage.removeItem('routeCheckStatus') + localStorage.removeItem('manualReviewquery') } if (view.fullPath == "/patient/signRecord") { - localStorage.removeItem('serviceStatus') + localStorage.removeItem('signRecordquery') } if (view.fullPath == "/task/followup") { - localStorage.removeItem('nodeExecuteStatus') + localStorage.removeItem('followupquery') } return new Promise(resolve => { dispatch('delVisitedView', view) @@ -145,13 +145,13 @@ const actions = { delOthersViews({ dispatch, state }, view) { if (view.fullPath != '/task/manualReview') { - localStorage.removeItem('routeCheckStatus') + localStorage.removeItem('manualReviewquery') } if (view.fullPath != "/patient/signRecord") { - localStorage.removeItem('serviceStatus') + localStorage.removeItem('signRecordquery') } if (view.fullPath != "/task/followup") { - localStorage.removeItem('nodeExecuteStatus') + localStorage.removeItem('followupquery') } return new Promise(resolve => { dispatch('delOthersVisitedViews', view) diff --git a/src/views/manage/patientInfo/index.vue b/src/views/manage/patientInfo/index.vue index 9b4bbc2..79d0fe2 100644 --- a/src/views/manage/patientInfo/index.vue +++ b/src/views/manage/patientInfo/index.vue @@ -273,6 +273,7 @@ export default { this.$router.push({ path: "/patient/Portraitedit", query: { + path: '/patient/patientInfo', patientId: row.id, cardNo: row.cardNo, patientName: row.patientName, diff --git a/src/views/manage/preHospitalized/index.vue b/src/views/manage/preHospitalized/index.vue index 8a28fbe..4ff09a1 100644 --- a/src/views/manage/preHospitalized/index.vue +++ b/src/views/manage/preHospitalized/index.vue @@ -633,10 +633,10 @@ export default { }, /** 详情操作 */ handleAuthRole(row) { - console.log(getAge(row.birthDate)) this.$router.push({ path: "/patient/patientdetails", query: { + path: '/patient/preHospitalized', patientId: row.patientId, cardNo: row.cardNo, patientName: row.patientName, @@ -652,7 +652,6 @@ export default { }); }, handleHospital(row) { - console.log(row, 'row') this.resetHospital() this.openHospital = true if (row.hospitalAgencyId) { @@ -869,7 +868,6 @@ export default { // if (this.formHospital.attendingPhysicianId && this.form_attendingPhysicianlist?.length > 0) { // this.formHospital.attendingPhysicianName = this.form_attendingPhysicianlist.find(e => e.userId == this.formHospital.attendingPhysicianId)?.nickName // } - console.log(this.formHospital, '888888888') // return this.$refs["formHospital"].validate(valid => { if (valid) { @@ -979,7 +977,6 @@ export default { }, //选中医院获取院区 changehospitalAgency(id, type, typetwo) { - console.log(id, type, typetwo) this.getAgencyListinfo('HOSPITAL', id, type) // let query = { // agencyStatus: 'ON', @@ -987,8 +984,6 @@ export default { // parentId: id, // } // selectAgencyList(query).then(res => { - - console.log(this.formHospital) if (type) { if (!typetwo) { this.formHospital.campusAgencyId = null diff --git a/src/views/manage/signRecord/index.vue b/src/views/manage/signRecord/index.vue index f561ad4..43015c9 100644 --- a/src/views/manage/signRecord/index.vue +++ b/src/views/manage/signRecord/index.vue @@ -355,8 +355,8 @@ export default { }; }, created() { - if (localStorage.getItem('serviceStatus')) { - this.queryParams.serviceStatus = localStorage.getItem('serviceStatus') + if (localStorage.getItem('signRecordquery')) { + this.queryParams = JSON.parse(localStorage.getItem('signRecordquery')) } this.selectAgencyinfo(); }, @@ -374,6 +374,7 @@ export default { this.loading = true; this.signRecordList = [] listSignRecord(this.queryParams).then(response => { + localStorage.setItem('signRecordquery', JSON.stringify(this.queryParams)) this.signRecordList = response.rows; this.total = response.total; this.loading = false; @@ -480,11 +481,11 @@ export default { //手动创建任务 addTask() { if (this.addTaskitem) { - localStorage.setItem('serviceStatus', this.queryParams.serviceStatus) // this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => { this.$router.push({ path: "/patient/ManuallyCreatingTasks", query: { + path: "/patient/signRecord", signPatientRecordId: this.addTaskitem.id, patientId: this.addTaskitem.patientId, patientName: this.addTaskitem.patientName, @@ -542,7 +543,6 @@ export default { }, `signRecord_${new Date().getTime()}.xlsx`) }, handleClick(tab, event) { - localStorage.setItem('serviceStatus', this.queryParams.serviceStatus) this.intentionalTime = [] this.queryParams.intentionalTimeStart = null this.queryParams.intentionalTimeEnd = null @@ -557,6 +557,7 @@ export default { this.$router.replace({ path: "/patient/newSigning", query: { + path: "/patient/signRecord", departmentId: row.departmentId, patientName: row.patientName, patientPhone: row.patientPhone, @@ -674,6 +675,7 @@ export default { this.$router.replace({ path: "/patient/continueSigning", query: { + path: "/patient/signRecord", hospitalAgencyId: row.hospitalAgencyId, hospitalAgencyName: row.hospitalAgencyName, patientSignRecordId: row.id, @@ -686,6 +688,7 @@ export default { this.$router.push({ path: "/patient/patientdetails", query: { + path: "/patient/signRecord", patientId: row.patientId, cardNo: row.cardNo, patientName: row.patientName, @@ -705,6 +708,7 @@ export default { this.$router.push({ path: "/patient/Datadetails", query: { + path: "/patient/signRecord", patientId: row.patientId, cardNo: row.cardNo, patientName: row.patientName, diff --git a/src/views/manage/visitin/index.vue b/src/views/manage/visitin/index.vue index 878f44e..edaab93 100644 --- a/src/views/manage/visitin/index.vue +++ b/src/views/manage/visitin/index.vue @@ -675,6 +675,7 @@ export default { this.$router.push({ path: "/patient/patientdetails", query: { + path: "/patient/visitin", patientId: row.id, cardNo: row.cardNo, patientName: row.patientName, @@ -695,8 +696,6 @@ export default { const id = row.patientVisitRecordId || this.patientVisitRecordIds getPatientInfo(id).then(response => { this.form = response.data; - console.log(response.data, 'response.data') - if (this.form.hospitalAgencyId) { this.changehospitalAgency(this.form.hospitalAgencyId, 1, 2) } @@ -721,16 +720,12 @@ export default { this.changehospitalAgency(this.formHospital.hospitalAgencyId, 1, 2) } if (this.formHospital.campusAgencyId) { - this.changecampusAgency(this.formHospital.campusAgencyId, 1, 2) } if (this.formHospital.departmentId) { - this.changedepartment(this.formHospital.departmentId, 1, 2) } - console.log(this.formHospital, 'this.formHospital') this.openHospital = true - // this.title = "修改患者信息"; }); @@ -739,7 +734,6 @@ export default { getList() { this.loading = true; this.queryParams.patientType = 'IN_HOSPITAL_PATIENT' - console.log(this.queryParams) listPatientInfo(this.queryParams).then(response => { response.rows.forEach(e => { e.birthDate ? e.age = getAge(e.birthDate) : '' @@ -895,7 +889,6 @@ export default { if (this.formHospital.wardId && this.form_wardlist?.length > 0) { this.formHospital.wardName = this.form_wardlist.find(e => e.id == this.formHospital.wardId)?.departmentName } - console.log(this.formHospital, '888888888') // return this.$refs["formHospital"].validate(valid => { if (valid) { @@ -1025,7 +1018,6 @@ export default { }, //选中医院获取院区 changehospitalAgency(id, type, typetwo) { - console.log(id, type, typetwo) this.getAgencyListinfo('HOSPITAL', id, type) // let query = { // agencyStatus: 'ON', diff --git a/src/views/manage/visitout/index.vue b/src/views/manage/visitout/index.vue index 14d5112..2fa1f90 100644 --- a/src/views/manage/visitout/index.vue +++ b/src/views/manage/visitout/index.vue @@ -669,6 +669,7 @@ export default { this.$router.push({ path: "/patient/patientdetails", query: { + path: "/patient/visitout", patientId: row.id, cardNo: row.cardNo, patientName: row.patientName, diff --git a/src/views/system/followup/index.vue b/src/views/system/followup/index.vue index df686df..1cfb393 100644 --- a/src/views/system/followup/index.vue +++ b/src/views/system/followup/index.vue @@ -18,7 +18,6 @@ - @@ -50,25 +49,17 @@ - - - @@ -78,7 +69,6 @@ - @@ -87,7 +77,6 @@ - 搜索 重置 @@ -110,7 +99,6 @@ - - - -