From d91f07bba62aaca41a4a92137681489f052936bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Tue, 12 Mar 2024 17:40:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/consistency-analysis/index.vue    | 12 ++++-
 src/views/trials/trials-workbench/index.vue   | 49 +++++++++++--------
 2 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue b/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
index 355c31b9..dda1011f 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
@@ -439,7 +439,7 @@
                 <el-table-column
                   prop="IsHaveReadingPeriod"
                   :label="$t('trials:selftConsistencyAnalysis:table:isReadingPeriod')"
-                  width="180"
+                  width="120"
                   show-overflow-tooltip
                 >
                   <template slot-scope="scope">
@@ -451,7 +451,7 @@
                 <el-table-column
                   prop="IsGenerateGlobalTask"
                   :label="$t('trials:selftConsistencyAnalysis:table:isGenerateGlobalTask')"
-                  width="180"
+                  width="120"
                   show-overflow-tooltip
                 >
                   <template slot-scope="scope">
@@ -467,6 +467,14 @@
                   show-overflow-tooltip
                 >
                 </el-table-column>
+                <!-- 可分配样本量 -->
+                <el-table-column
+                  prop="CanGeneratedSubejctCount"
+                  :label="$t('trials:selftConsistencyAnalysis:table:CanGeneratedSubejctCount')"
+                  width="120"
+                  show-overflow-tooltip
+                >
+                </el-table-column>
                 <!-- 已生成受试者数 -->
                 <el-table-column
                   prop="GeneratedSubjectCount"
diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index 41fa6467..5abed804 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -28,8 +28,15 @@
   color: #333;
   font-size: .875rem;
   white-space:nowrap;
+  display: flex;
+  align-items: center;
+}
+.my_select_box_content_text{
+  display: inline-block;
+  white-space:nowrap;
   overflow:hidden;
   text-overflow:ellipsis;
+  max-width: 150px;
 }
 .my_select_box:hover{
   background: #f5f5f5;
@@ -67,8 +74,8 @@
                   {{ 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>，{{ hoursTip }}</div>
-                  <div style="font-size: .75rem;line-height: 18px;color:#999">{{$t('common:date:today')}}{{new Date().getMonth() + 1}}{{$t('common:date:month')}}{{new Date().getDate()}}{{$t('common:date:day')}}，{{ dayOfWeek }}</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: 75px">{{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>
               <div class="user-status" style="display: flex">
@@ -98,28 +105,28 @@
               <div class="my_select_box" :class="{selected: selected === 'consistencyCheck'}" tab-data="consistencyCheck" @click="selected = 'consistencyCheck'" v-if="hasPermi(['trials:trials-workbench:consistencyCheck'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-folder-checked" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:tab:consistencyCheck') }}<span style="margin:0 0.25rem">·</span>{{tabList.PM_CheckCount}}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:tab:consistencyCheck') }}</span><span style="margin:0 0.25rem">·</span><span>{{tabList.PM_CheckCount}}</span>
                 </div>
               </div>
               <!-- 重阅审批 -->
               <div class="my_select_box" :class="{selected: selected === 'RereadApproval'}" tab-data="RereadApproval" @click="selected = 'RereadApproval'" v-if="hasPermi(['trials:trials-workbench:rereadApproval'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-document-checked" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:trials-panel:attachments:reReadingTracking') }}<span style="margin:0 0.25rem">·</span>{{ tabList.PM_ReReadingApprovalCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:trials-panel:attachments:reReadingTracking') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.PM_ReReadingApprovalCount }}</span>
                 </div>
               </div>
               <!-- 阅片人筛选 -->
               <div class="my_select_box" :class="{selected: selected === 'ReviewerScreen'}" tab-data="ReviewerScreen" @click="selected = 'ReviewerScreen'" v-if="hasPermi(['trials:trials-workbench:reviewerScreen'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-user" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:trials-list:PendingDetails:ReviewerSelection') }}<span style="margin:0 0.25rem">·</span>{{ tabList.PM_ReviewerSelectCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:trials-list:PendingDetails:ReviewerSelection') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.PM_ReviewerSelectCount }}</span>
                 </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_content">
                   <span class="el-icon-edit-outline" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:workbench:title:pendingSiteResearch') }}<span style="margin:0 0.25rem">·</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>{{ tabList.PM_SiteSurveryCount }}</span>
                 </div>
               </div>
               <!-- SPM/CPM -->
