From 3dfa1ae29679f1ba47bb3c9d47529f0ab0f41cd8 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Sun, 28 Apr 2024 10:44:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dicom-show/dicom-study.vue          | 31 ++++++++++---------
 .../enrollment/components/Approval.vue        |  3 +-
 .../enrollment/components/Confirmation.vue    |  3 +-
 .../enrollment/components/Selection.vue       |  3 +-
 .../enrollment/components/Submission.vue      |  3 +-
 .../enrolled-reviewers/list/index.vue         |  2 +-
 .../subject/reading-period/index.vue          |  2 +-
 .../trial-summary/login-log/index.vue         |  2 ++
 src/views/trials/trials-workbench/index.vue   | 30 +++++++++---------
 9 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/src/views/dicom-show/dicom-study.vue b/src/views/dicom-show/dicom-study.vue
index 24e8e2ac..2aea62e2 100644
--- a/src/views/dicom-show/dicom-study.vue
+++ b/src/views/dicom-show/dicom-study.vue
@@ -64,21 +64,24 @@
 
                         </div>
                       </div>
-                      <div v-if="showDelete" @click.stop="">
+                      <div v-if="showDelete" @click.stop="" style="display: flex;flex-direction: row;justify-content: space-between;">
 
-                        <span style="font-size: 12px;">{{ $t('trials:audit:table:isReading') }}</span>
-                        <el-switch
-                          v-model="item.isReading"
-                          size="mini"
-                          @change="changeReadingStatus($event, item)"
-                        />
-
-                        <span style="font-size: 12px;">{{ $t('trials:audit:table:isDelete') }}</span>
-                        <el-switch
-                          v-model="item.isDeleted"
-                          size="mini"
-                          @change="changeDeleteStatus($event, item)"
-                        />
+                        <div>
+                          <span style="font-size: 12px;margin-right: 5px">{{ $t('trials:audit:table:isReading') }}</span>
+                          <el-switch
+                            v-model="item.isReading"
+                            size="mini"
+                            @change="changeReadingStatus($event, item)"
+                          />
+                        </div>
+                        <div>
+                          <span style="font-size: 12px;margin-right: 5px">{{ $t('trials:audit:table:isDelete') }}</span>
+                          <el-switch
+                            v-model="item.isDeleted"
+                            size="mini"
+                            @change="changeDeleteStatus($event, item)"
+                          />
+                        </div>
                       </div>
                       <div v-if="item.prefetchInstanceCount>0 && item.prefetchInstanceCount<item.instanceCount">
                         <el-progress :percentage="parseInt(((item.prefetchInstanceCount/item.instanceCount)*100).toFixed(2))" />
diff --git a/src/views/trials/trials-panel/attachments/enrollment/components/Approval.vue b/src/views/trials/trials-panel/attachments/enrollment/components/Approval.vue
index eabfc1b0..8b36ac4b 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/components/Approval.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/components/Approval.vue
@@ -26,7 +26,8 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            <el-button type="text" @click="go(`/trialsResume?doctorId=${scope.row.Id}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</el-button>
+            <!-- <el-button type="text" @click="go(`/trialsResume?doctorId=${scope.row.Id}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</el-button> -->
+             <span style="color: #428bca;cursor: pointer;" @click="go(`/trialsResume?doctorId=${scope.row.Id}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</span>
           </template>
         </el-table-column>
         <!-- Name CN -->
diff --git a/src/views/trials/trials-panel/attachments/enrollment/components/Confirmation.vue b/src/views/trials/trials-panel/attachments/enrollment/components/Confirmation.vue
index 2884b453..79810767 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/components/Confirmation.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/components/Confirmation.vue
@@ -37,7 +37,8 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            <el-button type="text" @click="go(`/trialsResume?doctorId=${scope.row.Id}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</el-button>
+            <!-- <el-button type="text" @click="go(`/trialsResume?doctorId=${scope.row.Id}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</el-button> -->
+             <span style="color: #428bca;cursor: pointer;" @click="go(`/trialsResume?doctorId=${scope.row.Id}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</span>
           </template>
         </el-table-column>
         <!-- Name CN -->
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 3e0369ca..9ea1fe6f 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
@@ -124,7 +124,8 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            <el-button type="text" @click="go(`/trialsResume?doctorId=${scope.row.Id}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</el-button>
+            <span style="color: #428bca;cursor: pointer;" @click="go(`/trialsResume?doctorId=${scope.row.Id}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</span>
+            <!-- <el-button type="text" @click="go(`/trialsResume?doctorId=${scope.row.Id}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</el-button> -->
 <!--            <router-link-->
 <!--              style="color: #428bca;"-->
 <!--              tag="a"-->
diff --git a/src/views/trials/trials-panel/attachments/enrollment/components/Submission.vue b/src/views/trials/trials-panel/attachments/enrollment/components/Submission.vue
index c6d00f80..f496d756 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/components/Submission.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/components/Submission.vue
@@ -47,7 +47,8 @@
           min-width="120"
         >
           <template slot-scope="scope">
-            <el-button type="text" @click="go(`/trialsResume?doctorId=${scope.row.Id}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</el-button>
+             <span style="color: #428bca;cursor: pointer;" @click="go(`/trialsResume?doctorId=${scope.row.Id}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</span>
+            <!-- <el-button type="text" @click="go(`/trialsResume?doctorId=${scope.row.Id}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</el-button> -->
           </template>
         </el-table-column>
         <!-- Name CN -->
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 9571dac0..9db0b2a0 100644
--- a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
+++ b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
@@ -69,7 +69,7 @@
         <el-table-column
           prop="EnrollTimeStr"
           :label="$t('trials:enrolledReviews:table:status')"
