diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue index cd31a3f6..836f1f88 100644 --- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue +++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue @@ -743,32 +743,36 @@ export default { }, formItemNumberChange(questionId, isTable) { - if (isTable) { - this.CalculationList.forEach((v, i) => { - var find = v.CalculateQuestionList.filter(o => { - return o.QuestionId === questionId - }) - // find的自动计算值number - if (find) { - var num = this.logic(v) - if (num !== false) { - this.$emit('setFormItemData', { key: v.QuestionId, val: num, question: v }) - } - } - }) + if (typeof isTable === 'object') { + this.$emit("setFormItemData", { key: isTable.Id, val: questionId, question: isTable }); } else { - this.CalculationList.forEach(v => { - var find = v.CalculateQuestionList.filter(o => { - return o.TableQuestionId === questionId - }) - // find的自动计算值number - if (find) { - var num = this.logic(v) - if (num !== false) { - this.$emit('setFormItemData', { key: v.QuestionId, val: num, question: v }) + if (isTable) { + this.CalculationList.forEach((v, i) => { + var find = v.CalculateQuestionList.filter(o => { + return o.QuestionId === questionId + }) + // find的自动计算值number + if (find) { + var num = this.logic(v) + if (num !== false) { + this.$emit('setFormItemData', { key: v.QuestionId, val: num, question: v }) + } } - } - }) + }) + } else { + this.CalculationList.forEach(v => { + var find = v.CalculateQuestionList.filter(o => { + return o.TableQuestionId === questionId + }) + // find的自动计算值number + if (find) { + var num = this.logic(v) + if (num !== false) { + this.$emit('setFormItemData', { key: v.QuestionId, val: num, question: v }) + } + } + }) + } } // this.$emit('formItemNumberChange') }, diff --git a/src/views/trials/trials-panel/reading/visit-review/components/FormItem.vue b/src/views/trials/trials-panel/reading/visit-review/components/FormItem.vue index 5bb253ba..d22e2423 100644 --- a/src/views/trials/trials-panel/reading/visit-review/components/FormItem.vue +++ b/src/views/trials/trials-panel/reading/visit-review/components/FormItem.vue @@ -472,32 +472,36 @@ export default { } }, formItemNumberChange(questionId, isTable) { - if (isTable) { - this.calculationList.forEach((v, i) => { - var find = v.CalculateQuestionList.filter(o => { - return o.QuestionId === questionId - }) - // find的自动计算值number - if (find) { - var num = this.logic(v) - if (num !== false) { - this.$emit('setFormItemData', { key: v.QuestionId, val: num, question: v }) - } - } - }) + if (typeof isTable === 'object') { + this.$emit("setFormItemData", { key: isTable.Id, val: questionId, question: isTable }); } else { - this.calculationList.forEach(v => { - var find = v.CalculateQuestionList.filter(o => { - return o.TableQuestionId === questionId - }) - // find的自动计算值number - if (find) { - var num = this.logic(v) - if (num !== false) { - this.$emit('setFormItemData', { key: v.QuestionId, val: num, question: v }) + if (isTable) { + this.calculationList.forEach((v, i) => { + var find = v.CalculateQuestionList.filter(o => { + return o.QuestionId === questionId + }) + // find的自动计算值number + if (find) { + var num = this.logic(v) + if (num !== false) { + this.$emit('setFormItemData', { key: v.QuestionId, val: num, question: v }) + } } - } - }) + }) + } else { + this.calculationList.forEach(v => { + var find = v.CalculateQuestionList.filter(o => { + return o.TableQuestionId === questionId + }) + // find的自动计算值number + if (find) { + var num = this.logic(v) + if (num !== false) { + this.$emit('setFormItemData', { key: v.QuestionId, val: num, question: v }) + } + } + }) + } } }, formItemChange(v, question) { diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue index cd3d5386..864f94da 100644 --- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue +++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue @@ -660,33 +660,38 @@ export default { return num; }, formItemNumberChange(questionId, isTable) { - if (isTable) { - this.calculationList.forEach((v, i) => { - var find = v.CalculateQuestionList.filter((o) => { - return o.QuestionId === questionId; - }); - if (find) { - var num = this.logic(v); - if (num !== false) { - this.$emit("setFormItemData", { key: v.QuestionId, val: num, question: v }); - } - } - }); + if (typeof isTable === 'object') { + this.$emit("setFormItemData", { key: isTable.Id, val: questionId, question: isTable }); } else { - this.calculationList.forEach((v) => { - var find = v.CalculateQuestionList.filter((o) => { - return o.TableQuestionId === questionId; - }); - - // find的自动计算值number - if (find) { - var num = this.logic(v); - if (num !== false) { - this.$emit("setFormItemData", { key: v.QuestionId, val: num, question: v }); + if (isTable) { + this.calculationList.forEach((v, i) => { + var find = v.CalculateQuestionList.filter((o) => { + return o.QuestionId === questionId; + }); + if (find) { + var num = this.logic(v); + if (num !== false) { + this.$emit("setFormItemData", { key: v.QuestionId, val: num, question: v }); + } } - } - }); + }); + } else { + this.calculationList.forEach((v) => { + var find = v.CalculateQuestionList.filter((o) => { + return o.TableQuestionId === questionId; + }); + + // find的自动计算值number + if (find) { + var num = this.logic(v); + if (num !== false) { + this.$emit("setFormItemData", { key: v.QuestionId, val: num, question: v }); + } + } + }); + } } + // this.$emit('formItemNumberChange') }, formItemTableNumberChange() { diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsPreview.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsPreview.vue index 73eb0392..6b4a2551 100644 --- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsPreview.vue +++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsPreview.vue @@ -167,6 +167,7 @@ export default { // if (i.Type === 'number') { // this.$set(this.questionForm, i.Id, i.Answer) // } + console.log('setChild') if (i.Type === 'class') { this.classArr.push({triggerId: i.ClassifyQuestionId, classId: i.Id, classifyAlgorithms: i.ClassifyAlgorithms, classifyType: i.ClassifyType}) }