diff --git a/src/components/FormComponents/CustomForm/FormItemSelf.vue b/src/components/FormComponents/CustomForm/FormItemSelf.vue index 5890a5805c2ed81f1532c4565a42bce142b530c1..cc7540b51e942044555748fc918ff24da8a66341 100644 --- a/src/components/FormComponents/CustomForm/FormItemSelf.vue +++ b/src/components/FormComponents/CustomForm/FormItemSelf.vue @@ -725,6 +725,7 @@ export default { } else { this.age = "" } + this.form.age = this.age }, // 获取prop prop 以{}包裹 getProp(value) { diff --git a/src/components/FormComponents/CustomForm/FormItemText.vue b/src/components/FormComponents/CustomForm/FormItemText.vue index 243d0040d03d2a370c67f2431b279b417083e85c..0dcb263fe59673994393988055a289acd7f5422d 100644 --- a/src/components/FormComponents/CustomForm/FormItemText.vue +++ b/src/components/FormComponents/CustomForm/FormItemText.vue @@ -27,6 +27,9 @@ {{ handleUnionName(form[item.prop]) }} + + {{ handleAge() }} + {{ form[item.prop] | getItemText(item.dicData, item.type) }} @@ -79,6 +82,19 @@ export default { const union = this.unionList.find((e) => e.id == v) || {} return union.unionName || "" }, + handleAge() { + var birthday = new Date(this.form.birthday.replace(/-/g, "/")) + var d = new Date() + var age = + d.getFullYear() - + birthday.getFullYear() - + (d.getMonth() < birthday.getMonth() || + (d.getMonth() == birthday.getMonth() && + d.getDate() < birthday.getDate()) + ? 1 + : 0) + return age + }, }, filters: { getItemText(val, list, type) { diff --git a/src/views/audit-detail/index.vue b/src/views/audit-detail/index.vue index 5ff04d25d17a640b2dc61c16de846d1dc437239c..e23e5667273778a3dd662192d9e9f0d070c85efd 100644 --- a/src/views/audit-detail/index.vue +++ b/src/views/audit-detail/index.vue @@ -328,6 +328,7 @@ export default { this.$refs["screen"].getPatientDetail() }, handleEdit() { + sessionStorage.removeItem("index1Data") this.$refs.follow.open() }, // 获取标签 diff --git a/src/views/followupentry/components/DialogConfigForms.vue b/src/views/followupentry/components/DialogConfigForms.vue index 2932ede5221a42b83dfc837f0374f246174ab2a9..dddb692c3fd870903993cb5166e990e588565c4f 100644 --- a/src/views/followupentry/components/DialogConfigForms.vue +++ b/src/views/followupentry/components/DialogConfigForms.vue @@ -21,6 +21,7 @@ :isDraft="isDraft" :operation="operation" @changeShow="changeShow" + @addMethods="addMethods" > @@ -74,6 +75,17 @@ export default { } }, methods: { + // 处理部分逻辑 + addMethods(v) { + console.log(v) + if (v.activeName == "index0") { + let data = { + birthday: v.form.birthday, + sex: v.form.sex, + } + sessionStorage.setItem("index1Data", JSON.stringify(data)) + } + }, open() { this.visible = true }, diff --git a/src/views/screening/DraftBox.vue b/src/views/screening/DraftBox.vue index eb124dd72dfbee4d22b3f9e5d69f593ea3a76c83..64ad360dabc728a1ff94901a52c881ba5a2b741e 100644 --- a/src/views/screening/DraftBox.vue +++ b/src/views/screening/DraftBox.vue @@ -29,6 +29,7 @@ :patient-id="patientId" :disabled="disabled" :operation="'edit'" + @addMethods="addMethods" > @@ -194,6 +195,17 @@ export default { watch: {}, mounted() {}, methods: { + // 处理部分逻辑 + addMethods(v) { + console.log(v) + if (v.activeName == "index0") { + let data = { + birthday: v.form.birthday, + sex: v.form.sex, + } + sessionStorage.setItem("index1Data", JSON.stringify(data)) + } + }, handleAdd({ patientId, name }, index, disabled = false) { sessionStorage.removeItem("index1Data") this.disabled = disabled diff --git a/src/views/screening/components/ConfigForms.vue b/src/views/screening/components/ConfigForms.vue index 240c6f77ede3fabee7314f9530cc5ffcc0179dc5..c31be39e96a73ba62cc077e3eb1c0f4461006b7b 100644 --- a/src/views/screening/components/ConfigForms.vue +++ b/src/views/screening/components/ConfigForms.vue @@ -209,6 +209,8 @@ export default { getTabFollowId() { if (this.tabFollowId) { return this.tabFollowId() + } else { + return "" } }, survivalFlag() { diff --git a/src/views/screening/components/FormTab.vue b/src/views/screening/components/FormTab.vue index 5264d9a4ac5ae82f621272868b2d66626b924f29..18c875f635c696869d1a90a0f1fd483b3742200b 100644 --- a/src/views/screening/components/FormTab.vue +++ b/src/views/screening/components/FormTab.vue @@ -434,6 +434,19 @@ export default { form["YZZKJC"] = JSON.parse(form["YZZKJC"]) } console.log("form形成", form, this.formData) + if (form.birthday) { + let birthday = new Date(form.birthday.replace(/-/g, "/")) + let date = new Date() + let age = + date.getFullYear() - + birthday.getFullYear() - + (date.getMonth() < birthday.getMonth() || + (date.getMonth() == birthday.getMonth() && + date.getDate() < birthday.getDate()) + ? 1 + : 0) + form.age = age + } if (!cache) { this.formData.formEdit = form } diff --git a/src/views/screening/index.vue b/src/views/screening/index.vue index 81f32bbf75a070806980498fb762ca4ebaf4227e..44b307b90d861130927f637aace5d9c1ad61e836 100644 --- a/src/views/screening/index.vue +++ b/src/views/screening/index.vue @@ -36,6 +36,7 @@ :tab-disabled="tabDisabled" :is-draft="'0'" :operation="'edit'" + @addMethods="addMethods" > @@ -290,6 +291,17 @@ export default { } }, methods: { + // 处理部分逻辑 + addMethods(v) { + console.log(v) + if (v.activeName == "index0") { + let data = { + birthday: v.form.birthday, + sex: v.form.sex, + } + sessionStorage.setItem("index1Data", JSON.stringify(data)) + } + }, backInfoce() { this.$router.push({ query: {} }) this.isDetail = false