-          width="140"
+          width="200"
           sortable="custom"
         >
           <template slot-scope="scope">
diff --git a/src/views/trials/trials-panel/subject/reading-period/index.vue b/src/views/trials/trials-panel/subject/reading-period/index.vue
index 5cb27645..3456280b 100644
--- a/src/views/trials/trials-panel/subject/reading-period/index.vue
+++ b/src/views/trials/trials-panel/subject/reading-period/index.vue
@@ -162,7 +162,7 @@
                       </div>
                       <div style="display: flex;justify-content: space-between;border-bottom: 1px solid #d9d9d9;margin-bottom: 8px;padding-bottom: 8px">
                         <div>{{ $fd('ModuleTypeEnum',scope.row.Data[i-1].ModuleType) }}</div>
-                        <div>
+                        <div style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;width: 110px;">
                           {{ $fd('ReadModuleEnum',scope.row.Data[i-1].ReadingStatus) }}
                         </div>
                       </div>
diff --git a/src/views/trials/trials-panel/trial-summary/login-log/index.vue b/src/views/trials/trials-panel/trial-summary/login-log/index.vue
index e381dac5..52c5ac1a 100644
--- a/src/views/trials/trials-panel/trial-summary/login-log/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/login-log/index.vue
@@ -9,6 +9,7 @@
           <el-select v-model="searchData.OptType" clearable style="width:120px;">
             <el-option
               v-for="item of $d.UserOptType"
+              v-show="item.value !== 3 && item.value !== 10"
               :key="'UserOptType' + item.label"
               :value="item.value"
               :label="item.label"
@@ -208,6 +209,7 @@ export default {
     }
   },
   mounted() {
+    console.log(this.$d.UserOptType)
     this.getList()
   },
   methods: {
diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index 1a4ef747..91049f22 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -248,48 +248,48 @@
         </div>
         <div style="width: auto;flex:1;padding: 0 20px">
           <!-- 加急影像提交 -->
-          <ImageSubmission v-if="selected === 'ImageSubmission'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+          <ImageSubmission v-if="selected === 'ImageSubmission'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
           <!-- PM/APM -->
           <!-- 阅片期 -->
           <!--            <el-tab-pane name="clinicalDataPM" v-if="hasPermi(['trials:trials-panel:subject:readingPeriod:edit'])" :label="`${$t('trials:crcUpload:label:clinicalData')} (${tabList.PM_ClinicalDataCount})`">-->
           <!--                <clinicalDataPM v-if="activeName === 'clinicalDataPM'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
           <!--            </el-tab-pane>-->
-            <consistencyCheck v-if="selected === 'consistencyCheck'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+            <consistencyCheck v-if="selected === 'consistencyCheck'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
           <!--             重阅审批 -->
-            <RereadApproval v-if="selected === 'RereadApproval'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+            <RereadApproval v-if="selected === 'RereadApproval'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
           <!--             阅片人筛选 -->
-            <ReviewerScreen v-if="selected === 'ReviewerScreen'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+            <ReviewerScreen v-if="selected === 'ReviewerScreen'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
           <!--             中心调研 -->
-            <SiteResearch v-if="selected === 'SiteResearch'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+            <SiteResearch v-if="selected === 'SiteResearch'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
           <!--             SPM/CPM -->
           <!--             阅片人审批 -->
-            <ReviewerApproval v-if="selected === 'ReviewerApproval'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+            <ReviewerApproval v-if="selected === 'ReviewerApproval'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
           <!--             重阅审批 -->
-            <SpmRereadApproval v-if="selected === 'SpmRereadApproval'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+            <SpmRereadApproval v-if="selected === 'SpmRereadApproval'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
           <!--             CRC -->
           <!--             临床数据录入 -->
 <!--            <clinicalData v-if="selected === 'clinicalData'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
           <!--             临床数据确认 -->
 <!--            <clinicalDataConfirm v-if="selected === 'clinicalDataConfirm'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
           <!-- 影像质疑 -->
-            <ImageQuestion v-if="selected === 'ImageQuestion'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+            <ImageQuestion v-if="selected === 'ImageQuestion'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
           <!-- 核查质疑 -->
-            <ImageVerification v-if="selected === 'ImageVerification'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+            <ImageVerification v-if="selected === 'ImageVerification'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
           <!-- 影像重传 -->
-            <ImageReupload v-if="selected === 'ImageReupload'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+            <ImageReupload v-if="selected === 'ImageReupload'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
           <!-- IQC -->
           <!-- 影像质控 -->
-            <ImageQualityControl v-if="selected === 'ImageQualityControl'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+            <ImageQualityControl v-if="selected === 'ImageQualityControl'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
           <!-- QC质疑 -->
-            <QcQuestion v-if="selected === 'QcQuestion'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+            <QcQuestion v-if="selected === 'QcQuestion'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
           <!-- IR -->
           <!-- 影像待阅 -->
-            <ImagesToRead v-if="selected === 'ImagesToRead'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+            <ImagesToRead v-if="selected === 'ImagesToRead'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
           <!-- 医学反馈 -->
-            <MedicalFeedback v-if="selected === 'MedicalFeedback'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+            <MedicalFeedback v-if="selected === 'MedicalFeedback'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
           <!-- MIM -->
           <!-- 医学审核 -->
-            <MedicalAudit v-if="selected === 'MedicalAudit'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+            <MedicalAudit v-if="selected === 'MedicalAudit'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
           <!-- 项目签署文件 -->
             <NeedSignTrialDoc v-if="selected === 'NeedSignTrialDoc'" :is-sign-system-doc="isSignSystemDoc" />
           <!-- 系统签署文件 -->