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] =?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>