diff --git a/src/components/FormComponents/CustomForm/FormItemSelf.vue b/src/components/FormComponents/CustomForm/FormItemSelf.vue index ac16068e8f63802bce081fbab0778e1ac9bdd0c3..2076eb62fed0c1ba1ddb7fd0c3b404d6e2e5da0f 100644 --- a/src/components/FormComponents/CustomForm/FormItemSelf.vue +++ b/src/components/FormComponents/CustomForm/FormItemSelf.vue @@ -43,7 +43,7 @@ :disabled="item.disabled" > - {{ item.importantFieldDesc || "*" }} @@ -392,9 +392,7 @@ export default { showIndex: { default: false, }, - vwForm: { - default: {}, - }, + vwForm: {}, formId: {}, getPatientId: { type: Function, @@ -432,10 +430,13 @@ export default { } }, computed: { + getVwForm() { + return this.vwForm() + }, //重要字段空数据且填写表单时添加重点 isEmpty() { const { importantField, prop } = this.item - if (!importantField || this.vwForm.detail) return "" + if (!importantField || this.getVwForm.detail) return "" const value = this.form[prop] // [] let empty = !value @@ -638,6 +639,7 @@ export default { const values = dyMap[key] let display = false if (Array.isArray(val)) { + // 胃癌和进展性胃癌单独控制 if ( prop == "early_gastric_cancer" || prop == "period_gastric_cancer" diff --git a/src/components/FormComponents/CustomForm/index.vue b/src/components/FormComponents/CustomForm/index.vue index de96e7405a6785386f90370e4339ba2c8b39e333..d275a1c7e168a81f840ae22ce410db8260de462a 100644 --- a/src/components/FormComponents/CustomForm/index.vue +++ b/src/components/FormComponents/CustomForm/index.vue @@ -144,15 +144,17 @@ export default { }, }, provide() { - const vwForm = {} - for (const k in this.options) { - if (k !== "column" && k !== "group") { - vwForm[k] = this.options[k] - } - } - return { - vwForm, + vwForm: () => { + const vwForm = {} + for (const k in this.options) { + if (k !== "column" && k !== "group") { + vwForm[k] = this.options[k] + } + } + return vwForm + }, + formId: "", } }, data() { @@ -355,9 +357,9 @@ export default { // 绑定部分值(此时表单已渲染) initfields(obj) { for (let k in obj) { - if (this.form.hasOwnProperty(k)) { - this.form[k] = obj[k] - } + // if (this.form.hasOwnProperty(k)) { + this.form[k] = obj[k] + // } } }, }, diff --git a/src/views/audit-detail/components/screenReview.vue b/src/views/audit-detail/components/screenReview.vue index 74f79e94d4e5f5b427e8091f7bd9f5c551ba3d61..28880440e6368a302779d1ef92b59d63e5f888ab 100644 --- a/src/views/audit-detail/components/screenReview.vue +++ b/src/views/audit-detail/components/screenReview.vue @@ -8,7 +8,7 @@ + @@ -44,7 +43,9 @@ export default { form: { name: "123", phone: "18712412341", + min_age: "18", }, + asideShow: true, } }, computed: { @@ -66,7 +67,6 @@ export default { this.getCurrentFormByType() }, mounted() {}, - methods: { getCurrentFormByType(type = 1) { this.fromLoading = true