From 0680bdf8059700bfd4c7fefc9c1e5f141af38c5d Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 25 Apr 2024 11:25:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=80=E9=98=85=E7=89=87=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AEbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading-unit/components/GlobalReading.vue | 12 +++++--
 .../setting/reading-unit/index.vue            | 35 ++++++++++++-------
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/GlobalReading.vue b/src/views/trials/trials-panel/setting/reading-unit/components/GlobalReading.vue
index fa57595a..b5619713 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/GlobalReading.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/GlobalReading.vue
@@ -215,7 +215,7 @@ export default {
           }
           this.isSign = res.Result.IsSign
         }
-        this.form.GlobalAssessTypeIdsStr = this.form.GlobalAssessTypeIds.map(v => this.$fd('GlobalAssessType', v, 'id')).toString()
+        // this.form.GlobalAssessTypeIdsStr = this.form.GlobalAssessTypeIds.map(v => this.$fd('GlobalAssessType', v, 'id')).toString()
         this.loading = false
       }).catch(() => {
         this.loading = false
@@ -223,11 +223,19 @@ export default {
     },
     handleSave(isPrompt) {
       return new Promise((resolve, reject) => {
-        this.$refs['globalReadingForm'].validate((valid) => {
+        this.$refs['globalReadingForm'].validate(async(valid) => {
           if (!valid) {
             resolve(false)
           } else {
             this.loading = true
+            if(this.form.GlobalAssessTypes.length === 0){
+              try{
+                let res = await getTrialConfigGlobalReadingInfo({ trialId: this.$route.query.trialId, TrialReadingCriterionId: this.trialReadingCriterionId })
+                this.form.GlobalAssessTypes = res.Result.GlobalAssessTypes
+              }catch(e){
+                console.log(e)
+              }
+            }
             // 保存配置信息
             this.form.TrialId = this.$route.query.trialId
             this.form.TrialReadingCriterionId = this.trialReadingCriterionId
diff --git a/src/views/trials/trials-panel/setting/reading-unit/index.vue b/src/views/trials/trials-panel/setting/reading-unit/index.vue
index f5272c33..a47453e9 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/index.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/index.vue
@@ -3,7 +3,7 @@
     <div v-if="isShow" class="content">
       <el-tabs v-model="TrialReadingCriterionId" type="border-card">
         <template v-for="item of trialCriterionList">
-          <el-tab-pane  v-if="isPaneShow" :key="item.TrialReadingCriterionId" :label="item.TrialReadingCriterionName" :name="item.TrialReadingCriterionId">
+          <el-tab-pane :key="item.TrialReadingCriterionId" :label="item.TrialReadingCriterionName" :name="item.TrialReadingCriterionId">
             <div style="text-align: right;padding-bottom: 10px">
               <!-- 同步当前标准 -->
               <el-button
@@ -17,7 +17,7 @@
                 {{ $t('trials:readingUnit:button:sync') }}
               </el-button>
             </div>
-            <el-collapse v-model="activeCollapse" class="setting-config">
+            <el-collapse v-model="activeCollapse" class="setting-config"  v-if="item.isPaneShow && item.TrialReadingCriterionId === TrialReadingCriterionId" >
               <!-- 阅片规则 -->
               <el-collapse-item :title="$t('trials:readingUnit:readingRules')" name="1">
                 <ReadingRules
@@ -142,13 +142,14 @@ export default {
   },
   watch: {
     async TrialReadingCriterionId(v) {
-      await this.asyncTrialCriterionDictionary(v)
-      let o = this.trialCriterionList.find(i => i.TrialReadingCriterionId === v)
-      this.CriterionType = o.CriterionType
-      this.isPaneShow = false
-      this.$nextTick(() => {
-        this.isPaneShow = true
-      })
+      // await this.asyncTrialCriterionDictionary(v)
+      // let i = this.trialCriterionList.findIndex(i => i.TrialReadingCriterionId === v)
+      // if(i === -1) return
+      // this.CriterionType = this.trialCriterionList[i].CriterionType
+      // this.trialCriterionList[i].isPaneShow = false
+      // this.$nextTick(() => {
+      //   this.trialCriterionList[i].isPaneShow = true
+      // })
     }
   },
   mounted() {
@@ -177,11 +178,14 @@ export default {
         signInfo: signInfo
       }
       resetAndAsyncCriterion(params).then(res => {
-        this.isPaneShow = false
+        this.loading = false
+        let i = this.trialCriterionList.findIndex(i => i.TrialReadingCriterionId === this.TrialReadingCriterionId)
+        if(i === -1) return
+        this.trialCriterionList[i].isPaneShow = false
         this.$nextTick(() => {
           this.signVisible2 = false
-          this.isPaneShow = true
-          this.loading = false
+          this.trialCriterionList[i].isPaneShow = true
+          
         })
       }).catch(() => {
         this.$refs['signForm2'].btnLoading = false
@@ -197,7 +201,12 @@ export default {
     },
     getTrialCriterionList() {
       getTrialCriterionList(this.trialId, false).then(async res => {
-        this.trialCriterionList = res.Result
+        this.trialCriterionList = res.Result.map(item=>{
+          return {
+            ...item,
+            isPaneShow: true,
+          }
+        })
         this.TrialReadingCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
         this.isShow = true
       }).catch(() => {