diff --git a/src/views/system/user/list/index.vue b/src/views/system/user/list/index.vue index f0b7a18..bfa37ae 100644 --- a/src/views/system/user/list/index.vue +++ b/src/views/system/user/list/index.vue @@ -97,7 +97,7 @@ {{ userInfo.FirstName }} - {{ userInfo.Email }} + {{ userInfo.EMail }} {{ userInfo.Phone }} diff --git a/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue index f937b7b..0826125 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue @@ -210,18 +210,21 @@ export default { callback(new Error(this.$t('common:ruleMessage:specify'))) } else if (!reg.test(value) || (parseInt(value) > 99 || parseInt(value) <= 0)) { callback(new Error(this.$t('trials:readingPGWC:warnning:msg1'))) - } else if (parseInt(value) > parseInt(this.questionForm.BaseLineLesionNumber)) { - callback(new Error(this.$t('trials:reading:pcwg:msg6') + this.questionForm.BaseLineLesionNumber)) - } else { + } + // else if (parseInt(value) > parseInt(this.questionForm.BaseLineLesionNumber)) { + // callback(new Error(this.$t('trials:reading:pcwg:msg6') + this.questionForm.BaseLineLesionNumber)) + // } + else { callback() } }, limitInputValidator(rule, value, callback) { console.log(this.focusQs) - if (this.focusQs && !this.isBaseLineTask && this.focusQs.QuestionMark === 11 && (parseInt(value) > parseInt(this.questionForm.BaseLineLesionNumber))) { - // '基线病灶初始数量为' - callback(new Error(this.$t('trials:reading:pcwg:msg6') + this.questionForm.BaseLineLesionNumber)) - } else if (this.focusQs && this.focusQs.QuestionMark === 11 && (parseInt(value) > 99 || parseInt(value) <= 0)) { + // if (this.focusQs && !this.isBaseLineTask && this.focusQs.QuestionMark === 11 && (parseInt(value) > parseInt(this.questionForm.BaseLineLesionNumber))) { + // // '基线病灶初始数量为' + // callback(new Error(this.$t('trials:reading:pcwg:msg6') + this.questionForm.BaseLineLesionNumber)) + // } else + if (this.focusQs && this.focusQs.QuestionMark === 11 && (parseInt(value) > 99 || parseInt(value) <= 0)) { callback(new Error(this.$t('trials:readingPGWC:warnning:msg1'))) } else { callback()