From 5b40accc617e034bad0675ae8f63d6588aa39888 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Mon, 15 Jan 2024 16:19:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=AD=E5=BF=83=E8=B0=83?= =?UTF-8?q?=E7=A0=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintignore | 2 +- .gitignore | 1 + .../components/HistoricalParticipantForm.vue | 193 +++++++++--------- .../research/components/ParticipantForm.vue | 158 ++++++++------ 4 files changed, 195 insertions(+), 159 deletions(-) diff --git a/.eslintignore b/.eslintignore index 96d8bc74..a4566609 100644 --- a/.eslintignore +++ b/.eslintignore @@ -4,7 +4,7 @@ src/utils/* public dist -src/* +# src/* src/views/dictionary/checkConfig/* src/views/trials/trials-panel/trial-summary/* src/main.js diff --git a/.gitignore b/.gitignore index 9ad28d23..701a8cf8 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ tests/**/coverage/ *.ntvs* *.njsproj *.sln +.eslintignore diff --git a/src/views/research/components/HistoricalParticipantForm.vue b/src/views/research/components/HistoricalParticipantForm.vue index 9ddb675d..bdc9e38f 100644 --- a/src/views/research/components/HistoricalParticipantForm.vue +++ b/src/views/research/components/HistoricalParticipantForm.vue @@ -3,19 +3,11 @@
- + - + - + - + - + - - - + + + {{ item.UserType }} - - - {{ item.label }} + + + {{ + item.label }} - {{ errorMsg }} + {{ + errorMsg + }} -
-
+
- {{ $t('common:button:cancel') }} + {{ $t("common:button:cancel") }} - {{ $t('common:button:save') }} + {{ $t("common:button:save") }}
@@ -142,7 +106,8 @@ export default { if (value === '') { callback(new Error(this.$t('trials:researchForm:formRule:specify'))) } else { - var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/ + var reg = + /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/ if (this.form.Email && reg.test(this.form.Email)) { this.sendDisabled = false callback() @@ -164,29 +129,64 @@ export default { OrganizationName: '', IsGenerateAccount: false, IsHistoryUserDeleted: '' - }, rules: { LastName: [ - { required: true, message: this.$t('trials:researchForm:formRule:specify'), trigger: 'blur' }, - { min: 0, max: 50, message: this.$t('trials:researchForm:formRule:maxLength'), trigger: 'blur' } + { + required: true, + message: this.$t('trials:researchForm:formRule:specify'), + trigger: 'blur' + }, + { + min: 0, + max: 50, + message: this.$t('trials:researchForm:formRule:maxLength'), + trigger: 'blur' + } ], FirstName: [ - { required: true, message: this.$t('trials:researchForm:formRule:specify'), trigger: 'blur' }, - { min: 0, max: 50, message: this.$t('trials:researchForm:formRule:maxLength'), trigger: 'blur' } + { + required: true, + message: this.$t('trials:researchForm:formRule:specify'), + trigger: 'blur' + }, + { + min: 0, + max: 50, + message: this.$t('trials:researchForm:formRule:maxLength'), + trigger: 'blur' + } ], TrialRoleCode: [ - { required: true, message: this.$t('trials:researchForm:formRule:select'), trigger: ['blur', 'change'] } + { + required: true, + message: this.$t('trials:researchForm:formRule:select'), + trigger: ['blur', 'change'] + } + ], + UserTypeId: [ + { + required: true, + message: this.$t('trials:researchForm:formRule:select'), + trigger: ['blur'] + } ], - UserTypeId: [{ required: true, message: this.$t('trials:researchForm:formRule:select'), trigger: ['blur'] }], Phone: [ - { max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50', trigger: 'blur' } + { + max: 50, + message: this.$t('common:ruleMessage:maxLength') + ' 50', + trigger: 'blur' + } ], Email: [ { required: true, validator: validateEmail, trigger: ['blur'] } ], IsHistoryUserDeleted: [ - { required: true, message: this.$t('trials:researchForm:formRule:select'), trigger: ['blur', 'change'] } + { + required: true, + message: this.$t('trials:researchForm:formRule:select'), + trigger: ['blur', 'change'] + } ] }, btnLoading: false, @@ -202,7 +202,7 @@ export default { methods: { async initForm() { await this.getUserType() - Object.keys(this.data).forEach(key => { + Object.keys(this.data).forEach((key) => { this.form[key] = this.data[key] }) if (zzSessionStorage.getItem('userTypeEnumInt')) { @@ -211,37 +211,44 @@ export default { }, // 保存参与者信息 handleSave() { - this.$refs['participantForm'].validate(valid => { + this.$refs['participantForm'].validate((valid) => { if (!valid) return this.btnLoading = true if (!this.form.TrialSiteSurveyId) { this.form.TrialSiteSurveyId = getQueryString('trialSiteSurveyId') } const trialId = getQueryString('trialId') - addOrUpdateTrialSiteUserSurvey(trialId, this.form).then(res => { - this.btnLoading = false - if (res.IsSuccess) { - // 保存成功 - this.$message.success(this.$t('common:message:savedSuccessfully')) + addOrUpdateTrialSiteUserSurvey(trialId, this.form) + .then((res) => { + this.btnLoading = false + if (res.IsSuccess) { + // 保存成功 + this.$message.success( + this.$t('common:message:savedSuccessfully') + ) - this.$emit('close', { id: res.Result, errorMessage: '' }) - } - }).catch((res) => { - if (res.Result && res.Result.Id && res.ErrorMessage) { - this.$emit('close', { id: res.Result.Id, errorMessage: res.ErrorMessage }) - // this.$confirm(res.ErrorMessage, '', { - // type: 'warning' - // }).then(() => { - // this.$set(this.form, 'LastName', res.Result.LastName) - // this.$set(this.form, 'FirstName', res.Result.FirstName) - // this.$set(this.form, 'Phone', res.Result.Phone) - // this.handleSave() - // }).catch(() => { + this.$emit('close', { id: res.Result, errorMessage: '' }) + } + }) + .catch((res) => { + if (res.Result && res.Result.Id && res.ErrorMessage) { + this.$emit('close', { + id: res.Result.Id, + errorMessage: res.ErrorMessage + }) + // this.$confirm(res.ErrorMessage, '', { + // type: 'warning' + // }).then(() => { + // this.$set(this.form, 'LastName', res.Result.LastName) + // this.$set(this.form, 'FirstName', res.Result.FirstName) + // this.$set(this.form, 'Phone', res.Result.Phone) + // this.handleSave() + // }).catch(() => { - // }) - } - this.btnLoading = false - }) + // }) + } + this.btnLoading = false + }) }) }, // 取消保存 @@ -250,12 +257,16 @@ export default { }, // 获取系统用户类型 getUserType() { - return new Promise(resolve => { - getUserTypeList(3).then(res => { + return new Promise((resolve) => { + getUserTypeList(3).then((res) => { this.userTypeOptions = res.Result + var crcObj = res.Result.find((i) => i.UserTypeEnum === 2) + this.crcId = crcObj ? crcObj.Id : '' + var craObj = res.Result.find((i) => i.UserTypeEnum === 9) + this.craId = craObj ? craObj.Id : '' }) resolve() - }).catch(() => { resolve() }) + }) } } } diff --git a/src/views/research/components/ParticipantForm.vue b/src/views/research/components/ParticipantForm.vue index ecb917a9..d9a8fed3 100644 --- a/src/views/research/components/ParticipantForm.vue +++ b/src/views/research/components/ParticipantForm.vue @@ -1,27 +1,19 @@