From e4453bced6d23dda3257ecf0d603f591920e0306 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 15 Jan 2024 15:27:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AD=E5=BF=83=E8=B0=83?=
 =?UTF-8?q?=E7=A0=94=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/HistoricalParticipantForm.vue  |  9 ++++---
 .../research/components/ParticipantForm.vue   | 26 ++++++++++++-------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/views/research/components/HistoricalParticipantForm.vue b/src/views/research/components/HistoricalParticipantForm.vue
index 3db75975..9ddb675d 100644
--- a/src/views/research/components/HistoricalParticipantForm.vue
+++ b/src/views/research/components/HistoricalParticipantForm.vue
@@ -250,9 +250,12 @@ export default {
     },
     // 获取系统用户类型
     getUserType() {
-      getUserTypeList(3).then(res => {
-        this.userTypeOptions = res.Result
-      })
+      return new Promise(resolve => {
+        getUserTypeList(3).then(res => {
+          this.userTypeOptions = res.Result
+        })
+        resolve()
+      }).catch(() => { resolve() })
     }
   }
 }
diff --git a/src/views/research/components/ParticipantForm.vue b/src/views/research/components/ParticipantForm.vue
index 73c4ce87..ecb917a9 100644
--- a/src/views/research/components/ParticipantForm.vue
+++ b/src/views/research/components/ParticipantForm.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-form ref="participantForm" :model="form" :rules="rules" label-width="200px" :inline="true">
+  <el-form ref="participantForm" :model="form" :rules="rules" label-width="200px" :inline="true" v-loading="loading">
     <div class="base-dialog-body">
       <!-- 姓 -->
       <el-form-item :label="$t('trials:staffResearch:form:lastName')" prop="LastName">
@@ -203,7 +203,8 @@ export default {
       userTypeEnumInt: 0,
       errorMsg: '',
       crcId: '',
-      craId: ''
+      craId: '',
+      loading:false
     }
   },
   mounted() {
@@ -211,13 +212,15 @@ export default {
   },
   methods: {
     async initForm() {
+      this.loading = true
+      await this.getUserType()
       Object.keys(this.data).forEach(key => {
         this.form[key] = this.data[key]
       })
       if (zzSessionStorage.getItem('userTypeEnumInt')) {
         this.userTypeEnumInt = zzSessionStorage.getItem('userTypeEnumInt') * 1
       }
-      this.getUserType()
+      this.loading = false
     },
     // 保存参与者信息
     handleSave() {
@@ -275,13 +278,16 @@ export default {
     },
     // 获取系统用户类型
     getUserType() {
-      getUserTypeList(3).then(res => {
-        this.userTypeOptions = res.Result
-        var crcObj = res.Result.find(i => i.UserTypeEnum === 2)
-        this.crcId = crcObj ? crcObj.Id : ''
-        var craObj = res.Result.find(i => i.UserTypeEnum === 9)
-        this.craId = craObj ? craObj.Id : ''
-      })
+      return new Promise(resolve => {
+        getUserTypeList(3).then(res => {
+          this.userTypeOptions = res.Result
+          var crcObj = res.Result.find(i => i.UserTypeEnum === 2)
+          this.crcId = crcObj ? crcObj.Id : ''
+          var craObj = res.Result.find(i => i.UserTypeEnum === 9)
+          this.craId = craObj ? craObj.Id : ''
+        })
+        resolve()
+      }).catch(() => { resolve() })
     },
     handleIsCorrectChange(val) {
       if (!val) {