From fbd99dc5085f53d9aacf55bdd1047179768fb8e8 Mon Sep 17 00:00:00 2001
From: miaojiale <1123971748@qq.com>
Date: Wed, 29 Mar 2023 17:38:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Home/index.vue                   |  1 +
 src/views/audit-qualitycontrol/index.vue   | 15 ++++++++++++---
 src/views/followupquery/index.vue          | 11 +++++++++--
 src/views/followupresearch/index.vue       |  2 +-
 src/views/screening/components/FormTab.vue | 10 +++++-----
 5 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/views/Home/index.vue b/src/views/Home/index.vue
index 4ac54a6..107dfa9 100644
--- a/src/views/Home/index.vue
+++ b/src/views/Home/index.vue
@@ -322,6 +322,7 @@ export default {
         size: 10,
         current: 1,
         moduleType: moduleType,
+        status: 1,
       }
       articleList(params)
         .then((res) => {
diff --git a/src/views/audit-qualitycontrol/index.vue b/src/views/audit-qualitycontrol/index.vue
index 2144125..c890677 100644
--- a/src/views/audit-qualitycontrol/index.vue
+++ b/src/views/audit-qualitycontrol/index.vue
@@ -148,7 +148,13 @@ export default {
         {
           label: "风险评估",
           minWidth: 120,
-          value: "checkNums",
+          value: "riskRank",
+          formatter: (row) => {
+            return this.$handle.formatDicList(
+              this.dictMap["risk_level"],
+              String(row.riskRank)
+            )
+          },
         },
         {
           label: "审核状态",
@@ -190,6 +196,9 @@ export default {
       return this.auditStatus == "1" ? checkColumns : unCkeckColumns
     },
   },
+  created() {
+    console.log(this.dictMap)
+  },
   mounted() {
     if (
       sessionStorage.getItem("audit-status") ||
@@ -216,8 +225,8 @@ export default {
         this.$router.push({
           path: "/followaudit",
           query: {
-            unionId: data['unionId'],
-            unionName:data['unionName']
+            unionId: data["unionId"],
+            unionName: data["unionName"],
           },
         })
       } else {
diff --git a/src/views/followupquery/index.vue b/src/views/followupquery/index.vue
index 6976a14..be7f944 100644
--- a/src/views/followupquery/index.vue
+++ b/src/views/followupquery/index.vue
@@ -3,6 +3,7 @@
   <div class="screeningSearch">
     <div class="top">
       <form-components
+        ref="form"
         :forms="formList"
         :form-edit="formEdit"
         @handleSearch="onSearch"
@@ -93,7 +94,7 @@ export default {
           minWidth: 180,
           value: "screeningTime",
           formatter: (row) => {
-            return row.createTime ? row.createTime : "--"
+            return row.screeningTime ? row.screeningTime : "--"
           },
         },
         {
@@ -237,7 +238,7 @@ export default {
               },
               btnText: "查询",
               func: () => {
-                this.onSearch()
+                this.onClickSearch()
               },
             },
             // {
@@ -321,16 +322,22 @@ export default {
       })
     },
     onSearch(form) {
+      console.log(form)
       sessionStorage.setItem("followQuery-form", JSON.stringify(form))
       this.formEdit = form
+      // this.handleSearch()
+    },
+    onClickSearch() {
       this.handleSearch()
     },
     async handleSearch() {
       this.listLoading = true
+      console.log(this.$refs.form.form)
       let params = {
         pageSize: this.pageSize,
         pageNum: this.pageIndex,
         formId: this.formId,
+        ...this.$refs.form.form,
         patientFrom: sessionStorage.getItem("selectedIndex"), //筛查场景
       }
       if (this.formEdit) {
diff --git a/src/views/followupresearch/index.vue b/src/views/followupresearch/index.vue
index 0240872..095d932 100644
--- a/src/views/followupresearch/index.vue
+++ b/src/views/followupresearch/index.vue
@@ -261,7 +261,7 @@ export default {
   },
   watch: {},
   created() {
-    // this.initColumn()
+    this.initSearchForm()
   },
   mounted() {
     this.handleSearch() //调试注释
diff --git a/src/views/screening/components/FormTab.vue b/src/views/screening/components/FormTab.vue
index 72925eb..34b4e45 100644
--- a/src/views/screening/components/FormTab.vue
+++ b/src/views/screening/components/FormTab.vue
@@ -198,9 +198,9 @@ export default {
           data[key] = data[key] + ""
         }
       }
-      data.follow_contents = JSON.parse(
-        data.follow_contents.replace(/"\"/g, "")
-      )
+      // data.follow_contents = JSON.parse(
+      //   data.follow_contents.replace(/"\"/g, "")
+      // )
       this.formData.formEdit = data
     }
     this.initForm() //! 随防筛查通用的设置form
@@ -269,7 +269,7 @@ export default {
         data,
         formId: this.form.formId, // 每个大表单的id
         patientId: this.patientId || this.patientStandbyId,
-        // formRecordId: this.formData.formRecordId || this.newformRecordId, // 是否为编辑的表单id
+        formRecordId: this.formData.formRecordId || this.newformRecordId, // 是否为编辑的表单id
         statusMap: {
           patient_from: this.$store.getters["table/selectedIndex"],
           is_draft: 1, //是否为草稿
@@ -292,7 +292,7 @@ export default {
         data,
         formId: this.form.formId, // 每个大表单的id
         patientId: this.patientId || this.patientStandbyId,
-        // formRecordId: this.formData.formRecordId || this.newformRecordId, // 是否为编辑的表单id
+        formRecordId: this.formData.formRecordId || this.newformRecordId, // 是否为编辑的表单id
         statusMap: {
           patient_from: this.$store.getters["table/selectedIndex"],
           is_draft: this.activeName == "index5" ? 0 : 1, //是否为草稿
-- 
2.22.0