Compare commits
No commits in common. "d6bb1fcb5a77be39d07467070380b94a0fbead8a" and "1c21479c823fecfca65be5e0fb70e25eb4566b93" have entirely different histories.
d6bb1fcb5a
...
1c21479c82
|
@ -14,7 +14,7 @@
|
||||||
:value="item.Id"
|
:value="item.Id"
|
||||||
/> -->
|
/> -->
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item of $d.SiteSurvey_ScanEquipmentType"
|
v-for="item of modalitys"
|
||||||
:key="item.id"
|
:key="item.id"
|
||||||
:label="item.label"
|
:label="item.label"
|
||||||
:value="item.id"
|
:value="item.id"
|
||||||
|
@ -72,6 +72,12 @@ export default {
|
||||||
isShowParameters: {
|
isShowParameters: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: false
|
default: false
|
||||||
|
},
|
||||||
|
modalitys: {
|
||||||
|
type: Array,
|
||||||
|
default() {
|
||||||
|
return []
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
|
|
|
@ -74,7 +74,7 @@
|
||||||
custom-class="base-dialog-wrapper"
|
custom-class="base-dialog-wrapper"
|
||||||
:append-to-body="userTypeEnumInt !== 0"
|
:append-to-body="userTypeEnumInt !== 0"
|
||||||
>
|
>
|
||||||
<EquipmentForm :data="rowData" :trial-site-survey-equipment-type="trialSiteSurveyEquipmentType" :is-show-parameters="isShowParameters" @getList="getList" @close="closeDialog" />
|
<EquipmentForm :data="rowData" :trial-site-survey-equipment-type="trialSiteSurveyEquipmentType" :is-show-parameters="isShowParameters" :modalitys="modalitys" @getList="getList" @close="closeDialog" />
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
@ -107,7 +107,8 @@ export default {
|
||||||
state: null,
|
state: null,
|
||||||
trialSiteSurveyId: '',
|
trialSiteSurveyId: '',
|
||||||
trialId: '',
|
trialId: '',
|
||||||
isShowParameters: false
|
isShowParameters: false,
|
||||||
|
modalitys: []
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
|
@ -154,10 +155,13 @@ export default {
|
||||||
}).catch(() => { this.loading = false })
|
}).catch(() => { this.loading = false })
|
||||||
}).catch(() => {})
|
}).catch(() => {})
|
||||||
},
|
},
|
||||||
initList(TrialSiteEquipmentSurveyList, trialSiteSurvey, isShowParameters) {
|
initList(TrialSiteEquipmentSurveyList, trialSiteSurvey, modalitys, isShowParameters) {
|
||||||
this.isShowParameters = isShowParameters
|
this.isShowParameters = isShowParameters
|
||||||
this.list = TrialSiteEquipmentSurveyList
|
this.list = TrialSiteEquipmentSurveyList
|
||||||
this.state = trialSiteSurvey.State
|
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()
|
this.$forceUpdate()
|
||||||
},
|
},
|
||||||
// 关闭窗口
|
// 关闭窗口
|
||||||
|
|
|
@ -244,7 +244,7 @@ export default {
|
||||||
|
|
||||||
this.$refs['historicalParticipant'].initList(historicalArr, res.Result.TrialSiteSurvey)
|
this.$refs['historicalParticipant'].initList(historicalArr, res.Result.TrialSiteSurvey)
|
||||||
this.$refs['researchParticipants'].initList(newArr, 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))
|
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.isExistIncorrect = res.Result.TrialSiteUserSurveyList.every(item => item.IsCorrect === false)
|
||||||
}
|
}
|
||||||
this.loading = false
|
this.loading = false
|
||||||
|
|
Loading…
Reference in New Issue