diff --git a/src/views/research/components/ResearchForm.vue b/src/views/research/components/ResearchForm.vue
index 69465cb2..4b70774a 100644
--- a/src/views/research/components/ResearchForm.vue
+++ b/src/views/research/components/ResearchForm.vue
@@ -26,7 +26,7 @@
{{ $t('trials:staffResearch:title:newStaff') }}
-
+
{{ $t('trials:equiptResearch:title:equiptResearch') }}
@@ -35,9 +35,12 @@
-
{{ $t('trials:equiptResearch:form:precautions') }}
-
+
+
+
+
+
- {{ $t('trials:equiptResearch:form:item1') }}
@@ -148,7 +151,8 @@ export default {
rejectForm: { reason: '' },
btnLoading: false,
isFullscreen: false,
- historyVisible: false
+ historyVisible: false,
+ siteSurveyNoteInfo: null
}
},
mounted() {
@@ -165,6 +169,9 @@ export default {
if (res.Result) {
// this.trialSiteSurveyEquipmentType = res.Result.TrialInfo.TrialSiteSurveyEquipmentType
// this.trialSiteSurveyUserRoles = res.Result.TrialInfo.TrialSiteSurveyUserRoles
+ if (res.Result.SiteSurveyFiledConfig && res.Result.SiteSurveyFiledConfig.ModifyFiledList.length > 0) {
+ this.siteSurveyNoteInfo = res.Result.SiteSurveyFiledConfig.ModifyFiledList.find(i => i.NeedModifyFiled === 'SiteSurveyNote')
+ }
var historicalArr = []
var newArr = []
res.Result.TrialSiteUserSurveyList.map(i => {
@@ -176,11 +183,11 @@ export default {
})
this.state = res.Result.TrialSiteSurvey.State
this.siteId = res.Result.TrialSiteSurvey.TrialSiteId
- this.$refs['baseResearchInfo'].initForm(res.Result.TrialInfo, res.Result.TrialSiteSurvey)
+ this.$refs['baseResearchInfo'].initForm(res.Result.TrialInfo, res.Result.TrialSiteSurvey, res.Result.SiteSurveyFiledConfig ? res.Result.SiteSurveyFiledConfig.NotShowFieldList : null)
this.$refs['historicalParticipant'].initList(historicalArr, res.Result.TrialSiteSurvey)
this.$refs['researchParticipants'].initList(newArr, res.Result.TrialSiteSurvey)
// this.$refs['researchParticipants'].initList(res.Result.TrialSiteUserSurveyList, 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))
this.isExistIncorrect = res.Result.TrialSiteUserSurveyList.every(item => item.IsCorrect === false)
}
this.loading = false