From 602f9713091abf9e4af8093a8b71481a18be6f96 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 18 Jun 2024 11:06:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=BF=83=E8=B0=83=E7=A0=94=E6=89=AB?=
 =?UTF-8?q?=E6=8F=8F=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/research/components/EquipmentForm.vue |  8 +-------
 src/views/research/components/EquipmentList.vue | 10 +++-------
 src/views/research/form.vue                     |  2 +-
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/views/research/components/EquipmentForm.vue b/src/views/research/components/EquipmentForm.vue
index dfd531b6..676aa37b 100644
--- a/src/views/research/components/EquipmentForm.vue
+++ b/src/views/research/components/EquipmentForm.vue
@@ -14,7 +14,7 @@
             :value="item.Id"
           /> -->
           <el-option
-            v-for="item of modalitys"
+            v-for="item of $d.SiteSurvey_ScanEquipmentType"
             :key="item.id"
             :label="item.label"
             :value="item.id"
@@ -72,12 +72,6 @@ export default {
     isShowParameters: {
       type: Boolean,
       default: false
-    },
-    modalitys: {
-      type: Array,
-      default() {
-        return []
-      }
     }
   },
   data() {
diff --git a/src/views/research/components/EquipmentList.vue b/src/views/research/components/EquipmentList.vue
index cf81d70d..474609fc 100644
--- a/src/views/research/components/EquipmentList.vue
+++ b/src/views/research/components/EquipmentList.vue
@@ -74,7 +74,7 @@
       custom-class="base-dialog-wrapper"
       :append-to-body="userTypeEnumInt !== 0"
     >
-      <EquipmentForm :data="rowData" :trial-site-survey-equipment-type="trialSiteSurveyEquipmentType" :is-show-parameters="isShowParameters" :modalitys="modalitys" @getList="getList" @close="closeDialog" />
+      <EquipmentForm :data="rowData" :trial-site-survey-equipment-type="trialSiteSurveyEquipmentType" :is-show-parameters="isShowParameters" @getList="getList" @close="closeDialog" />
     </el-dialog>
 
   </div>
@@ -107,8 +107,7 @@ export default {
       state: null,
       trialSiteSurveyId: '',
       trialId: '',
-      isShowParameters: false,
-      modalitys: []
+      isShowParameters: false
     }
   },
   mounted() {
@@ -155,13 +154,10 @@ export default {
         }).catch(() => { this.loading = false })
       }).catch(() => {})
     },
-    initList(TrialSiteEquipmentSurveyList, trialSiteSurvey, modalitys, isShowParameters) {
+    initList(TrialSiteEquipmentSurveyList, trialSiteSurvey, isShowParameters) {
       this.isShowParameters = isShowParameters
       this.list = TrialSiteEquipmentSurveyList
       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()
     },
     // 关闭窗口
diff --git a/src/views/research/form.vue b/src/views/research/form.vue
index 312ff61b..a6bdf980 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, res.Result.TrialInfo.Modalitys, !(res.Result.SiteSurveyFiledConfig && res.Result.SiteSurveyFiledConfig.ModifyFiledList.length > 0))
+          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