From 3b7f1419569ac2498bd142fa73c567064d5d25b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Wed, 13 Mar 2024 14:28:09 +0800
Subject: [PATCH 01/18] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-workbench/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index 5abed804..1ae096cd 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -74,7 +74,7 @@
                   {{ user.LastName }}
                 </div>
                 <div class="user-description" style="">
-                  <div style="font-size: .875rem;color: #333;line-height: 22px;display: flex;margin-bottom: 0.25rem;"><span style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;max-width: 75px">{{user.RealName}}</span></div>
+                  <div style="font-size: .875rem;color: #333;line-height: 22px;display: flex;margin-bottom: 0.25rem;"><span style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;max-width: 150px">{{user.RealName}}</span></div>
                   <div style="font-size: .75rem;line-height: 18px;color:#999">{{new Date().getFullYear()}}{{$t('common:date:today')}}{{new Date().getMonth() + 1}}{{$t('common:date:month')}}{{new Date().getDate()}}{{$t('common:date:day')}}，{{ dayOfWeek }}</div>
                 </div>
               </div>

From d131953bebd81a105b9f63dc8b1aa54d59095d42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Wed, 13 Mar 2024 14:45:43 +0800
Subject: [PATCH 02/18] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/GroupConsistentRuleSubjectTable.vue          | 3 ++-
 src/views/trials/trials-workbench/index.vue                 | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/components/GroupConsistentRuleSubjectTable.vue b/src/views/trials/trials-panel/reading/consistency-analysis/components/GroupConsistentRuleSubjectTable.vue
