Merge branch 'dev' of https://inno.sh-sict.com/gitlab/qq5616657/agcs2.0-web into dev

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
 

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
     },

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>

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++) {

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()

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() {

src/views/followupquery/index.vue

@@ -295,6 +295,11 @@ export default {
       currentRow: {},
     }
   },
+  computed: {
+    checkStatus() {
+      return this.$route.query.checkStatus || ""
+    },
+  },
   watch: {
     pageSize(val) {
       sessionStorage.setItem("followQuery-pageSize", val)
@@ -303,6 +308,11 @@ export default {
     pageIndex(val) {
       sessionStorage.setItem("followQuery-pageIndex", val)
     },
+    checkStatus(val) {
+      if (val) {
+        this.handleSearch()
+      }
+    },
   },
   created() {
     this.initSearchForm()
@@ -397,7 +407,9 @@ export default {
     },
     async handleSearch(form = {}) {
       this.listLoading = true
-
+      if (this.checkStatus) {
+        this.$refs.form.form.checkStatus = this.checkStatus
+      }
       let params = {
         pageSize: this.pageSize,
         pageNum: this.pageIndex,
@@ -424,6 +436,7 @@ export default {
         this.total = d.total
         this.tableData = d["records"]
       }
+      this.$router.push({ query: {} })
       this.listLoading = false
     },
     //查询表单枚举值字典