From a042f90c17dc3e9e40b2e1ce12559ef413b1e2ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Fri, 12 Jul 2024 10:50:31 +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/layout/index.vue | 1 + src/store/modules/tagsView.js | 6 + src/views/components/DepartmentList.vue | 19 +- src/views/system/question/index.vue | 256 ++++++------------------ 4 files changed, 77 insertions(+), 205 deletions(-) diff --git a/src/layout/index.vue b/src/layout/index.vue index 3466cbd..683516d 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -55,6 +55,7 @@ export default { } }, created() { + localStorage.removeItem('questionquery') localStorage.removeItem('manualReviewquery') localStorage.removeItem('signRecordquery') localStorage.removeItem('followupquery') diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js index 5a196c3..838b931 100644 --- a/src/store/modules/tagsView.js +++ b/src/store/modules/tagsView.js @@ -112,6 +112,9 @@ const actions = { }, delView({ dispatch, state }, view) { + if (view.fullPath == "/knowledge/question") { + localStorage.removeItem('questionquery') + } if (view.fullPath == '/task/manualReview') { localStorage.removeItem('manualReviewquery') } @@ -144,6 +147,9 @@ const actions = { }, delOthersViews({ dispatch, state }, view) { + if (view.fullPath == "/knowledge/question") { + localStorage.removeItem('questionquery') + } if (view.fullPath != '/task/manualReview') { localStorage.removeItem('manualReviewquery') } diff --git a/src/views/components/DepartmentList.vue b/src/views/components/DepartmentList.vue index cb8b437..98f7a07 100644 --- a/src/views/components/DepartmentList.vue +++ b/src/views/components/DepartmentList.vue @@ -79,6 +79,7 @@ export default { switchvalue: true, //校验 itemid: null, + departmentName: '', // 表格数据 DepartmentoList: [], count: '', @@ -236,12 +237,18 @@ export default { this.count += item.countNum; } }); - this.$emit("clickdepartment", { - hospitalAgencyId: this.querydepartmen.hospitalAgencyId, - itemid: this.itemid, - itemName: this.departmentName, - hospitalAgencyName: this.hospitalAgencyName - }); + if (localStorage.getItem('questionquery')) { + this.itemid = JSON.parse(localStorage.getItem('questionquery')).departmentId + this.departmentName = JSON.parse(localStorage.getItem('questionquery')).departmentName + } + if (this.methods != 'getDepartmentList') { + this.$emit("clickdepartment", { + hospitalAgencyId: this.querydepartmen.hospitalAgencyId, + itemid: this.itemid, + itemName: this.departmentName, + hospitalAgencyName: this.hospitalAgencyName + }); + } } }); }, diff --git a/src/views/system/question/index.vue b/src/views/system/question/index.vue index c36c774..aae9330 100644 --- a/src/views/system/question/index.vue +++ b/src/views/system/question/index.vue @@ -3,256 +3,105 @@ - +
- + - + - + - 搜索 - 重置 + 搜索 + 重置
- 新增问卷模板 - 导入 + 新增问卷模板 + 导入
- - - - - - + + + + + + - + - - + +
- + - - + + - - + + - - + +
- 确 定 + 确 定 取 消
- +
确 定 @@ -317,7 +166,12 @@ export default { }; }, created() { - // this.getList(); + if (localStorage.getItem('questionquery')) { + this.queryParams = JSON.parse(localStorage.getItem('questionquery')) + } else { + this.queryParams.hospitalAgencyId = JSON.parse(localStorage.getItem('user')).hospitalAgencyId + } + this.getList(); }, mounted() { this.getMaxTableHeight() @@ -351,7 +205,6 @@ export default { } } else { this.$modal.msgError("请先选择左侧科室"); - } }, // 弹框取消 @@ -363,6 +216,7 @@ export default { this.queryParams.hospitalAgencyId = item.hospitalAgencyId this.queryParams.hospitalAgencyName = item.hospitalAgencyName this.queryParams.departmentId = item.itemid + this.queryParams.departmentName = item.itemName this.departmentName = item.itemName if (item.hospitalAgencyId) { this.handleQuery(); @@ -469,6 +323,8 @@ export default { /** 查询问卷基本信息列表 */ getList() { this.loading = true; + console.log(this.queryParams) + localStorage.setItem('questionquery', JSON.stringify(this.queryParams)) listQuestion(this.queryParams).then(response => { this.questionList = response.rows; this.total = response.total; @@ -606,10 +462,12 @@ export default { .app-container { padding: 20px 0 0 20px !important; } - ::v-deep .el-dialog__footer{ - padding-top: 33px !important; - } +::v-deep .el-dialog__footer { + padding-top: 33px !important; + +} + ::v-deep .el-row { height: 100% !important; } From 979fdbeef50ce56f92f191b9e3a0c5e16d7d61ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com> Date: Fri, 12 Jul 2024 10:53:21 +0800 Subject: [PATCH 2/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/views/manage/components/PathReview.vue | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/views/manage/components/PathReview.vue b/src/views/manage/components/PathReview.vue index 6b271fe..9ff47c1 100644 --- a/src/views/manage/components/PathReview.vue +++ b/src/views/manage/components/PathReview.vue @@ -286,14 +286,6 @@
文字提醒
-
- {{ item.textRemindContent }} -
-
-
-
- 内容 -