diff --git a/packages/config/upload.vue b/packages/config/upload.vue index bf1e264e0d55ba15353e8b6fe783afea16e8254a..20ed51a754a2b2be9f5a638affa76a24c45a1d76 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 365d7535d2679b1d9582f1427be694de6b78fc67..8942852a5ed0596ee0658ca49453552ba8d387c6 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" > @@ -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 e8355468ae00128b04dabadfbbf9a88fd9fcfd2a..9fce4800cfb117153f35b96091dde592a385300b 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" > @@ -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 64b8c02c820b2bd91964e5d63bfc5b53101bf012..987f9d9896e6caea9dd688c0fed8fa2487c48175 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 441814ab8025c2e84ce5cb4e6d967644757d3eeb..a2d5e9c2bf378b4b883bb7a59340bdf7888081dd 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 40dac6d480cb8460ce964bc4a86258656c24c055..6e7f94527abf1fd66e0c1b68bbefad1e22cc610a 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 }, //查询表单枚举值字典