From cdde5cef32f0f92d3272fd810033268b91e8f88f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Fri, 12 Apr 2024 14:43:54 +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/views/manage/Auditing/index.vue      | 10 +++++-----
 src/views/system/components/question.vue |  3 +++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/views/manage/Auditing/index.vue b/src/views/manage/Auditing/index.vue
index b53313e..caf2e1b 100644
--- a/src/views/manage/Auditing/index.vue
+++ b/src/views/manage/Auditing/index.vue
@@ -66,15 +66,15 @@
                     <el-descriptions-item label="手术名称">kooriookami</el-descriptions-item>
                 </el-descriptions>
                 <el-collapse v-model="activeNames">
-                    <el-collapse-item title="入院记录" name="1">
+                    <el-collapse-item title="入院记录" name="-1">
                         <div>与现实生活一致：与现实生活的流程、逻辑保持一致，遵循用户习惯的语言和概念；</div>
                         <div>在界面中一致：所有的元素和结构需保持一致，比如：设计样式、图标和文本、元素的位置等。</div>
                     </el-collapse-item>
-                    <el-collapse-item title="手术记录" name="2">
+                    <el-collapse-item title="手术记录" name="-2">
                         <div>用户决策：根据场景可给予用户操作建议或安全提示，但不能代替用户进行决策；</div>
                         <div>结果可控：用户可以自由的进行操作，包括撤销、回退和终止当前操作等。</div>
                     </el-collapse-item>
-                    <el-collapse-item title="出院记录" name="3">
+                    <el-collapse-item title="出院记录" name="-3">
                         <div>简化流程：设计简洁直观的操作流程；</div>
                         <div>清晰明确：语言表达清晰且表意明确，让用户快速理解进而作出决策；</div>
                         <div>帮助用户识别：界面简单直白，让用户快速识别而非回忆，减少用户记忆负担。</div>
@@ -83,7 +83,7 @@
             </div>
             <div class="cardright">
                 <el-collapse v-model="activeNames">
-                    <el-collapse-item title="入院记录" name="4">
+                    <el-collapse-item title="入院记录" name="4" v-for="">
                         <div>与现实生活一致：与现实生活的流程、逻辑保持一致，遵循用户习惯的语言和概念；</div>
                         <div>在界面中一致：所有的元素和结构需保持一致，比如：设计样式、图标和文本、元素的位置等。</div>
                     </el-collapse-item>
@@ -110,7 +110,7 @@ export default {
     name: "Auditing",
     data() {
         return {
-            activeNames: ['1', '2', '3'],
+            activeNames: ['-1', '-2', '-3'],
             list: {
                 visitMethod: "BE_IN_HOSPITAL",
             },
diff --git a/src/views/system/components/question.vue b/src/views/system/components/question.vue
index f84e328..8b4231d 100644
--- a/src/views/system/components/question.vue
+++ b/src/views/system/components/question.vue
@@ -103,6 +103,7 @@ export default {
                 diseaseTypeName: null,
                 questionnaireName: null,
                 questionnaireStatus: "PUBLISHED",
+                questionType: "REGULAR_QUESTIONNAIRE"
             },
             handleselectId: '',
             handleselectName: null,
@@ -169,6 +170,7 @@ export default {
             getDepartmentList({
                 departmentName: this.departmentName,
                 questionnaireStatus: "PUBLISHED",
+                questionType: "REGULAR_QUESTIONNAIRE",
             }).then(response => {
                 // response.data.forEach(e => {
                 //     e.label = e.departmentName
@@ -180,6 +182,7 @@ export default {
         getList() {
             this.loading = true;
             this.queryParams.questionnaireStatus = "PUBLISHED"
+            this.queryParams.questionType = "REGULAR_QUESTIONNAIRE"
             listQuestion(this.queryParams).then(response => {
                 this.questionList = response.rows;
                 this.total = response.total;