diff --git a/src/views/research/components/EquipmentForm.vue b/src/views/research/components/EquipmentForm.vue index 3b6fda91..dfd531b6 100644 --- a/src/views/research/components/EquipmentForm.vue +++ b/src/views/research/components/EquipmentForm.vue @@ -14,7 +14,7 @@ :value="item.Id" /> --> - + @@ -107,7 +107,8 @@ export default { state: null, trialSiteSurveyId: '', trialId: '', - isShowParameters: false + isShowParameters: false, + modalitys: [] } }, mounted() { @@ -154,11 +155,13 @@ export default { }).catch(() => { this.loading = false }) }).catch(() => {}) }, - initList(TrialSiteEquipmentSurveyList, trialSiteSurvey, isShowParameters) { - console.log(isShowParameters) + initList(TrialSiteEquipmentSurveyList, trialSiteSurvey, modalitys, isShowParameters) { this.isShowParameters = isShowParameters this.list = TrialSiteEquipmentSurveyList this.state = trialSiteSurvey.State + const modalityArr = modalitys ? modalitys.split('|') : [] + this.modalitys = this.$d.Modality.filter(i => modalityArr.includes(i.value)) + console.log(this.modalitys) this.$forceUpdate() }, // 关闭窗口 diff --git a/src/views/research/form.vue b/src/views/research/form.vue index 8fabe497..312ff61b 100644 --- a/src/views/research/form.vue +++ b/src/views/research/form.vue @@ -244,7 +244,7 @@ export default { this.$refs['historicalParticipant'].initList(historicalArr, res.Result.TrialSiteSurvey) this.$refs['researchParticipants'].initList(newArr, res.Result.TrialSiteSurvey) - this.$refs['researchEquipments'].initList(res.Result.TrialSiteEquipmentSurveyList, res.Result.TrialSiteSurvey, res.Result.SiteSurveyFiledConfig && res.Result.SiteSurveyFiledConfig.ModifyFiledList.length > 0 ? false : true) + this.$refs['researchEquipments'].initList(res.Result.TrialSiteEquipmentSurveyList, res.Result.TrialSiteSurvey, res.Result.TrialInfo.Modalitys, !(res.Result.SiteSurveyFiledConfig && res.Result.SiteSurveyFiledConfig.ModifyFiledList.length > 0)) this.isExistIncorrect = res.Result.TrialSiteUserSurveyList.every(item => item.IsCorrect === false) } this.loading = false diff --git a/src/views/research/login.vue b/src/views/research/login.vue index e2f7782d..0e8fa97c 100644 --- a/src/views/research/login.vue +++ b/src/views/research/login.vue @@ -294,7 +294,7 @@ export default { if (res.IsSuccess) { this.getCode() this.loading = false - let msg = this.$t('trials:researchForm:tip:sendCode').replace("xxx", this.form.EmailOrPhone) + const msg = this.$t('trials:researchForm:tip:sendCode').replace('xxx', this.form.EmailOrPhone) this.$message.success(msg) } else { this.$alert(res.ErrorMessage)