From f505d297e92e089947f9a0b5e9cd06cd37580435 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 28 May 2024 10:20:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-list/components/TrialForm.vue      |  2 +-
 .../enrollment/components/Selection.vue       | 26 +++++++++-----
 .../attachments/enrollment/index.vue          | 34 ++++++++++++-------
 .../personnel-manage/components/staff.vue     |  1 +
 4 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/src/views/trials/trials-list/components/TrialForm.vue b/src/views/trials/trials-list/components/TrialForm.vue
index b081bf3f..fb3f728c 100644
--- a/src/views/trials/trials-list/components/TrialForm.vue
+++ b/src/views/trials/trials-list/components/TrialForm.vue
@@ -13,7 +13,7 @@
     <el-row>
       <!-- 项目编号 -->
       <el-form-item v-if="trialForm.Id!== ''" :label="$t('trials:trials-list:form:trialId')">
-        <el-input v-model="trialForm.TrialCode" disabled />
+        <el-input v-model="trialForm.TrialCode" />
       </el-form-item>
       <!-- 项目类型 -->
       <el-form-item :label="$t('trials:trials-list:form:trialType')" prop="TrialType">
diff --git a/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue b/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
index 9ea1fe6f..ce8e36df 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
@@ -2,6 +2,15 @@
   <BaseContainer>
     <template slot="search-container">
       <el-form :inline="true">
+        <!-- Name -->
+        <el-form-item :label="$t('trials:seletctedReviews:table:name')">
+          <el-input
+            v-model="listQuery.Name"
+            size="small"
+            clearable
+            style="width: 120px"
+          />
+        </el-form-item>
         <!-- Modality -->
         <el-form-item :label="$t('trials:seletctedReviews:form:modality')">
           <el-select
@@ -144,14 +153,14 @@
           sortable="custom"
           width="120"
         />
-        <!-- ID -->
-        <!--        <el-table-column-->
-        <!--          prop="ReviewerCode"-->
-        <!--          :label="$t('trials:seletctedReviews:table:id')"-->
-        <!--          show-overflow-tooltip-->
-        <!--          sortable="custom"-->
-        <!--          width="120"-->
-        <!--        />-->
+        
+        <el-table-column
+          prop="DoctorUserName"
+          :label="$t('trials:seletctedReviews:table:doctorUserName')"
+          show-overflow-tooltip
+          sortable="custom"
+          width="120"
+        />
         <!-- Status -->
         <el-table-column
           prop="DoctorTrialState"
@@ -266,6 +275,7 @@ import { getSelectionReviewerList, selectReviewers } from '@/api/trials'
 const getListQueryDefault = () => {
   return {
     TrialId: '',
+    Name:'',
     ReadingTypeIds: [],
     SubspecialityIds: [],
     PageIndex: 1,
diff --git a/src/views/trials/trials-panel/attachments/enrollment/index.vue b/src/views/trials/trials-panel/attachments/enrollment/index.vue
index 2bbeacbd..29fece41 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/index.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/index.vue
@@ -11,28 +11,37 @@
             <label class="el-label">{{ $t('trials:trials-list:form:indication:') }}</label>
             <span>{{$fd('Indication', trialInfo.IndicationEnum)}}{{trialInfo.Indication ? '-' + trialInfo.Indication : '' }}</span>
           </div>
+         
           <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:criterion:') }}</label>
-            <span>{{ (trialInfo.CriterionList && trialInfo.CriterionList.length>0)? trialInfo.CriterionList.join(', '): '' }}</span>
-          </div>
-          <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:modality:') }}</label>
+            <label class="el-label">{{ $t('trials:trials-list:form:declarationType:') }}</label>
             <el-tooltip
               class="item"
-              :content="trialInfo.Modalitys"
+              :content="trialInfo.DeclarationTypeEnumList.map(v => $fd('DeclarationType', v)).join(', ')"
               placement="top"
             >
-              <span>{{ trialInfo.Modalitys }}</span>
+              <span>{{ trialInfo.DeclarationTypeEnumList.map(v => $fd('DeclarationType', v)).join(', ') }}</span>
             </el-tooltip>
           </div>
+           <div class="div-col">
+            <label class="el-label">{{ $t('trials:trials-list:form:criterion:') }}</label>
+            <el-tooltip
+              class="item"
+              :content="(trialInfo.CriterionList && trialInfo.CriterionList.length>0)? trialInfo.CriterionList.join(', '): ''"
+              placement="top"
+            >
+              <span>{{ (trialInfo.CriterionList && trialInfo.CriterionList.length>0)? trialInfo.CriterionList.join(', '): '' }}</span>
+            </el-tooltip>
+            
+          </div>
+          <div class="div-col">
+          </div>
 
         </div>
         <div class="div-row">
-<!--          <div class="div-col">-->
-<!--            <label class="el-label">{{ $t('trials:trials-list:form:reviewMode') }}:</label>-->
-<!--            &lt;!&ndash; <span>{{ trialInfo.ReadingType }}</span> &ndash;&gt;-->
-<!--            <span>{{ $fd('ReadingMethod', trialInfo.ReadingType) }}</span>-->
-<!--          </div>-->
+          <div class="div-col">
+            <label class="el-label">{{ $t('trials:trials-list:form:expedited:') }}</label>
+            <span>{{$fd('YesOrNoForInt', trialInfo.Expedited)}}</span>
+          </div>
           <div class="div-col">
             <label class="el-label">{{ $t('trials:trials-list:form:totalReviewers:') }}</label>
             <span>{{ trialInfo.TotalReviewers }}</span>
@@ -40,7 +49,6 @@
           <div class="div-col">
             <label class="el-label">{{ $t('trials:trials-list:form:typeofReviewers:') }}</label>
             <span>{{ trialInfo.AttendedReviewerTypeEnumList.map(v => $fd('AttendedReviewerType', v)).join(', ') }}</span>
-<!--            <span>{{ $fd('AttendedReviewerType', trialInfo.AttendedReviewerType) }}</span>-->
           </div>
           <div class="div-col">
           </div>
diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue
index 7fccbceb..25cb54bd 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue
@@ -16,6 +16,7 @@
           <el-select v-model="listQuery.UserTypeId" clearable class="mr">
             <el-option
               v-for="item of userTypeOptions"
+              v-show="item.UserTypeEnum !== 8 && item.UserTypeEnum !== 31"
               :key="item.Id"
               :label="item.UserTypeShortName"
               :value="item.Id"