@@ -127,14 +134,14 @@
               <div class="my_select_box" :class="{selected: selected === 'ReviewerApproval'}" tab-data="ReviewerApproval" @click="selected = 'ReviewerApproval'" v-if="hasPermi(['trials:trials-workbench:reviewerApproval'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-user" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:sysDocBeSigned:table:reviewerApproval') }}<span style="margin:0 0.25rem">·</span>{{ tabList.SPM_ReviewerApprovalCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:sysDocBeSigned:table:reviewerApproval') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.SPM_ReviewerApprovalCount }}</span>
                 </div>
               </div>
               <!-- 重阅审批 -->
               <div class="my_select_box" :class="{selected: selected === 'SpmRereadApproval'}" tab-data="SpmRereadApproval" @click="selected = 'SpmRereadApproval'" v-if="hasPermi(['trials:trials-workbench:spmRereadApproval'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-document-checked" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:trials-panel:attachments:reReadingTracking') }}<span style="margin:0 0.25rem">·</span>{{ tabList.SPM_ReReadingApprovalCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:trials-panel:attachments:reReadingTracking') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.SPM_ReReadingApprovalCount }}</span>
                 </div>
               </div>
               <!-- CRC -->
@@ -142,28 +149,28 @@
               <div class="my_select_box" :class="{selected: selected === 'ImageQuestion'}" tab-data="ImageQuestion" @click="selected = 'ImageQuestion'" v-if="hasPermi(['trials:trials-workbench:imageQuestion'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-chat-dot-square" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:tab:crcQuality') }}<span style="margin:0 0.25rem">·</span>{{ tabList.CRC_ImageQuestionCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:tab:crcQuality') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.CRC_ImageQuestionCount }}</span>
                 </div>
               </div>
               <!-- 核查质疑 -->
               <div class="my_select_box" :class="{selected: selected === 'ImageVerification'}" tab-data="ImageVerification" @click="selected = 'ImageVerification'" v-if="hasPermi(['trials:trials-workbenck:imageVerification'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-money" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:sysDocBeSigned:table:ImageCheck') }}<span style="margin:0 0.25rem">·</span>{{ tabList.CRC_CheckQuestionCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:sysDocBeSigned:table:ImageCheck') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.CRC_CheckQuestionCount }}</span>
                 </div>
               </div>
               <!-- 影像重传 -->
               <div class="my_select_box" :class="{selected: selected === 'ImageReupload'}" tab-data="ImageReupload" @click="selected = 'ImageReupload'" v-if="hasPermi(['trials:trials-workbenck:imageReupload'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-upload" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:workbench:title:ImageRetransmission') }}<span style="margin:0 0.25rem">·</span>{{ tabList.CRC_ImageReUploadCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:workbench:title:ImageRetransmission') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.CRC_ImageReUploadCount }}</span>
                 </div>
               </div>
               <!-- 加急影像提交 -->
               <div class="my_select_box" :class="{selected: selected === 'ImageSubmission'}" tab-data="ImageSubmission" @click="selected = 'ImageSubmission'" v-if="hasPermi(['trials:trials-workbenck:imageSubmission'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-circle-check" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:workbench:title:ExpeditedImageSubmission') }}<span style="margin:0 0.25rem">·</span>{{ tabList.CRC_ImageSubmitCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:workbench:title:ExpeditedImageSubmission') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.CRC_ImageSubmitCount }}</span>
                 </div>
               </div>
               <!-- IQC -->
@@ -171,14 +178,14 @@
               <div class="my_select_box" :class="{selected: selected === 'ImageQualityControl'}" tab-data="ImageQualityControl" @click="selected = 'ImageQualityControl'" v-if="hasPermi(['trials:trials-workbenck:imageQC'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-document-checked" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:tab:dicomsQuality') }}<span style="margin:0 0.25rem">·</span>{{ tabList.IQC_IamgeQCCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:tab:dicomsQuality') }}<span style="margin:0 0.25rem"></span>·</span><span>{{ tabList.IQC_IamgeQCCount }}</span>
                 </div>
               </div>
               <!-- QC质疑 -->
               <div class="my_select_box" :class="{selected: selected === 'QcQuestion'}" tab-data="QcQuestion" @click="selected = 'QcQuestion'" v-if="hasPermi(['trials:trials-workbenck:qcQuestion'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-chat-dot-square" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:tab:qcQuality') }}<span style="margin:0 0.25rem">·</span>{{ tabList.IQC_QCQuestionCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:tab:qcQuality') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.IQC_QCQuestionCount }}</span>
                 </div>
               </div>
               <!-- IR -->
