From 34a21daaedfd40c2cddaf33d8e95e2ebf953db77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Mon, 1 Jul 2024 14:27:29 +0800 Subject: [PATCH] =?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/layout/components/TagsView/index.vue | 35 +-- src/layout/index.vue | 5 + src/views/manage/manualReview/index.vue | 2 + .../system/editorialSpecialization/index.vue | 218 +++++------------- .../system/specialDiseaseRoute/index.vue | 23 +- src/views/system/taskExecuteRecord/index.vue | 1 + 6 files changed, 95 insertions(+), 189 deletions(-) diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue index 451438e..30162dc 100644 --- a/src/layout/components/TagsView/index.vue +++ b/src/layout/components/TagsView/index.vue @@ -146,22 +146,29 @@ export default { refreshSelectedTag(view) { this.$tab.refreshPage(view); }, + closepage(view) { + this.$tab.closePage(view).then(({ visitedViews }) => { + if (this.isActive(view)) { + this.toLastView(visitedViews, view) + } + }) + }, closeSelectedTag(view) { - let url = view.fullPath.split('?')[1] - let urls = new URLSearchParams('?' + url) - let path = urls.get('path') - if (path) { - this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => { - this.$router.push({ - path: path - }); - }) + if (this.$route.path != view.path) { + this.closepage(view); } else { - this.$tab.closePage(view).then(({ visitedViews }) => { - if (this.isActive(view)) { - this.toLastView(visitedViews, view) - } - }) + let url = view.fullPath.split('?')[1] + let urls = new URLSearchParams('?' + url) + let path = urls.get('path') + if (path) { + this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => { + this.$router.push({ + path: path + }); + }) + } else { + this.closepage(view); + } } }, closeRightTags() { diff --git a/src/layout/index.vue b/src/layout/index.vue index 87a4d17..3466cbd 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -54,6 +54,11 @@ export default { return variables; } }, + created() { + localStorage.removeItem('manualReviewquery') + localStorage.removeItem('signRecordquery') + localStorage.removeItem('followupquery') + }, methods: { handleClickOutside() { this.$store.dispatch('app/closeSideBar', { withoutAnimation: false }) diff --git a/src/views/manage/manualReview/index.vue b/src/views/manage/manualReview/index.vue index 2dff749..99498e4 100644 --- a/src/views/manage/manualReview/index.vue +++ b/src/views/manage/manualReview/index.vue @@ -228,6 +228,7 @@ export default { this.$router.push({ path: "/task/LookAuditing", query: { + path: "/task/manualReview", patientId: row.patientId, signRecordId: row.id, routeCheckStatus: this.queryParams.routeCheckStatus, @@ -239,6 +240,7 @@ export default { this.$router.push({ path: "/task/Auditing", query: { + path: "/task/manualReview", patientId: row.patientId, signRecordId: row.id, routeCheckStatus: row.routeCheckStatus diff --git a/src/views/system/editorialSpecialization/index.vue b/src/views/system/editorialSpecialization/index.vue index 1108b15..cc44fca 100644 --- a/src/views/system/editorialSpecialization/index.vue +++ b/src/views/system/editorialSpecialization/index.vue @@ -8,13 +8,7 @@ - + @@ -29,29 +23,13 @@ - 人工添加触发条件 + 人工添加触发条件 - - + + @@ -63,11 +41,7 @@
审核进度 - + {{ list.agreeNumber + " / " + list.totalNumber }}
@@ -77,10 +51,10 @@ {{ list.suitRange == "DISCHARGE" ? "出院" : "" }} {{ list.suitRange == "OUTPATIENT_SERVICE" ? "门诊" : "" }} {{ - list.suitRange == "OUTPATIENT_SERVICE_DISCHARGE" - ? "门诊+出院" - : "" - }} + list.suitRange == "OUTPATIENT_SERVICE_DISCHARGE" + ? "门诊+出院" + : "" + }}
@@ -88,11 +62,7 @@
-
+
触发条件 @@ -125,11 +95,7 @@
审核进度 - + {{ uitem.agreeNumber + " / " + uitem.totalNumber }}
@@ -139,10 +105,10 @@ {{ uitem.suitRange == "DISCHARGE" ? "出院" : "" }} {{ uitem.suitRange == "OUTPATIENT_SERVICE" ? "门诊" : "" }} {{ - uitem.suitRange == "OUTPATIENT_SERVICE_DISCHARGE" - ? "门诊+出院" - : "" - }} + uitem.suitRange == "OUTPATIENT_SERVICE_DISCHARGE" + ? "门诊+出院" + : "" + }}
@@ -153,127 +119,57 @@
- + - - + + -
-
+
+
- - + +
- - + + - - + + - - + + - - + + - + - + - 添加属性 + 添加属性
@@ -499,7 +389,7 @@ export default { this.$forceUpdate(); }); }, - changeoptions() {}, + changeoptions() { }, // 且或 changetriggerLogicsname(e, index) { this.updata.triggerConditionList[index].triggerLogic = e; @@ -766,13 +656,11 @@ export default { }); }, back() { - this.$store - .dispatch("tagsView/delView", this.$route) - .then(({ visitedViews }) => { - this.$router.push({ - path: "/specialdisease/specialDiseaseRoute", - }); + this.$store.dispatch("tagsView/delView", this.$route).then(({ visitedViews }) => { + this.$router.push({ + path: "/specialdisease/specialDiseaseRoute", }); + }); }, }, }; @@ -793,6 +681,7 @@ export default { // left: 2%; top: -75%; } + // } .icon { // right: -20px; @@ -808,6 +697,7 @@ export default { // } } + .container { padding: 20px; overflow-y: scroll; diff --git a/src/views/system/specialDiseaseRoute/index.vue b/src/views/system/specialDiseaseRoute/index.vue index 2e44a18..51edad2 100644 --- a/src/views/system/specialDiseaseRoute/index.vue +++ b/src/views/system/specialDiseaseRoute/index.vue @@ -395,17 +395,18 @@ export default { // this.open = true; // this.title = "修改专病路径信息"; // }); - this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => { - this.$router.push({ - path: "/specialdisease/editorialSpecialization", - query: { - id: row.id, - diseaseTypeName: row.diseaseTypeName, - version: row.version, - routeName: row.routeName, - } - }); - }) + // this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => { + this.$router.push({ + path: "/specialdisease/editorialSpecialization", + query: { + path: "/specialdisease/specialDiseaseRoute", + id: row.id, + diseaseTypeName: row.diseaseTypeName, + version: row.version, + routeName: row.routeName, + } + }); + // }) }, /** 提交按钮 */ submitForm() { diff --git a/src/views/system/taskExecuteRecord/index.vue b/src/views/system/taskExecuteRecord/index.vue index 3ccb88a..7b4e528 100644 --- a/src/views/system/taskExecuteRecord/index.vue +++ b/src/views/system/taskExecuteRecord/index.vue @@ -330,6 +330,7 @@ export default { this.$router.push({ path: "/task/record", query: { + path: "/task/taskExecuteRecord", patientId: row.id, manageRouteNodeId: row.manageRouteNodeId, taskContent: row.taskContent,