From db7498938f8bb5cda93420be3266241d59602623 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 28 Mar 2024 10:24:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enrolled-reviewers/list/index.vue         | 10 +++++-----
 .../trial-config/components/logicalConfig.vue | 19 +++++++++++--------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
index 59cb32cb..e097df4a 100644
--- a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
+++ b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
@@ -81,13 +81,13 @@
                 @change="(v) => {return isEnableChange(scope.row, v)}"
                 :disabled="!hasPermi(['trials:trials-panel:enrolled-reviewers:list:edit'])"
               />
-              <span>{{$fd('IsEnable', scope.row.IsEnable)}}</span>
+              <span> {{$fd('IsEnable', scope.row.IsEnable)}}</span>
             </div>
           </template>
         </el-table-column>
         <el-table-column
           v-for="ite of TrialReadingCriterionList"
-          :key="ite"
+          :key="ite.TrialReadingCriterionName"
           :label="ite.TrialReadingCriterionName"
           width="360"
           header-align="center"
@@ -99,7 +99,7 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <span v-for="item of scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}) ? scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).ReadingCategorys : []" :key="item">
+              <span v-for="item of scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}) ? scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).ReadingCategorys : []" :key="item.TrialReadingCriterionId">
                 <el-tag v-if="item === 1" type="primary">{{ $fd('ReadingCategory', item) + ' & ' + $fd('ReadingCategory', 2) }}</el-tag>
                 <!--              <el-tag v-if="item === 2" type="info">{{ $fd('ReadingCategory', item) }}</el-tag>-->
                 <el-tag v-if="item === 4" type="danger">{{ $fd('ReadingCategory', item) }}</el-tag>
@@ -127,8 +127,8 @@
                 @change="(v) => {return isConsistencyChange(scope.row, ite, v, true)}"
                 :disabled="!hasPermi(['trials:trials-panel:enrolled-reviewers:list:edit'])"
               />
-              <span v-if="scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).IsJoinAnalysis">{{$fd('YesOrNo', scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).IsJoinAnalysis)}}</span>
-              <span v-else>{{$fd('YesOrNo',false)}}</span>
+              <span v-if="scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).IsJoinAnalysis"> {{$fd('YesOrNo', scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).IsJoinAnalysis)}}</span>
+              <span v-else> {{$fd('YesOrNo',false)}}</span>
             </template>
           </el-table-column>
           <el-table-column
diff --git a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
index db472eea..9713d05a 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
@@ -727,7 +727,7 @@ export default {
   methods: {
     handleConfirmModality() {
       this.form.ModalityList = Object.assign([], this.selectedList.map(v => v.value))
-      this.form.ModalityListStr = this.form.ModalityList.toString().replaceAll(',', '|')
+      this.form.ModalityListStr = this.form.ModalityList.toString().replaceAll(',', ' | ')
       this.modalityListVisible = false
     },
     handleSelectionChange(val) {
@@ -781,7 +781,7 @@ export default {
       var bodyPartTypes = this.form.BodyPartTypeList.map(i => {
         return this.$fd('Bodypart', i)
       })
-      this.form.BodyPartTypes = bodyPartTypes.toString().replaceAll(',', '|')
+      this.form.BodyPartTypes = bodyPartTypes.toString().replaceAll(',', ' | ')
       this.bodyPartListVisible = false
     },
     // 配置信息保存
@@ -791,7 +791,7 @@ export default {
         this.loading = true
         // 保存配置信息
         var params = Object.assign({}, this.form)
-        params.BodyPartTypes = this.form.BodyPartTypeList.toString().replaceAll(',', '|')
+        params.BodyPartTypes = this.form.BodyPartTypeList.toString().replaceAll(',', ' | ')
         configTrialBasicInfo(params).then(res => {
           this.loading = false
           if (res.IsSuccess) {
@@ -842,7 +842,7 @@ export default {
         this.btnLoading = true
         // 保存配置信息
         var params = Object.assign({}, this.form)
-        params.BodyPartTypes = this.form.BodyPartTypeList.toString().replaceAll(',', '|')
+        params.BodyPartTypes = this.form.BodyPartTypeList.toString().replaceAll(',', ' | ')
         configTrialBasicInfo(params).then(res => {
           this.btnLoading = false
           if (res.IsSuccess) {
@@ -865,7 +865,7 @@ export default {
     signConfirm(signInfo) {
       this.loading = true
       var obj = Object.assign({}, this.form)
-      obj.BodyPartTypes = this.form.BodyPartTypeList.toString().replaceAll(',', '|')
+      obj.BodyPartTypes = this.form.BodyPartTypeList.toString().replaceAll(',', ' | ')
       const params = {
         data: obj,
         signInfo: signInfo
@@ -978,12 +978,12 @@ export default {
           this.form[k] = res[k]
         }
       }
-      this.form.ModalityListStr = this.form.ModalityList.toString().replaceAll(',', '|')
-      this.form.BodyPartTypeList = this.form.BodyPartTypes.split('|')
+      this.form.ModalityListStr = this.form.ModalityList.toString().replaceAll(',', ' | ')
+      this.form.BodyPartTypeList = this.form.BodyPartTypes.split(' | ')
       var bodyPartTypes = this.form.BodyPartTypeList.map(i => {
         return this.$fd('Bodypart', i)
       })
-      this.form.BodyPartTypes = bodyPartTypes.toString().replaceAll(',', '|')
+      this.form.BodyPartTypes = bodyPartTypes.toString().replaceAll(',', ' | ')
       // this.form.ClinicalDataSetNamesStr = this.form.ClinicalDataSetNames.join(', ')
       this.initialForm = { ...this.form }
       this.loading = false
@@ -1104,5 +1104,8 @@ export default {
   .fontColor{
     color: red;
   }
+  ::v-deep .el-table__header-wrapper .el-checkbox {
+    display: none !important;
+  }
 }
 </style>