From 2495a7619ce5a46c0651d95b1e4983e1da2ffea9 Mon Sep 17 00:00:00 2001
From: miaojiale <1123971748@qq.com>
Date: Mon, 8 May 2023 15:19:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/config/upload.vue                        |  2 +-
 .../FormComponents/CustomForm/FormContent.vue     |  4 ++++
 .../FormComponents/CustomForm/FormItemSelf.vue    |  5 +++++
 .../FormComponents/CustomForm/index.vue           |  7 +++++++
 src/components/Upload/index.vue                   |  2 ++
 src/layouts/components/NavBar/index.vue           |  2 ++
 src/views/followupquery/index.vue                 | 15 ++++++++++++++-
 7 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/packages/config/upload.vue b/packages/config/upload.vue
index bf1e264..20ed51a 100644
--- a/packages/config/upload.vue
+++ b/packages/config/upload.vue
@@ -266,7 +266,7 @@ export default {
       if (val)
         this.validator.required = {
           required: true,
-          message: `${this.data.label}必须填写`,
+          message: `请上传${this.data.label}`,
         }
       else this.validator.required = null
 
diff --git a/src/components/FormComponents/CustomForm/FormContent.vue b/src/components/FormComponents/CustomForm/FormContent.vue
index 365d753..8942852 100644
--- a/src/components/FormComponents/CustomForm/FormContent.vue
+++ b/src/components/FormComponents/CustomForm/FormContent.vue
@@ -120,6 +120,7 @@
           :group="options.group"
           @formChange="formChange"
           @validateForm="validateForm"
+          @validUpload="validUpload"
         ></form-item-self>
       </el-col>
     </template>
@@ -190,6 +191,9 @@ export default {
     validateForm() {
       this.$emit("validateForm")
     },
+    validUpload(prop) {
+      this.$emit("validUpload", prop)
+    },
     handleChange(key, val) {
       if (this.form.hasOwnProperty(key)) this.form[key] = val
     },
diff --git a/src/components/FormComponents/CustomForm/FormItemSelf.vue b/src/components/FormComponents/CustomForm/FormItemSelf.vue
index e835546..9fce480 100644
--- a/src/components/FormComponents/CustomForm/FormItemSelf.vue
+++ b/src/components/FormComponents/CustomForm/FormItemSelf.vue
@@ -42,11 +42,13 @@
               v-model="form[item.prop]"
               :btn-type="'text'"
               v-bind="item"
+              :prop="item.prop"
               :list-type="item.listType"
               :upload-query="{ formId, patientId, prefix: item.prop }"
               :accept="item.accept"
               :limit="item.limit"
               :disabled="item.disabled"
+              @validUpload="validUpload"
             ></el-upload-self>
             <!-- 表单改文本 -->
             <template v-else-if="getVwForm.detail">
@@ -963,6 +965,9 @@ export default {
       this.$emit("formChange")
       // ['is_one_year','is_subtotal_history','is_ppi','is_symptom','is_subtotal_history','is_disease','is_tumour']
     },
+    validUpload(prop) {
+      this.$emit("validUpload", prop)
+    },
   },
 }
 </script>
diff --git a/src/components/FormComponents/CustomForm/index.vue b/src/components/FormComponents/CustomForm/index.vue
index d11d959..4fe236b 100644
--- a/src/components/FormComponents/CustomForm/index.vue
+++ b/src/components/FormComponents/CustomForm/index.vue
@@ -64,6 +64,7 @@
               :is-show-important="isShowImportant"
               @showError="showError"
               @validateForm="validateForm"
+              @validUpload="validUpload"
             ></form-content>
           </el-collapse-item>
         </template>
@@ -214,6 +215,12 @@ export default {
         })
       }
     },
+    validUpload(prop) {
+      console.log(prop, this.form)
+      this.$refs.form.validateField(prop, (valid) => {
+        console.log(valid)
+      })
+    },
     clearAge() {
       // 去除年龄文本
       for (let i = 0; i < this.$refs.formContent.length; i++) {
diff --git a/src/components/Upload/index.vue b/src/components/Upload/index.vue
index 64b8c02..987f9d9 100644
--- a/src/components/Upload/index.vue
+++ b/src/components/Upload/index.vue
@@ -60,6 +60,7 @@ export default {
       type: Boolean,
       default: false,
     },
+    prop: {},
     uploadQuery: {
       type: Object,
       default: () => {
@@ -174,6 +175,7 @@ export default {
       const { data } = res
       if (data) {
         this.value.push({ ...data })
+        this.$emit("validUpload", this.prop)
       } else {
         this.$message.warning(res.msg)
         this.$refs.upload.clearFiles()
diff --git a/src/layouts/components/NavBar/index.vue b/src/layouts/components/NavBar/index.vue
index 441814a..a2d5e9c 100644
--- a/src/layouts/components/NavBar/index.vue
+++ b/src/layouts/components/NavBar/index.vue
@@ -229,6 +229,8 @@ export default {
       })
       if (val == "screen") {
         this.$router.push("/screening/index?checkStatus=2")
+      } else if (val == "follow") {
+        this.$router.push("/followupquery?checkStatus=2")
       }
     },
     getMessage() {
diff --git a/src/views/followupquery/index.vue b/src/views/followupquery/index.vue
index 40dac6d..6e7f945 100644
--- a/src/views/followupquery/index.vue
+++ b/src/views/followupquery/index.vue
@@ -272,6 +272,11 @@ export default {
       currentRow: {},
     }
   },
+  computed: {
+    checkStatus() {
+      return this.$route.query.checkStatus || ""
+    },
+  },
   watch: {
     pageSize(val) {
       sessionStorage.setItem("followQuery-pageSize", val)
@@ -280,6 +285,11 @@ export default {
     pageIndex(val) {
       sessionStorage.setItem("followQuery-pageIndex", val)
     },
+    checkStatus(val) {
+      if (val) {
+        this.handleSearch()
+      }
+    },
   },
   created() {
     this.initSearchForm()
@@ -348,7 +358,9 @@ export default {
     },
     async handleSearch() {
       this.listLoading = true
-
+      if (this.checkStatus) {
+        this.$refs.form.form.checkStatus = this.checkStatus
+      }
       let params = {
         pageSize: this.pageSize,
         pageNum: this.pageIndex,
@@ -377,6 +389,7 @@ export default {
         this.total = d.total
         this.tableData = d["records"]
       }
+      this.$router.push({ query: {} })
       this.listLoading = false
     },
     //查询表单枚举值字典
-- 
2.22.0