From 06e97ac315dae026458d46f7118234b6e2940162 Mon Sep 17 00:00:00 2001
From: miaojiale <1123971748@qq.com>
Date: Fri, 3 Feb 2023 14:20:59 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=A3=8E=E9=99=A9=E8=AF=84=E4=BC=B0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=9B=9E=E6=98=BE=202.=E5=A2=9E=E5=8A=A0=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E6=96=87=E6=9C=AC=E6=8F=90=E7=A4=BA=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/config/select.vue                    | 13 ++++++-
 .../CustomForm/FormItemText.vue               |  4 +-
 src/views/screening/DraftBox.vue              | 39 ++++++++++++++++++-
 .../screening/components/ConfigForms.vue      |  5 ++-
 src/views/screening/components/mixin.js       |  2 +-
 5 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/packages/config/select.vue b/packages/config/select.vue
index 28ca9fe..c1ba668 100644
--- a/packages/config/select.vue
+++ b/packages/config/select.vue
@@ -1,6 +1,5 @@
 <template>
   <div>
-
     <el-form-item v-if="data.type == 'select'" label="占位内容">
       <el-input
         v-model="data.placeholder"
@@ -235,6 +234,9 @@
     <el-form-item label="是否必填">
       <el-switch v-model="data.required"></el-switch>
     </el-form-item>
+    <el-form-item label="必填提示文本">
+      <el-input v-model="data.pattern"></el-input>
+    </el-form-item>
   </div>
 </template>
 
@@ -315,7 +317,16 @@ export default {
 
       this.generateRule()
     },
+    "data.pattern": function (val) {
+      if (val)
+        this.validator.required = {
+          required: true,
+          message: val,
+        }
+      else this.validator.required = null
 
+      this.generateRule()
+    },
   },
 }
 </script>
diff --git a/src/components/FormComponents/CustomForm/FormItemText.vue b/src/components/FormComponents/CustomForm/FormItemText.vue
index c93ffcc..23cc0fb 100644
--- a/src/components/FormComponents/CustomForm/FormItemText.vue
+++ b/src/components/FormComponents/CustomForm/FormItemText.vue
@@ -53,8 +53,8 @@ export default {
       },
       screeningAdvise: {
         1: "可定期随访",
-        2: "推荐胃镜精查",
-        3: "强烈推荐胃镜精查",
+        2: "推荐胶囊内镜或胃镜检查",
+        3: "强烈推荐胶囊内镜或胃镜检查",
       },
     }
   },
diff --git a/src/views/screening/DraftBox.vue b/src/views/screening/DraftBox.vue
index 2d0b51a..08e7ca8 100644
--- a/src/views/screening/DraftBox.vue
+++ b/src/views/screening/DraftBox.vue
@@ -21,6 +21,8 @@
 <script>
 import CustomsTable from "@/components/CustomsTable"
 import paginationMixin from "@/components/TabComponents/mixin"
+import { mapGetters } from "vuex"
+import { getPatientPage } from "@/api/patient.js"
 export default {
   // 数据概览
   name: "",
@@ -31,8 +33,6 @@ export default {
   data() {
     return {
       listLoading: false,
-      selectedIndex: sessionStorage.getItem("homeSelectedIndex") - 0 || 0,
-      headList: ["社区筛查", "医院筛查", "体检筛查"],
       columns: [
         {
           label: "医联体",
@@ -129,6 +129,41 @@ export default {
       this.selectedIndex = i
       sessionStorage.setItem("homeSelectedIndex", this.selectedIndex)
     },
+    // 查询
+    handleFormSearch(form) {
+      this.searchForm = form
+      this.pageIndex = 1
+      this.handleSearch(form)
+    },
+    handleSearch() {
+      this.listLoading = true
+      const data = {}
+      data.current = this.pageIndex
+      data.size = this.pageSize
+      data.isDraft = 1
+      data.patientFrom = this.selectedIndex
+      getPatientPage(data).then((res) => {
+        this.listLoading = false
+        if (res.code === 1) {
+          const d = res.data
+          this.tableData = d.records || []
+          this.total = Number(d.total)
+        }
+      })
+    },
+  },
+  computed: {
+    ...mapGetters({
+      selectedIndex: "table/selectedIndex",
+    }),
+  },
+  created() {
+    this.handleFormSearch()
+  },
+  watch: {
+    selectedIndex(v) {
+      this.handleFormSearch()
+    },
   },
 }
 </script>
diff --git a/src/views/screening/components/ConfigForms.vue b/src/views/screening/components/ConfigForms.vue
index 96a3df0..f17642c 100644
--- a/src/views/screening/components/ConfigForms.vue
+++ b/src/views/screening/components/ConfigForms.vue
@@ -145,10 +145,11 @@ export default {
           getPatientDetail({
             formId: this.formId, // 每个大表单的id
             patientId: this.patientId || this.patientStandbyId,
-            formRecordId: this.newformRecordId,
+            // formRecordId: this.newformRecordId,
           })
             .then((res) => {
-              console.log(res)
+              const data = res.data.data
+              this.formInitial = data
             })
             .finally(() => {
               this.loading = false
diff --git a/src/views/screening/components/mixin.js b/src/views/screening/components/mixin.js
index 8f11768..bc39898 100644
--- a/src/views/screening/components/mixin.js
+++ b/src/views/screening/components/mixin.js
@@ -27,7 +27,7 @@ export default {
     nextTab() {
       let i = this.activeName.split("index")[1] - 0
       i++
-      if (i == 5) {
+      if (i == 6) {
         return
       } else {
         this.activeName = "index" + i
-- 
2.22.0