Compare commits

..

No commits in common. "7d37fdc3c0b248b2082f7656a606e008d32a5ff9" and "4058bddd21a312bb23925a3aa29e12008d93068d" have entirely different histories.

3 changed files with 6 additions and 14 deletions

View File

@ -22,7 +22,7 @@
</el-select>
</el-form-item>
<!-- 扫描参数 -->
<el-form-item v-if="isShowParameters" :label="$t('trials:equiptResearch:form:param')">
<el-form-item :label="$t('trials:equiptResearch:form:param')">
<el-input v-model="form.Parameters" />
</el-form-item>
<!-- 扫描仪器制造商名称 -->
@ -68,11 +68,7 @@ export default {
trialSiteSurveyEquipmentType: {
type: String,
default: ''
},
isShowParameters: {
type: Boolean,
default: false
},
}
},
data() {
return {

View File

@ -25,7 +25,6 @@
/>
<!-- 扫描参数 -->
<el-table-column
v-if="isShowParameters"
prop="Parameters"
:label="$t('trials:equiptResearch:form:param')"
width="180"
@ -74,7 +73,7 @@
custom-class="base-dialog-wrapper"
:append-to-body="userTypeEnumInt !== 0"
>
<EquipmentForm :data="rowData" :trial-site-survey-equipment-type="trialSiteSurveyEquipmentType" :isShowParameters="isShowParameters" @getList="getList" @close="closeDialog" />
<EquipmentForm :data="rowData" :trial-site-survey-equipment-type="trialSiteSurveyEquipmentType" @getList="getList" @close="closeDialog" />
</el-dialog>
</div>
@ -106,8 +105,7 @@ export default {
userTypeEnumInt: 0,
state: null,
trialSiteSurveyId: '',
trialId: '',
isShowParameters: false
trialId: ''
}
},
mounted() {
@ -154,9 +152,7 @@ export default {
}).catch(() => { this.loading = false })
}).catch(() => {})
},
initList(TrialSiteEquipmentSurveyList, trialSiteSurvey, isShowParameters) {
console.log(isShowParameters)
this.isShowParameters = isShowParameters
initList(TrialSiteEquipmentSurveyList, trialSiteSurvey) {
this.list = TrialSiteEquipmentSurveyList
this.state = trialSiteSurvey.State
this.$forceUpdate()

View File

@ -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)
this.isExistIncorrect = res.Result.TrialSiteUserSurveyList.every(item => item.IsCorrect === false)
}
this.loading = false