diff --git a/src/views/research/components/EquipmentForm.vue b/src/views/research/components/EquipmentForm.vue index a77b2e9c..3b6fda91 100644 --- a/src/views/research/components/EquipmentForm.vue +++ b/src/views/research/components/EquipmentForm.vue @@ -22,7 +22,7 @@ - + @@ -68,7 +68,11 @@ export default { trialSiteSurveyEquipmentType: { type: String, default: '' - } + }, + isShowParameters: { + type: Boolean, + default: false + }, }, data() { return { diff --git a/src/views/research/components/EquipmentList.vue b/src/views/research/components/EquipmentList.vue index ca7b2b07..ceed2475 100644 --- a/src/views/research/components/EquipmentList.vue +++ b/src/views/research/components/EquipmentList.vue @@ -25,6 +25,7 @@ /> - + @@ -105,7 +106,8 @@ export default { userTypeEnumInt: 0, state: null, trialSiteSurveyId: '', - trialId: '' + trialId: '', + isShowParameters: false } }, mounted() { @@ -152,7 +154,9 @@ export default { }).catch(() => { this.loading = false }) }).catch(() => {}) }, - initList(TrialSiteEquipmentSurveyList, trialSiteSurvey) { + initList(TrialSiteEquipmentSurveyList, trialSiteSurvey, isShowParameters) { + console.log(isShowParameters) + this.isShowParameters = isShowParameters this.list = TrialSiteEquipmentSurveyList this.state = trialSiteSurvey.State this.$forceUpdate() diff --git a/src/views/research/form.vue b/src/views/research/form.vue index 484ae961..8fabe497 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) + this.$refs['researchEquipments'].initList(res.Result.TrialSiteEquipmentSurveyList, res.Result.TrialSiteSurvey, res.Result.SiteSurveyFiledConfig && res.Result.SiteSurveyFiledConfig.ModifyFiledList.length > 0 ? false : true) this.isExistIncorrect = res.Result.TrialSiteUserSurveyList.every(item => item.IsCorrect === false) } this.loading = false