diff --git a/src/components/FormComponents/CustomForm/index.vue b/src/components/FormComponents/CustomForm/index.vue index c360c6d5302b585199634ce75897ab13f4e8fff7..6c707c2d6646b14ae54fd2b98985093acc101169 100644 --- a/src/components/FormComponents/CustomForm/index.vue +++ b/src/components/FormComponents/CustomForm/index.vue @@ -271,44 +271,45 @@ export default { }, // 临时保存 temporarySave() { - //? 只传数据 - this.$refs.form.validate((valid) => { - if (valid) { - const data = {} - const form = this.deepClone(this.form) - Object.keys(form).forEach((k) => { - if (form[k] === undefined) { - data[k] = "" - return false - } - if (k === "YZZKJC") { - // 牙周表格 - data[k] = JSON.stringify(form[k]) - } else if ( - Array.isArray(form[k]) && - form[k][0] && - isObject(form[k][0]) - ) { - // 子表单 去除前端添加的显隐辅助数据($_)和 删除按钮辅助数据(showDelBtn) - data[k] = form[k].map((item) => { - for (let key in item) { - if (["$_keyField", "$_hidden", "showDelBtn"].includes(key)) - delete item[key] - } - return item - }) - } else { - data[k] = form[k] + //? 只传数据 获取当前步数,如果个人信息已经提交可以临时保存 + + // this.$refs.form.validate((valid) => { + // if (valid) { + const data = {} + const form = this.deepClone(this.form) + Object.keys(form).forEach((k) => { + if (form[k] === undefined) { + data[k] = "" + return false + } + if (k === "YZZKJC") { + // 牙周表格 + data[k] = JSON.stringify(form[k]) + } else if ( + Array.isArray(form[k]) && + form[k][0] && + isObject(form[k][0]) + ) { + // 子表单 去除前端添加的显隐辅助数据($_)和 删除按钮辅助数据(showDelBtn) + data[k] = form[k].map((item) => { + for (let key in item) { + if (["$_keyField", "$_hidden", "showDelBtn"].includes(key)) + delete item[key] } - }) - this.$emit("temporaryConfirm", data, () => { - // 完成之后的回调 - this.loading = false + return item }) } else { - this.loading = false + data[k] = form[k] } }) + this.$emit("temporaryConfirm", data, () => { + // 完成之后的回调 + this.loading = false + }) + // } else { + // this.loading = false + // } + // }) }, handleConfirm() { this.loading = true @@ -461,6 +462,7 @@ export default { } .form-footer { margin-top: 20px; + margin-bottom: 20px; text-align: center; } } diff --git a/src/layouts/index.vue b/src/layouts/index.vue index 6e6810e05b66171f238cfea2ccc34982eeadcc2b..36d1e538d1533baef616aa2acdd326d66495bd6a 100644 --- a/src/layouts/index.vue +++ b/src/layouts/index.vue @@ -569,12 +569,18 @@ export default { } .right { flex: 1; + .r_col_item:nth-child(4) { + img { + align-self: flex-start; + } + } .r_col_item { min-height: 72px; display: flex; justify-content: flex-start; align-items: center; padding: 20px 0 20px 20px; + img { width: 26px; height: 26px; diff --git a/src/views/screening/components/ConfigForms.vue b/src/views/screening/components/ConfigForms.vue index 403ebdc34f9858a08dba69464bfec876c1f9c28a..4f0a7808bc0cf9360de2c0ad025dcbcf32832a74 100644 --- a/src/views/screening/components/ConfigForms.vue +++ b/src/views/screening/components/ConfigForms.vue @@ -1,15 +1,12 @@