index 44283154..973b72c6 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/components/GroupConsistentRuleSubjectTable.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/components/GroupConsistentRuleSubjectTable.vue
@@ -157,7 +157,8 @@ export default {
       var params = {
         TrialId: this.$route.query.trialId,
         SubejctIdList: this.SelectList.map(v => v.SubjectId),
-        IsAutoAllocateGenerateTask: IsAutoAllocateGenerateTask
+        IsAutoAllocateGenerateTask: IsAutoAllocateGenerateTask,
+        TrialReadingCriterionId: this.TrialReadingCriterionId
       }
       confirmGenerateGroupConsistentTask(params).then(res => {
         this.loading = false
diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index 1ae096cd..fcd0f9ae 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -70,7 +70,7 @@
           <div style="padding: 12px">
             <div class="user-profile-wrapper" style="padding: 24px 0 24px 12px;">
               <div style="display: flex;align-items: center;margin-bottom: 20px;" class="user-info">
-                <div style="margin-right: 0.75rem;background: #428bca;width: 44px;height: 44px;border-radius: 50%;line-height: 44px;text-align: center;font-size: 12px;color:#fff;">
+                <div style="margin-right: 0.75rem;background: #428bca;width: 44px;height: 44px;border-radius: 50%;line-height: 44px;text-align: center;font-size: 12px;color:#fff;overflow: hidden">
                   {{ user.LastName }}
                 </div>
                 <div class="user-description" style="">
@@ -98,7 +98,7 @@
 <!--              </div>-->
 <!--            </div>-->
             <div class="thy-divider" style="border-top: 1px solid #eee;margin: 0;"></div>
-            <div class="my_select_title">{{ $t('trials:workbench:title:padding') }}</div>
+            <div class="my_select_title" style="font-size: 18px">{{ $t('trials:workbench:title:padding') }}</div>
             <div class="my_select">
               <!-- PM/APM -->
               <!-- 阅片期 -->
@@ -227,7 +227,7 @@
               </div>
             </div>
             <div class="thy-divider" style="border-top: 1px solid #eee;margin: 0;"></div>
-            <div class="my_select_title">{{ $t('trials:workbench:title:my') }}</div>
+            <div class="my_select_title" style="font-size: 18px">{{ $t('trials:workbench:title:my') }}</div>
             <div class="my_select">
               <!-- 项目已签署文件 -->
               <div class="my_select_box" :class="{selected: selected === 'NeedSignedTrialDoc'}" tab-data="NeedSignedTrialDoc" @click="selected = 'NeedSignedTrialDoc'" v-if="!hasPermi(['role:zys'])">

From c73c84b15d93a74fb05a377c8fff7a58e2237a7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Wed, 13 Mar 2024 15:49:48 +0800
Subject: [PATCH 03/18] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/GroupConsistentRuleSubjectTable.vue        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/components/GroupConsistentRuleSubjectTable.vue b/src/views/trials/trials-panel/reading/consistency-analysis/components/GroupConsistentRuleSubjectTable.vue
index 973b72c6..01a41c65 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/components/GroupConsistentRuleSubjectTable.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/components/GroupConsistentRuleSubjectTable.vue
@@ -64,7 +64,7 @@
         >
           {{ $t('common:button:cancel') }}
         </el-button>
-        <el-button size="small" type="primary" :loading="btnLoading" @click="save(true)">
+        <el-button size="small" type="primary" :disabled="!IsAllowAutoAllocate" :loading="btnLoading" @click="save(true)">
           {{$t('trials:grouptConsistencyAnalysis:button:RandomCreate')}}
         </el-button>
         <!-- 生成 -->
@@ -129,7 +129,8 @@ export default {
       loading: false,
       trialId: this.$route.query.trialId,
       SelectList: [],
-      btnLoading: false
+      btnLoading: false,
+      IsAllowAutoAllocate: true
     }
   },
   mounted() {
@@ -177,11 +178,12 @@ export default {
       this.loading = true
       this.searchData.TrialReadingCriterionId = this.TrialReadingCriterionId
       getGroupConsistentRuleSubjectList(this.searchData).then(res => {
-        if (res.OtherInfo) {
+        if (res.OtherInfo.Rule) {
           this.$emit('setReaderRulesFormVisible', false)
         } else {
           this.$emit('setReaderRulesFormVisible', true)
         }
+        this.IsAllowAutoAllocate = res.OtherInfo.IsAllowAutoAllocate
         this.loading = false
         this.list = res.Result.CurrentPageData
         this.total = res.Result.TotalCount

From ccf5830fa0aea78facefcb962fdcc0da25c8e865 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Wed, 13 Mar 2024 16:21:49 +0800
Subject: [PATCH 04/18] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/consistency-analysis/components/VirtualCenter.vue  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/components/VirtualCenter.vue b/src/views/trials/trials-panel/reading/consistency-analysis/components/VirtualCenter.vue
index ad435593..1f02ceca 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/components/VirtualCenter.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/components/VirtualCenter.vue
@@ -128,6 +128,9 @@ export default {
           this.loading = false
           this.$emit('getList')
           this.$emit('close')
+        }).catch(() => {
+          this.loading = false
+          this.btnLoading = false
         })
       })
     },

From 56a8e738d386b851f923324b353573f4b8df5794 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Wed, 13 Mar 2024 16:38:33 +0800
Subject: [PATCH 05/18] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/trials.js                               |  9 +++++++++
 .../setting/medical-audit/index.vue             | 17 +++++++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/api/trials.js b/src/api/trials.js
index 7a33e701..5d554956 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -3608,4 +3608,13 @@ export function getTrialSignDocumentList(param) {
   })
 }
 
+export function verifyIsCanConfirm(param) {
+  return request({
+    url: `/ReadingMedicineQuestion/verifyIsCanConfirm`,
+    method: 'post',
+    data: param
+  })
+}
+
+
 
diff --git a/src/views/trials/trials-panel/setting/medical-audit/index.vue b/src/views/trials/trials-panel/setting/medical-audit/index.vue
index f031f933..a84ac8b8 100644
--- a/src/views/trials/trials-panel/setting/medical-audit/index.vue
+++ b/src/views/trials/trials-panel/setting/medical-audit/index.vue
@@ -323,7 +323,7 @@
   </box-content>
 </template>
 <script>
-import { batchDeteteCriterionMedicineQuestion, getReadingMedicineTrialQuestionList, deleteReadingMedicineTrialQuestion, confirmReadingMedicineQuestion, verifyReadingMedicineQuestion } from '@/api/trials'
+import { batchDeteteCriterionMedicineQuestion, getReadingMedicineTrialQuestionList, deleteReadingMedicineTrialQuestion, confirmReadingMedicineQuestion, verifyReadingMedicineQuestion, verifyIsCanConfirm } from '@/api/trials'
 import { getTrialCriterionList } from '@/api/trials/reading'
 import BoxContent from '@/components/BoxContent'
 import DefaultQS from './components/DefaultQsLang'
@@ -489,11 +489,16 @@ export default {
         return
       }
       this.loading = true
-      verifyReadingMedicineQuestion({ trialId: this.trialId, TrialReadingCriterionId: this.trialReadingCriterionId }).then(res => {
-        this.loading = false
-        const { MedicalAuditConfirmation } = const_.processSignature
-        this.signCode = MedicalAuditConfirmation
-        this.signVisible = true
+      verifyIsCanConfirm({
+        TrialReadingCriterionId: this.trialReadingCriterionId
+      }).then(res => {
+        console.log(res)
+        verifyReadingMedicineQuestion({ trialId: this.trialId, TrialReadingCriterionId: this.trialReadingCriterionId }).then(res => {
+          this.loading = false
+          const { MedicalAuditConfirmation } = const_.processSignature
+          this.signCode = MedicalAuditConfirmation
+          this.signVisible = true
+        }).catch(() => { this.loading = false })
       }).catch(() => { this.loading = false })
     },
     // 关闭签名框并设置确认状态

From 78685918a9ce667146edee5ca1b168dc10f1c44a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Wed, 13 Mar 2024 17:50:33 +0800
Subject: [PATCH 06/18] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setting/visit-plan/components/visitPlanForm.vue       | 4 ++--
 .../trials/trials-panel/setting/visit-plan/index.vue      | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/visit-plan/components/visitPlanForm.vue b/src/views/trials/trials-panel/setting/visit-plan/components/visitPlanForm.vue
index 1e143e79..81b47015 100644
--- a/src/views/trials/trials-panel/setting/visit-plan/components/visitPlanForm.vue
+++ b/src/views/trials/trials-panel/setting/visit-plan/components/visitPlanForm.vue
@@ -120,8 +120,8 @@ export default {
         Description: '',
         IsBaseLine: false,
         // BlindName: '',
-        VisitWindowLeft: -3,
-        VisitWindowRight: 3,
+        VisitWindowLeft: -5,
+        VisitWindowRight: 5,
         IsConfirmed: false,
         IsDeleted: false,
         IsHaveFirstConfirmed: false
diff --git a/src/views/trials/trials-panel/setting/visit-plan/index.vue b/src/views/trials/trials-panel/setting/visit-plan/index.vue
index 19539b68..783c2bd4 100644
--- a/src/views/trials/trials-panel/setting/visit-plan/index.vue
+++ b/src/views/trials/trials-panel/setting/visit-plan/index.vue
@@ -103,7 +103,7 @@
         >
           <template slot-scope="scope">
             <span v-show="scope.row.VisitWindowLeft!==0 || scope.row.VisitWindowRight!==0">
-              {{ `${scope.row.VisitWindowLeft}${$t('trials:visitPlan:table:day')} ~ ${scope.row.VisitWindowRight}${$t('trials:visitPlan:table:day')}` }}
+              {{ `${scope.row.VisitWindowLeft} ${$t('trials:visitPlan:table:day')} ~ ${scope.row.VisitWindowRight} ${$t('trials:visitPlan:table:day')}` }}
             </span>
           </template>
         </el-table-column>
@@ -286,7 +286,7 @@ export default {
         })
     },
     handleAdd() {
-      this.row = { TrialId: this.trialId, Id: '', IsBaseLine: false, BlindName: '', VisitWindowLeft: -3, VisitWindowRight: 3, Description: '' }
+      this.row = { TrialId: this.trialId, Id: '', IsBaseLine: false, BlindName: '', VisitWindowLeft: -5, VisitWindowRight: 5, Description: '' }
       this.timer = new Date().getTime()
       if (this.list.length === 0) {
         this.row.VisitName = 'Baseline'
@@ -300,6 +300,10 @@ export default {
         this.row.VisitName = this.list[this.list.length - 1].VisitName.split(' ')[0] + ' ' + (this.list[this.list.length - 1].VisitNum + 1)
         this.row.VisitNum = this.list[this.list.length - 1].VisitNum + 1
         this.row.VisitDay = this.list[this.list.length - 1].VisitDay - this.list[this.list.length - 2].VisitDay + this.list[this.list.length - 1].VisitDay
+        if (this.list[this.list.length - 1].VisitWindowLeft && this.list[this.list.length - 1].VisitWindowRight) {
+          this.row.VisitWindowLeft = this.list[this.list.length - 1].VisitWindowLeft
+          this.row.VisitWindowRight = this.list[this.list.length - 1].VisitWindowRight
+        }
       }
       this.visit_model.title = this.$t('common:button:add')
       this.visit_model.visible = true

From 68ea60857d5887e9c7e9bc8833b1f6dcd1961f56 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 14 Mar 2024 09:27:06 +0800
Subject: [PATCH 07/18] =?UTF-8?q?ea=E6=9D=83=E9=99=90=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attachments/SPMEnrollment/components/Approval.vue           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/trials/trials-panel/attachments/SPMEnrollment/components/Approval.vue b/src/views/trials/trials-panel/attachments/SPMEnrollment/components/Approval.vue
index 744192bc..481a3f4c 100644
--- a/src/views/trials/trials-panel/attachments/SPMEnrollment/components/Approval.vue
+++ b/src/views/trials/trials-panel/attachments/SPMEnrollment/components/Approval.vue
@@ -8,6 +8,7 @@
           type="primary"
           :disabled="approveIdArr.length==0"
           @click="handleApprove()"
+          v-hasPermi="['trials:trials-panel:attachments:SPMEnrollment:button-agree']"
         >
           {{ $t('trials:seletctedReviews:button:approve') }}
         </el-button>
@@ -110,6 +111,7 @@
             />
             <!-- 同意 -->
             <el-button
+              v-hasPermi="['trials:trials-panel:attachments:SPMEnrollment:button-agree']"
               :disabled="scope.row.DoctorTrialState === 8"
               icon="el-icon-check"
               circle

From 157b65c507f1afd23b74821351318db3595acf30 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 14 Mar 2024 10:23:26 +0800
Subject: [PATCH 08/18] =?UTF-8?q?ea=E3=80=81qa=E6=9D=83=E9=99=90=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enrolled-reviewers/list/index.vue         | 23 ++++++++++++++-----
 .../reading/pm-medical-feedback/index.vue     |  3 +++
 2 files changed, 20 insertions(+), 6 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 ef65591c..820f29da 100644
--- a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
+++ b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
@@ -29,6 +29,7 @@
           width="150"
           prop="FirstName"
           sortable="custom"
+          v-if="!hasPermi(['role:ea'])"
         >
           <template slot-scope="scope">
             <el-button type="text" @click="go(`/trialsResume?doctorId=${scope.row.DoctorId}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</el-button>
@@ -39,6 +40,7 @@
           prop="ChineseName"
           sortable="custom"
           :label="$t('trials:enrolledReviews:table:nameCN')"
+          v-if="!hasPermi(['role:ea'])"
           width="120"
           show-overflow-tooltip
         />
@@ -46,7 +48,7 @@
         <el-table-column
           prop="UserName"
           :label="$t('trials:enrolledReviews:table:userName')"
-          width="150"
+          :width="hasPermi(['role:ea'])?300:150"
           sortable="custom"
           show-overflow-tooltip
         />
@@ -54,7 +56,7 @@
         <el-table-column
           prop="EnrollTimeStr"
           :label="$t('trials:enrolledReviews:table:enrollmentTime')"
-          width="200"
+          :width="hasPermi(['role:ea'])?320:200"
           sortable="custom"
           show-overflow-tooltip
         >
@@ -77,6 +79,7 @@
                 :active-value="true"
                 :inactive-value="false"
                 @change="(v) => {return isEnableChange(scope.row, v)}"
+                :disabled="!hasPermi(['trials:trials-panel:enrolled-reviewers:list:edit'])"
               />
               <span>{{$fd('IsEnable', scope.row.IsEnable)}}</span>
             </div>
@@ -84,6 +87,7 @@
         </el-table-column>
         <el-table-column
           v-for="ite of TrialReadingCriterionList"
+          :key="ite"
           :label="ite.TrialReadingCriterionName"
           width="360"
           header-align="center"
@@ -95,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 : []">
+              <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">
                 <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>
@@ -121,6 +125,7 @@
                 :active-value="true"
                 :inactive-value="false"
                 @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>
@@ -253,9 +258,15 @@
           default-first-option
           style="width: 70%"
         >
-          <el-option v-for="item of $d.ReadingCategory" v-if="item.value === 1" :key="item.id" :value="1" :label="$fd('ReadingCategory', 1) + ' & ' + $fd('ReadingCategory', 2)" />
-          <el-option v-for="item of $d.ReadingCategory" v-if="item.value === 4 && IsArbitrationReading" :key="item.id" :value="item.value" :label="$fd('ReadingCategory', 4)" />
-          <el-option v-for="item of $d.ReadingCategory" v-if="item.value === 5 && IsOncologyReading" :key="item.id" :value="item.value" :label="$fd('ReadingCategory', 5)" />
+          <template v-for="item of $d.ReadingCategory">
+            <el-option  v-if="item.value === 1" :key="item.id" :value="1" :label="$fd('ReadingCategory', 1) + ' & ' + $fd('ReadingCategory', 2)" /> 
+          </template>
+          <template v-for="item of $d.ReadingCategory">
+            <el-option  v-if="item.value === 4 && IsArbitrationReading" :key="item.id" :value="item.value" :label="$fd('ReadingCategory', 4)" />
+          </template>
+          <template v-for="item of $d.ReadingCategory">
+            <el-option  v-if="item.value === 5 && IsOncologyReading" :key="item.id" :value="item.value" :label="$fd('ReadingCategory', 5)" />
+          </template>
         </el-select>
       </template>
       <template slot="dialog-footer">
diff --git a/src/views/trials/trials-panel/reading/pm-medical-feedback/index.vue b/src/views/trials/trials-panel/reading/pm-medical-feedback/index.vue
index 410ea666..b3319fc4 100644
--- a/src/views/trials/trials-panel/reading/pm-medical-feedback/index.vue
+++ b/src/views/trials/trials-panel/reading/pm-medical-feedback/index.vue
@@ -355,6 +355,7 @@
               circle
               :title="$t('trials:pmMedicalReview:action:failure')"
               :disabled="scope.row.IsInvalid || !!scope.row.AuditSignTime"
+              v-hasPermi="['trials:trials-panel:reading:pm-medical-feedback:failure']"
               icon="el-icon-close"
               @click="setMedicalReviewInvalid(scope.row)"
             />
@@ -363,6 +364,7 @@
               :title="$t('trials:pmMedicalReview:action:assign')"
               :disabled="!!scope.row.MedicalManagerUser || scope.row.IsInvalid || !!scope.row.AuditSignTime"
               icon="el-icon-thumb"
+              v-hasPermi="['trials:trials-panel:reading:pm-medical-feedback:assign']"
               @click="assignMedicalReviewTask(scope.row, 1)"
             />
             <el-button
@@ -370,6 +372,7 @@
               :title="$t('trials:pmMedicalReview:action:cancelAssign')"
               :disabled="!scope.row.MedicalManagerUser || scope.row.IsInvalid || !!scope.row.AuditSignTime"
               icon="el-icon-refresh-left"
+              v-hasPermi="['trials:trials-panel:reading:pm-medical-feedback:cancelAssign']"
               @click="assignMedicalReviewTask(scope.row, 3)"
             />
           </template>

From 84ade87b25047ecc4eab68d1533567d029825561 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 14 Mar 2024 10:59:42 +0800
Subject: [PATCH 09/18] =?UTF-8?q?=E3=80=90=E9=98=85=E7=89=87=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=88=86=E9=85=8D=E3=80=91=E5=A2=9E=E5=8A=A0=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/read-task-allocation/index.vue    | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/read-task-allocation/index.vue b/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
index 4bc4568c..6efe208d 100644
--- a/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
+++ b/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
@@ -7,7 +7,7 @@
           <div slot="search-container">
             <el-form :inline="true">
               <el-form-item :label="$t('trials:reviewAssign:table:siteCode')">
-                <el-select v-model="searchData.SiteId" clearable filterable style="width:120px;">
+                <el-select v-model="searchData.SiteId" clearable filterable style="width:240px;">
                   <el-option
                     v-for="(item,index) of siteOptions"
                     :key="'taskSearchData' + index"
@@ -18,13 +18,25 @@
               </el-form-item>
               <!-- 受试者编号 -->
               <el-form-item :label="$t('trials:reviewAssign:table:subjectCode')">
-                <el-input v-model="searchData.SubjectCode" style="width:100px;" />
+                <el-input v-model="searchData.SubjectCode" style="width:240px;" />
               </el-form-item>
               <!-- 阅片人 -->
               <el-form-item :label="$t('trials:reviewAssign:searchForm:reader')">
-                <el-select v-model="searchData.DoctorUserId" clearable style="width:120px;">
+                <el-select v-model="searchData.DoctorUserId" clearable style="width:240px;">
                   <el-option v-for="item of DoctorUserList" :key="'taskSearchData' + item.DoctorUserId" :value="item.DoctorUserId" :label="`${item.UserName}(${item.FullName})`" />
                 </el-select>
+              </el-form-item>
+                <!-- 分配状态 -->
+              <el-form-item :label="$t('trials:reviewAssign:searchForm:status')">
+                <el-select v-model="searchData.SubjectAllocateState" clearable style="width:240px;">
+                  <el-option v-for="item of $d.SubjectAllocateState" :key=" item.id" :value="item.value" :label="item.label" />
+                </el-select>
+              </el-form-item>
+                <!-- 分配角色 -->
+              <el-form-item :label="$t('trials:reviewAssign:searchForm:role')">
+                <el-select v-model="searchData.ArmList" clearable style="width:240px;" multiple>
+                  <el-option v-for="item of $d.ArmEnum" :key="item.id" :value="item.value" :label="item.label" />
+                </el-select>
               </el-form-item>
               <!-- 查询 -->
               <el-form-item>
@@ -514,7 +526,9 @@ const taskSearchDataDefault = () => {
     ReadingCategory: null,
     TaskAllocationState: null,
     BeginAllocateDate: null,
-    EndAllocateDate: null
+    EndAllocateDate: null,
+    SubjectAllocateState:null,
+    ArmList:[]
   }
 }
 export default {

From 37c415c0efafa95840fb0785d7c25b35d43f2dfb Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 14 Mar 2024 11:09:48 +0800
Subject: [PATCH 10/18] =?UTF-8?q?=E3=80=90=E9=98=85=E7=89=87=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=88=86=E9=85=8D=E3=80=91=E5=A2=9E=E5=8A=A0=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/read-task-allocation/index.vue         | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/read-task-allocation/index.vue b/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
index 6efe208d..c0597784 100644
--- a/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
+++ b/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
@@ -34,7 +34,7 @@
               </el-form-item>
                 <!-- 分配角色 -->
               <el-form-item :label="$t('trials:reviewAssign:searchForm:role')">
-                <el-select v-model="searchData.ArmList" clearable style="width:240px;" multiple>
+                <el-select v-model="searchData.ArmList" clearable style="width:240px;" multiple :disabled="!searchData.SubjectAllocateState">
                   <el-option v-for="item of $d.ArmEnum" :key="item.id" :value="item.value" :label="item.label" />
                 </el-select>
               </el-form-item>
@@ -506,7 +506,9 @@ const searchDataDefault = () => {
     DoctorUserId: null,
     IsHaveAssigned: null,
     IsAssignConfirmed: null,
-    TrialReadingCriterionId: null
+    TrialReadingCriterionId: null,
+    SubjectAllocateState:null,
+    ArmList:[]
   }
 }
 const taskSearchDataDefault = () => {
@@ -599,6 +601,14 @@ export default {
       if (v) {
         this.getList()
       }
+    },
+    "searchData.SubjectAllocateState":{
+      handler(){
+        if(!this.searchData.SubjectAllocateState){
+          this.searchData.ArmList = [];
+        }
+      },
+      // immediate:true
     }
   },
   mounted() {

From 46ea20a9f5f65dc823491f0c165b58e466a35e58 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 14 Mar 2024 13:49:38 +0800
Subject: [PATCH 11/18] =?UTF-8?q?=E3=80=90=E9=98=85=E7=89=87=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=88=86=E9=85=8D=E3=80=91=E5=A2=9E=E5=8A=A0=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6=EF=BC=8C=E5=8F=96=E6=B6=88=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/read-task-allocation/index.vue     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/read-task-allocation/index.vue b/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
index c0597784..3518df45 100644
--- a/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
+++ b/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
@@ -34,7 +34,7 @@
               </el-form-item>
                 <!-- 分配角色 -->
               <el-form-item :label="$t('trials:reviewAssign:searchForm:role')">
-                <el-select v-model="searchData.ArmList" clearable style="width:240px;" multiple :disabled="!searchData.SubjectAllocateState">
+                <el-select v-model="searchData.ArmList" clearable style="width:240px;" multiple>
                   <el-option v-for="item of $d.ArmEnum" :key="item.id" :value="item.value" :label="item.label" />
                 </el-select>
               </el-form-item>
@@ -602,14 +602,14 @@ export default {
         this.getList()
       }
     },
-    "searchData.SubjectAllocateState":{
-      handler(){
-        if(!this.searchData.SubjectAllocateState){
-          this.searchData.ArmList = [];
-        }
-      },
-      // immediate:true
-    }
+    // "searchData.SubjectAllocateState":{
+    //   handler(){
+    //     if(!this.searchData.SubjectAllocateState){
+    //       this.searchData.ArmList = [];
+    //     }
+    //   },
+    //   // immediate:true
+    // }
   },
   mounted() {
     this.getDoctorUserSelectList()

From eadd5b022311aff47facbf928317bacc76420506 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 14 Mar 2024 13:54:16 +0800
Subject: [PATCH 12/18] =?UTF-8?q?spm=E9=98=85=E7=89=87=E4=BA=BA=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attachments/SPMEnrollment/components/Approval.vue           | 2 +-
 .../trials/trials-panel/attachments/SPMEnrollment/index.vue     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/attachments/SPMEnrollment/components/Approval.vue b/src/views/trials/trials-panel/attachments/SPMEnrollment/components/Approval.vue
index 481a3f4c..25938b70 100644
--- a/src/views/trials/trials-panel/attachments/SPMEnrollment/components/Approval.vue
+++ b/src/views/trials/trials-panel/attachments/SPMEnrollment/components/Approval.vue
@@ -62,7 +62,7 @@
           min-width="120"
         >
           <template slot-scope="scope">
-            {{ scope.row.SubspecialityIds.map(v => {return $fd('Subspeciality', v, 'id')}).toString() }}
+            {{ scope.row.SubspecialityIds.map(v => {return $fd('Subspeciality', v, 'id')}).join(", ") }}
           </template>
         </el-table-column>
         <el-table-column
diff --git a/src/views/trials/trials-panel/attachments/SPMEnrollment/index.vue b/src/views/trials/trials-panel/attachments/SPMEnrollment/index.vue
index 5f92e8f6..e15c62e7 100644
--- a/src/views/trials/trials-panel/attachments/SPMEnrollment/index.vue
+++ b/src/views/trials/trials-panel/attachments/SPMEnrollment/index.vue
@@ -39,7 +39,7 @@
           </div>
           <div class="div-col">
             <label class="el-label">{{ $t('trials:trials-list:form:typeofReviewers:') }}</label>
-            <span>{{ trialInfo.AttendedReviewerTypeEnumList.map(v => $fd('AttendedReviewerType', v)).toString() }}</span>
+            <span>{{ trialInfo.AttendedReviewerTypeEnumList.map(v => $fd('AttendedReviewerType', v)).join(", ") }}</span>
             <!--            <span>{{ $fd('AttendedReviewerType', trialInfo.AttendedReviewerType) }}</span>-->
           </div>
           <div class="div-col">

From 145655f8fc735f63a3ccce1ddc22923d8f450d52 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 14 Mar 2024 14:09:03 +0800
Subject: [PATCH 13/18] =?UTF-8?q?spm=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=AD=E5=BF=83=E8=B0=83=E7=A0=94=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-workbench/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index fcd0f9ae..6deb05af 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -123,7 +123,7 @@
                 </div>
               </div>
               <!-- 中心调研 -->
-              <div class="my_select_box" :class="{selected: selected === 'SiteResearch'}" tab-data="SiteResearch" @click="selected = 'SiteResearch'" v-if="hasPermi(['trials:trials-workbench:reviewerScreen'])">
+              <div class="my_select_box" :class="{selected: selected === 'SiteResearch'}" tab-data="SiteResearch" @click="selected = 'SiteResearch'" v-if="hasPermi(['trials:trials-workbench:attachments:site-research'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-edit-outline" style="padding: 4px;margin: 4px;color: #6698ff"></span>
                   <span class="my_select_box_content_text">{{ $t('trials:workbench:title:pendingSiteResearch') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.PM_SiteSurveryCount }}</span>

From 7f9589427f06a5e03b0ff06e1ac9c99c7fde04dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Thu, 14 Mar 2024 14:11:51 +0800
Subject: [PATCH 14/18] =?UTF-8?q?=E4=B8=80=E8=87=B4=E6=80=A7=E6=A0=B8?=
 =?UTF-8?q?=E6=9F=A5=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials/trials-panel/enrolled-reviewers/list/index.vue      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 820f29da..59cb32cb 100644
--- a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
+++ b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
@@ -497,7 +497,7 @@ export default {
           return {
             EnrollId: v.EnrollId,
             TrialReadingCriterionId: v.TrialReadingCriterionId,
-            IsJoinAnalysis: false
+            IsJoinAnalysis: value
           }
         })
       }
