diff --git a/src/views/research/components/EquipmentForm.vue b/src/views/research/components/EquipmentForm.vue index 676aa37b..73fa0c71 100644 --- a/src/views/research/components/EquipmentForm.vue +++ b/src/views/research/components/EquipmentForm.vue @@ -2,39 +2,101 @@
- - - - - + +
+ + + + + +
- + - - + +
+ + + + + +
- + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + +
+
+ + + + + + + + + + + + - +
@@ -69,24 +131,35 @@ export default { type: String, default: '' }, - isShowParameters: { - type: Boolean, - default: false + EquipmentControlFieldList: { + type: Array, + default: () => { + return [] + } } }, data() { return { form: { Id: '', - EquipmentTypeId: '', - Parameters: '', - ManufacturerName: '', - ScannerType: '', - Note: '', + EquipmentTypeEnum: null, + OtherEquipmentType: null, + Parameters: null, + Note: null, + ManufacturerType: null, + ManufacturerName: null, + ScannerType: null, + MagneticFieldStrengthType: null, + BodyCoilChannelCount: null, + HasDedicatedPdfFatQuantificationSequence: null, + PdfFatQuantificationSequenceType: null, + OtherSequenceSpecification: null, + HasT2R2Correction: null, + CanFullyExportPdfParameterMapsAndRawDicom: null, TrialSiteSurveyId: '' }, rules: { - EquipmentTypeId: [ + EquipmentTypeEnum: [ { required: true, message: this.$t('trials:researchForm:formRule:select'), trigger: ['blur', 'change'] } ] }, diff --git a/src/views/research/components/EquipmentList.vue b/src/views/research/components/EquipmentList.vue index f27b38b7..7b3d67aa 100644 --- a/src/views/research/components/EquipmentList.vue +++ b/src/views/research/components/EquipmentList.vue @@ -2,63 +2,88 @@
- + {{ $t('common:button:add') }}
- + - + + + - + - + + + - + + + + + + + + + + + + + + + + + + + + + + + + - - + +