@@ -186,14 +193,14 @@
               <div class="my_select_box" :class="{selected: selected === 'ImagesToRead'}" tab-data="ImagesToRead" @click="selected = 'ImagesToRead'" v-if="hasPermi(['trials:trials-workbenck:imagesToRead'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-collection" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:tab:pendingReadingTasks') }}<span style="margin:0 0.25rem">·</span>{{ tabList.IR_IamgeWaitReadingCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:tab:pendingReadingTasks') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.IR_IamgeWaitReadingCount }}</span>
                 </div>
               </div>
               <!-- 医学反馈 -->
               <div class="my_select_box" :class="{selected: selected === 'MedicalFeedback'}" tab-data="MedicalFeedback" @click="selected = 'MedicalFeedback'" v-if="hasPermi(['trials:trials-workbenck:medicalFeedback'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-document-checked" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:trials-panel:tab:medicalFeedback') }}<span style="margin:0 0.25rem">·</span>{{ tabList.IR_MedicalReviewCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:trials-panel:tab:medicalFeedback') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.IR_MedicalReviewCount }}</span>
                 </div>
               </div>
               <!-- MIM -->
@@ -201,21 +208,21 @@
               <div class="my_select_box" :class="{selected: selected === 'MedicalAudit'}" tab-data="MedicalAudit" @click="selected = 'MedicalAudit'" v-if="hasPermi(['trials:trials-workbenck:medicalAudit'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-document-checked" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:trials-panel:tab:pmMedicalFeedback') }}<span style="margin:0 0.25rem">·</span>{{ tabList.MIM_MedicalReviewCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:trials-panel:tab:pmMedicalFeedback') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.MIM_MedicalReviewCount }}</span>
                 </div>
               </div>
               <!-- 项目签署文件 -->
               <div class="my_select_box" :class="{selected: selected === 'NeedSignTrialDoc'}" tab-data="NeedSignTrialDoc" @click="selected = 'NeedSignTrialDoc'" v-if="!hasPermi(['role:zys'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-receiving" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:workbench:title:trialDocBeSigned') }}<span style="margin:0 0.25rem">·</span>{{ tabList.TrialWaitSignDocCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:workbench:title:trialDocBeSigned') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.TrialWaitSignDocCount }}</span>
                 </div>
               </div>
               <!-- 系统签署文件 -->
               <div class="my_select_box" :class="{selected: selected === 'NeedSignSysDoc'}" tab-data="NeedSignSysDoc" @click="$nextTick(() => selected = 'NeedSignSysDoc')" v-if="!hasPermi(['role:zys'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-data-line" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:workbench:title:sysDocBeSigned') }}<span style="margin:0 0.25rem">·</span>{{ tabList.SysWaitSignDocCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:workbench:title:sysDocBeSigned') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.SysWaitSignDocCount }}</span>
                 </div>
               </div>
             </div>
@@ -226,14 +233,14 @@
               <div class="my_select_box" :class="{selected: selected === 'NeedSignedTrialDoc'}" tab-data="NeedSignedTrialDoc" @click="selected = 'NeedSignedTrialDoc'" v-if="!hasPermi(['role:zys'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-receiving" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:workbench:title:trialDocSigned') }}<span style="margin:0 0.25rem">·</span>{{ tabList.TrialSignedDocCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:workbench:title:trialDocSigned') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.TrialSignedDocCount }}</span>
                 </div>
               </div>
               <!-- 系统已签署文件 -->
               <div class="my_select_box" :class="{selected: selected === 'NeedSignedSysDoc'}" tab-data="NeedSignedSysDoc" @click="$nextTick(() => selected = 'NeedSignedSysDoc')" v-if="!hasPermi(['role:zys'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-data-line" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:workbench:title:sysDocSigned') }}<span style="margin:0 0.25rem">·</span>{{ tabList.SysSignedDocCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:workbench:title:sysDocSigned') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.SysSignedDocCount }}</span>
                 </div>
               </div>
             </div>