@@ -505,6 +505,7 @@ export default {
         if (showMessage) {
           this.$message.success(this.$t('trials:enrolledReviews:message:batchSetCriterionJoinJoinAnalysis1'))
         }
+        this.initPage()
       })
     },
     go(path) {

From dfaa2554276828ac45555b01ca820c3d7cbdc5c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Thu, 14 Mar 2024 14:39:25 +0800
Subject: [PATCH 15/18] =?UTF-8?q?IQC=E5=8E=BB=E9=99=A4=E8=AF=AD=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setting/qc-question/components/QsForm.vue | 36 +++++++------
 .../setting/qc-question/index.vue             | 54 +++++++++----------
 2 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/qc-question/components/QsForm.vue b/src/views/trials/trials-panel/setting/qc-question/components/QsForm.vue
index a3b5886a..df5d19b2 100644
--- a/src/views/trials/trials-panel/setting/qc-question/components/QsForm.vue
+++ b/src/views/trials/trials-panel/setting/qc-question/components/QsForm.vue
@@ -17,21 +17,21 @@
           v-model="form.QuestionName"
         />
       </el-form-item>
-      <el-form-item
-        :label="$t('common:title:languageType')"
-        prop="LanguageType"
-      >
-        <el-select
-          v-model="form.LanguageType"
-        >
-          <el-option
-            v-for="item of $d.LanguageType"
-            :key="item.value"
-            :value="item.value"
-            :label="item.label"
-          />
-        </el-select>
-      </el-form-item>
+<!--      <el-form-item-->
+<!--        :label="$t('common:title:languageType')"-->
+<!--        prop="LanguageType"-->
+<!--      >-->
+<!--        <el-select-->
+<!--          v-model="form.LanguageType"-->
+<!--        >-->
+<!--          <el-option-->
+<!--            v-for="item of $d.LanguageType"-->
+<!--            :key="item.value"-->
+<!--            :value="item.value"-->
+<!--            :label="item.label"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <!-- 类型 -->
       <el-form-item
         :label="$t('trials:qcCfg:table:type')"
@@ -223,6 +223,7 @@ export default {
   mounted() {
     this.trialId = this.$route.query.trialId
     this.initForm()
+
   },
   methods: {
     async initForm() {
@@ -236,6 +237,11 @@ export default {
           this.parentTriggerValOptions = this.parentOptions[index].TypeValue.split('|')
         }
       }
+      if (this.$i18n.locale === 'zh') {
+        this.form.LanguageType = 0
+      } else {
+        this.form.LanguageType = 1
+      }
       if (Object.keys(this.data).length > 0) {
         for (const k in this.form) {
           if (this.data.hasOwnProperty(k)) {
diff --git a/src/views/trials/trials-panel/setting/qc-question/index.vue b/src/views/trials/trials-panel/setting/qc-question/index.vue
index 88fe8759..a0d8800e 100644
--- a/src/views/trials/trials-panel/setting/qc-question/index.vue
+++ b/src/views/trials/trials-panel/setting/qc-question/index.vue
@@ -8,23 +8,23 @@
           <el-input v-model="searchData.QuestionName" clearable style="width:120px;" />
         </el-form-item>
         <!-- 语言类型 -->
-        <el-form-item
-          :label="$t('common:title:languageType')"
-          style="margin-top: 10px"
-        >
-          <el-select
-            v-model="searchData.LanguageType"
-            clearable
-            style="width:120px;"
-          >
-            <el-option
-              v-for="item of $d.LanguageType"
-              :key="item.value"
-              :value="item.value"
-              :label="item.label"
-            />
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item-->
+<!--          :label="$t('common:title:languageType')"-->
+<!--          style="margin-top: 10px"-->
+<!--        >-->
+<!--          <el-select-->
+<!--            v-model="searchData.LanguageType"-->
+<!--            clearable-->
+<!--            style="width:120px;"-->
+<!--          >-->
+<!--            <el-option-->
+<!--              v-for="item of $d.LanguageType"-->
+<!--              :key="item.value"-->
+<!--              :value="item.value"-->
+<!--              :label="item.label"-->
+<!--            />-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <!-- 类型 -->
         <el-form-item :label="$t('trials:qcCfg:table:type')" style="margin-top: 10px">
           <el-select v-model="searchData.Type" clearable style="width:120px;">
@@ -120,16 +120,16 @@
         show-overflow-tooltip
       />
       <!-- 审核问题 -->
-      <el-table-column
-        prop="LanguageType"
-        :label="$t('common:title:languageType')"
-        show-overflow-tooltip
-        width="100"
-      >
-        <template slot-scope="scope">
-          {{ $fd('LanguageType', scope.row.LanguageType) }}
-        </template>
-      </el-table-column>
+<!--      <el-table-column-->
+<!--        prop="LanguageType"-->
+<!--        :label="$t('common:title:languageType')"-->
+<!--        show-overflow-tooltip-->
+<!--        width="100"-->
+<!--      >-->
+<!--        <template slot-scope="scope">-->
+<!--          {{ $fd('LanguageType', scope.row.LanguageType) }}-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <!-- 类型 -->
       <el-table-column
         prop="Type"

From 9a63a206d58c5d0e6417f114e22d57c8b49ea5f5 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 14 Mar 2024 14:44:15 +0800
Subject: [PATCH 16/18] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=83=A8=E4=BD=8D=E5=92=8C=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E6=8A=80=E6=9C=AF=E5=85=A8=E9=80=89=E6=A0=87=E8=AF=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setting/trial-config/components/logicalConfig.vue         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 f8af25ef..db472eea 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
@@ -538,7 +538,7 @@
           :data="$d.Bodypart"
           stripe
           height="450"
-          row-key="Id"
+          row-key="id"
           @select="handleBodyPartSelectionChange"
         >
           <el-table-column
@@ -589,7 +589,7 @@
           :data="$d.Modality"
           stripe
           height="450"
-          row-key="Id"
+          row-key="id"
           class="criterion-table"
           @select="handleSelectionChange"
         >

From 54c7bb055ab787ad868caf90082108ccd52157fa Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 14 Mar 2024 14:58:30 +0800
Subject: [PATCH 17/18] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E8=B0=83=E7=A0=94=E6=95=B0=E9=87=8F=E5=88=86=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-workbench/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index 6deb05af..7487c99c 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -126,7 +126,7 @@
               <div class="my_select_box" :class="{selected: selected === 'SiteResearch'}" tab-data="SiteResearch" @click="selected = 'SiteResearch'" v-if="hasPermi(['trials:trials-workbench:attachments:site-research'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-edit-outline" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span class="my_select_box_content_text">{{ $t('trials:workbench:title:pendingSiteResearch') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.PM_SiteSurveryCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:workbench:title:pendingSiteResearch') }}</span><span style="margin:0 0.25rem">·</span><span>{{hasPermi(['role:pm'])? tabList.PM_SiteSurveryCount : tabList.SPM_SiteSurveryCount }}</span>
                 </div>
               </div>
               <!-- SPM/CPM -->

From a675d5d79e6aed9ca5c377bfb340d2ecf199fc7b Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 14 Mar 2024 15:04:15 +0800
Subject: [PATCH 18/18] =?UTF-8?q?pm=E9=98=85=E7=89=87=E4=BA=BA=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E9=83=A8=E5=88=86=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=97=B4=E9=9A=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-panel/attachments/enrollment/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/attachments/enrollment/index.vue b/src/views/trials/trials-panel/attachments/enrollment/index.vue
index 3269b96a..2bbeacbd 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/index.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/index.vue
@@ -39,7 +39,7 @@
           </div>
           <div class="div-col">
             <label class="el-label">{{ $t('trials:trials-list:form:typeofReviewers:') }}</label>
-            <span>{{ trialInfo.AttendedReviewerTypeEnumList.map(v => $fd('AttendedReviewerType', v)).toString() }}</span>
+            <span>{{ trialInfo.AttendedReviewerTypeEnumList.map(v => $fd('AttendedReviewerType', v)).join(', ') }}</span>
 <!--            <span>{{ $fd('AttendedReviewerType', trialInfo.AttendedReviewerType) }}</span>-->
           </div>
           <div class="div-col">