From cfef89c703a115afd822f95292e63aba810d60f5 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 6 Mar 2025 15:37:13 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E8=A1=A8=E6=A0=B8=E5=AF=B9=E5=BC=80=E6=94=BE?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BB=A5=E5=8F=8A=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/user/components/Retrospect.vue     | 36 +++++++++----------
 .../email-manage/components/EmailList.vue     |  1 +
 .../setting/reading-unit/index.vue            |  2 +-
 .../subject/brain-metastasis/index.vue        |  1 +
 .../subject/reading-period/index.vue          |  1 +
 5 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/views/system/user/components/Retrospect.vue b/src/views/system/user/components/Retrospect.vue
index 8fc1d69e..d1a31087 100644
--- a/src/views/system/user/components/Retrospect.vue
+++ b/src/views/system/user/components/Retrospect.vue
@@ -223,6 +223,18 @@
           <!-- 详情 -->
           <el-button
             circle
+            :disabled="
+              (scope.row.TrialStatusStr === 'Initializing' &&
+                !hasPermi(['role:pm'])) ||
+              scope.row.IsDeleted ||
+              ((scope.row.TrialStatusStr === 'Completed' ||
+                scope.row.TrialStatusStr === 'Stopped') &&
+                !(
+                  hasPermi(['role:qa']) ||
+                  hasPermi(['role:ea']) ||
+                  hasPermi(['role:pm'])
+                ))
+            "
             icon="el-icon-info"
             :title="$t('system:retrospect:table:detail')"
             @click.stop="handleDetail(scope.row)"
@@ -271,19 +283,11 @@
           </el-table-column>
           <el-table-column
             prop="UserTypeShortName"
-            :label="
-              $t(
-                'system:retrospect:table:UserTypeShortName'
-              )
-            "
+            :label="$t('system:retrospect:table:UserTypeShortName')"
           />
           <el-table-column
             prop="IsDeleted"
-            :label="
-              $t(
-                'system:retrospect:table:IsUserRoleDisabled'
-              )
-            "
+            :label="$t('system:retrospect:table:IsUserRoleDisabled')"
           >
             <template slot-scope="scope">
               <span> {{ $fd('IsDisable', scope.row.IsDeleted) }}</span>
@@ -291,11 +295,7 @@
           </el-table-column>
           <el-table-column
             prop="IsDeleted"
-            :label="
-              $t(
-                'system:retrospect:table:enableTime'
-              )
-            "
+            :label="$t('system:retrospect:table:enableTime')"
             min-width="120px"
           >
             <template slot-scope="scope">
@@ -306,11 +306,7 @@
           </el-table-column>
           <el-table-column
             prop="IsDeleted"
-            :label="
-              $t(
-                'system:retrospect:table:forbiddenTime'
-              )
-            "
+            :label="$t('system:retrospect:table:forbiddenTime')"
             min-width="120px"
           >
             <template slot-scope="scope">
diff --git a/src/views/trials/trials-panel/setting/email-manage/components/EmailList.vue b/src/views/trials/trials-panel/setting/email-manage/components/EmailList.vue
index 5e879517..7582f617 100644
--- a/src/views/trials/trials-panel/setting/email-manage/components/EmailList.vue
+++ b/src/views/trials/trials-panel/setting/email-manage/components/EmailList.vue
@@ -76,6 +76,7 @@
             {{ $t('common:button:reset') }}
           </el-button>
           <el-button
+            v-if="hasPermi(['trials:trials-panel:setting:email-manage:edit'])"
             type="primary"
             icon="el-icon-plus"
             size="small"
diff --git a/src/views/trials/trials-panel/setting/reading-unit/index.vue b/src/views/trials/trials-panel/setting/reading-unit/index.vue
index e28f5588..b422f1c2 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/index.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/index.vue
@@ -8,7 +8,7 @@
             :label="item.TrialReadingCriterionName"
             :name="item.TrialReadingCriterionId"
           >
-            <div style="text-align: right; padding: 5px 0px" v-if="!hasPermi(['role:admin'])">
+            <div style="text-align: right; padding: 5px 0px" v-if="!hasPermi(['role:admin','role:qa','role:ea'])">
               <!-- 同步当前标准 -->
               <el-button
                 type="primary"
diff --git a/src/views/trials/trials-panel/subject/brain-metastasis/index.vue b/src/views/trials/trials-panel/subject/brain-metastasis/index.vue
index b7cdd636..2afc4058 100644
--- a/src/views/trials/trials-panel/subject/brain-metastasis/index.vue
+++ b/src/views/trials/trials-panel/subject/brain-metastasis/index.vue
@@ -129,6 +129,7 @@
               <el-table-column
                 :label="$t('common:action:action')"
                 width="120"
+                v-hasPermi="['trials:trials-panel:subject:brainMetastasis:Edit']"
               >
                 <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 846712f3..79c11671 100644
--- a/src/views/trials/trials-panel/subject/reading-period/index.vue
+++ b/src/views/trials/trials-panel/subject/reading-period/index.vue
@@ -216,6 +216,7 @@
                 </el-table-column>
               </el-table-column>
               <el-table-column
+                v-if="hasPermi(['trials:trials-panel:subject:readingPeriod:edit'])"
                 :fixed="(otherInfo.IsReadingPeriod || otherInfo.IsClinicalReading) && ReadingInfoSignTime && hasPermi(['trials:trials-panel:subject:readingPeriod:edit']) ? 'right':false"
                 :label="(otherInfo.IsReadingPeriod || otherInfo.IsClinicalReading) && ReadingInfoSignTime && hasPermi(['trials:trials-panel:subject:readingPeriod:edit']) ? $t('common:action:action') : ''"
                 :width="(otherInfo.IsReadingPeriod || otherInfo.IsClinicalReading) && ReadingInfoSignTime && hasPermi(['trials:trials-panel:subject:readingPeriod:edit']) ? '150px' : '80px' "

From 5b8716f9aeb6b361cf43ca9f0a6cba60228dbef4 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 7 Mar 2025 11:02:30 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E8=B4=A8=E6=8E=A7=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=90=8E=E6=95=B0=E6=8D=AE=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visit/qc-check/components/qualityAssurance.vue            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
index b312fe05..99919a8e 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
@@ -12,9 +12,9 @@
       <!-- 所有检查信息 -->
       <el-card shadow="hover" style="min-height: 600px">
         <el-tabs v-model="activeName" type="card">
-          <!-- DICOM影像 -->
+          <!-- DICOM影像 data.DicomStudyCount > 0-->
           <el-tab-pane
-            v-if="data.DicomStudyCount > 0"
+            v-if="studyList.length>0"
             :label="$t('trials:audit:tab:dicoms')"
             name="dicom"
           >

From 278c051f51639644ec0b649b3877ed0432b1377b Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 7 Mar 2025 12:23:40 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E8=B4=A8=E6=8E=A7=E9=9D=9Edicom=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=A2=84=E8=A7=88=E9=98=85=E7=89=87=E5=BD=B1=E5=83=8F?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/trials.js                             |  4 +--
 src/views/none-dicom-show/index.vue           |  6 ++---
 .../qc-check/components/qualityAssurance.vue  | 26 ++++++++++++++-----
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/api/trials.js b/src/api/trials.js
index 3f4b9dff..f5b2cb21 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -1378,9 +1378,9 @@ export function getForwardList(param) {
   })
 }
 
-export function getNoneDicomStudyList(subjectVisitId, sudyId = '', isFilterZip = false, visitTaskId = '') {
+export function getNoneDicomStudyList(subjectVisitId, sudyId = '', isFilterZip = false, visitTaskId = '', IsReading) {
   return request({
-    url: `/NoneDicomStudy/getNoneDicomStudyList?subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}&isFilterZip=${isFilterZip}&visitTaskId=${visitTaskId}`,
+    url: `/NoneDicomStudy/getNoneDicomStudyList?subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}&isFilterZip=${isFilterZip}&visitTaskId=${visitTaskId}&IsReading=${IsReading}`,
     method: 'get'
   })
 }
diff --git a/src/views/none-dicom-show/index.vue b/src/views/none-dicom-show/index.vue
index 96f9d2e2..00c8092e 100644
--- a/src/views/none-dicom-show/index.vue
+++ b/src/views/none-dicom-show/index.vue
@@ -141,7 +141,6 @@ export default {
   async created() {
     this.bp = await this.$getBodyPart(this.$route.query.trialId)
     this.isQcCheck = !!this.$route.query.isQcCheck
-    console.log(this.isQcCheck)
   },
   async mounted() {
     if (this.$router.currentRoute.query.TokenKey) {
@@ -244,7 +243,6 @@ export default {
         .catch(() => {})
     },
     getBodyPart(bodyPart) {
-      console.log(bodyPart)
       if (!bodyPart) return ''
       var separator = ','
       if (bodyPart.indexOf('|') > -1) {
@@ -264,7 +262,6 @@ export default {
           'Name'
         )
       })
-      console.log(newArr, this.bp)
       return newArr.join(' | ')
     },
     // 获取非Dicom检查信息
@@ -274,7 +271,8 @@ export default {
         this.subjectVisitId,
         this.studyId,
         false,
-        this.$route.query.visitTaskId
+        this.$route.query.visitTaskId,
+        !!this.$route.query.isReading
       )
         .then((res) => {
           this.studyList = res.Result
diff --git a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
index 99919a8e..c1f6c6dd 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
@@ -14,7 +14,7 @@
         <el-tabs v-model="activeName" type="card">
           <!-- DICOM影像 data.DicomStudyCount > 0-->
           <el-tab-pane
-            v-if="studyList.length>0"
+            v-if="studyList.length > 0"
             :label="$t('trials:audit:tab:dicoms')"
             name="dicom"
           >
@@ -433,13 +433,23 @@
               >
                 {{ $t('trials:audit:button:downLoadAllNonDiocms') }}
               </el-button>
+              <!-- 预览阅片 -->
+              <el-button
+                size="small"
+                :disabled="noneDicomStudyList.length === 0"
+                type="primary"
+                style="margin-left: 10px"
+                @click="handleViewAllNoneDicoms(true)"
+              >
+                {{ $t('trials:audit:tip:nonDicomsPreviewAllReading') }}
+              </el-button>
               <!-- 预览 -->
               <el-button
                 size="small"
                 :disabled="noneDicomStudyList.length === 0"
                 type="primary"
                 style="margin-left: 10px"
-                @click="handleViewAllNoneDicoms"
+                @click="handleViewAllNoneDicoms(false)"
               >
                 {{ $t('trials:audit:tip:nonDicomsPreviewAll') }}
               </el-button>
@@ -2697,16 +2707,20 @@ export default {
       }
     },
     // 预览所有检查下非Dicom文件
-    handleViewAllNoneDicoms() {
+    handleViewAllNoneDicoms(isReading = false) {
       if (this.open) {
         this.open.close()
       }
       // this.previewAllNoneDicomVisible = true
       let trialId = this.$route.query.trialId
       var token = getToken()
-      const routeData = this.$router.resolve({
-        path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${this.data.Id}&TokenKey=${token}&isQcCheck=1`,
-      })
+      const routeData = isReading
+        ? this.$router.resolve({
+            path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${this.data.Id}&TokenKey=${token}&isReading=1`,
+          })
+        : this.$router.resolve({
+            path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${this.data.Id}&TokenKey=${token}&isQcCheck=1`,
+          })
       this.open = window.open(routeData.href, '_blank')
     },
     // 预览单个检查下非Dicom文件

From fc98aa03123b94c82ff1f02f6430edb63a09465f Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 7 Mar 2025 13:34:36 +0800
Subject: [PATCH 4/7] 1

---
 .../subject/brain-metastasis/index.vue        | 271 +++++++++++++-----
 1 file changed, 207 insertions(+), 64 deletions(-)

diff --git a/src/views/trials/trials-panel/subject/brain-metastasis/index.vue b/src/views/trials/trials-panel/subject/brain-metastasis/index.vue
index 2afc4058..0dc63c05 100644
--- a/src/views/trials/trials-panel/subject/brain-metastasis/index.vue
+++ b/src/views/trials/trials-panel/subject/brain-metastasis/index.vue
@@ -1,14 +1,26 @@
 <template>
   <BaseContainer>
     <el-tabs v-model="TrialReadingCriterionId" type="border-card">
-      <el-tab-pane v-for="criterion of trialCriterionList" :key="criterion.TrialReadingCriterionId" :label="criterion.TrialReadingCriterionName" :name="criterion.TrialReadingCriterionId">
-        <div v-if="TrialReadingCriterionId === criterion.TrialReadingCriterionId">
+      <el-tab-pane
+        v-for="criterion of trialCriterionList"
+        :key="criterion.TrialReadingCriterionId"
+        :label="criterion.TrialReadingCriterionName"
+        :name="criterion.TrialReadingCriterionId"
+      >
+        <div
+          v-if="TrialReadingCriterionId === criterion.TrialReadingCriterionId"
+        >
           <div slot="search-container">
             <el-form :inline="true">
               <el-form-item :label="$t('trials:subject:table:site')">
-                <el-select v-model="searchData.TrialSiteCode" clearable filterable style="width:130px;">
+                <el-select
+                  v-model="searchData.TrialSiteCode"
+                  clearable
+                  filterable
+                  style="width: 130px"
+                >
                   <el-option
-                    v-for="(item,index) of siteOptions"
+                    v-for="(item, index) of siteOptions"
                     :key="index"
                     :label="item.TrialSiteCode"
                     :value="item.TrialSiteCode"
@@ -17,29 +29,69 @@
               </el-form-item>
               <!-- Subject ID -->
               <el-form-item :label="$t('trials:subject:table:subjectId')">
-                <el-input v-model="searchData.SubjectCode" style="width:130px;" />
+                <el-input
+                  v-model="searchData.SubjectCode"
+                  style="width: 130px"
+                />
               </el-form-item>
               <!-- Status -->
               <el-form-item :label="$t('trials:subject:table:status')">
-                <el-select v-model="searchData.SubjectStatus" clearable style="width:130px;">
-                  <el-option v-for="item of $d.Subject_Visit_Status" :key="item.value" :value="item.value" :label="item.label" />
+                <el-select
+                  v-model="searchData.SubjectStatus"
+                  clearable
+                  style="width: 130px"
+                >
+                  <el-option
+                    v-for="item of $d.Subject_Visit_Status"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+                  />
                 </el-select>
               </el-form-item>
-              <el-form-item :label="$t('trials:trials-panel:form:ParticipateEvaluation')">
-                <el-select v-model="searchData.IsJoinEvaluation" clearable style="width:130px;">
-                  <el-option v-for="item of $d.YesOrNo" :key="item.value" :value="item.value" :label="item.label" />
+              <el-form-item
+                :label="$t('trials:trials-panel:form:ParticipateEvaluation')"
+              >
+                <el-select
+                  v-model="searchData.IsJoinEvaluation"
+                  clearable
+                  style="width: 130px"
+                >
+                  <el-option
+                    v-for="item of $d.YesOrNo"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+                  />
                 </el-select>
               </el-form-item>
               <el-form-item :label="$t('trials:subject:form:ImageSelect')">
-                <el-select v-model="searchData.IsImageFiltering" clearable style="width:130px;">
-                  <el-option v-for="item of $d.YesOrNo" :key="item.value" :value="item.value" :label="item.label" />
+                <el-select
+                  v-model="searchData.IsImageFiltering"
+                  clearable
+                  style="width: 130px"
+                >
+                  <el-option
+                    v-for="item of $d.YesOrNo"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+                  />
                 </el-select>
               </el-form-item>
               <el-form-item>
-                <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+                <el-button
+                  type="primary"
+                  icon="el-icon-search"
+                  @click="handleSearch"
+                >
                   {{ $t('common:button:search') }}
                 </el-button>
-                <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
+                <el-button
+                  type="primary"
+                  icon="el-icon-refresh-left"
+                  @click="handleReset"
+                >
                   {{ $t('common:button:reset') }}
                 </el-button>
                 <el-button type="primary" @click="handleSelect()">
@@ -51,7 +103,7 @@
           <div slot="main-container">
             <el-table
               ref="myTable"
-              v-adaptive="{bottomOffset:75}"
+              v-adaptive="{ bottomOffset: 75 }"
               v-loading="loading"
               :data="list"
               stripe
@@ -59,7 +111,11 @@
               @sort-change="handleSortChange"
               @selection-change="handleSelectChange"
             >
-              <el-table-column type="selection" width="50" :selectable="handleSelectTable" />
+              <el-table-column
+                type="selection"
+                width="50"
+                :selectable="handleSelectTable"
+              />
               <el-table-column type="index" width="40" />
               <!-- 中心编号 -->
               <el-table-column
@@ -84,20 +140,44 @@
                 sortable="custom"
               >
                 <template slot-scope="scope">
-                  <el-tag v-if="scope.row.SubjectStatus === 1" type="primary">{{ $fd('Subject_Visit_Status', scope.row.SubjectStatus) }}</el-tag>
-                  <el-tag v-if="scope.row.SubjectStatus === 2" type="danger">{{ $fd('Subject_Visit_Status', scope.row.SubjectStatus) }}</el-tag>
+                  <el-tag v-if="scope.row.SubjectStatus === 1" type="primary">{{
+                    $fd('Subject_Visit_Status', scope.row.SubjectStatus)
+                  }}</el-tag>
+                  <el-tag v-if="scope.row.SubjectStatus === 2" type="danger">{{
+                    $fd('Subject_Visit_Status', scope.row.SubjectStatus)
+                  }}</el-tag>
                 </template>
               </el-table-column>
               <el-table-column
                 :prop="item.QuestionId"
                 v-for="(item, index) of OtherInfo"
-                :label="$i18n.locale === 'zh' ? item.QuestionName : item.QuestionEnName"
+                :label="
+                  $i18n.locale === 'zh'
+                    ? item.QuestionName
+                    : item.QuestionEnName
+                "
                 show-overflow-tooltip
                 :key="item.QuestionId"
               >
                 <template slot-scope="scope">
-                  <el-tooltip class="item" effect="dark" :content="getReadingEvaluationList(item.QuestionId, scope.row.ReadingEvaluationList)" placement="top">
-                   <span>{{$fd(scope.row.FinalEvaluationList[index].FinalTranslateDictionaryCode, parseInt(scope.row.FinalEvaluationList[index].Answer))}}</span>
+                  <el-tooltip
+                    class="item"
+                    effect="dark"
+                    :content="
+                      getReadingEvaluationList(
+                        item.QuestionId,
+                        scope.row.ReadingEvaluationList
+                      )
+                    "
+                    placement="top"
+                  >
+                    <span>{{
+                      $fd(
+                        scope.row.FinalEvaluationList[index]
+                          .FinalTranslateDictionaryCode,
+                        parseInt(scope.row.FinalEvaluationList[index].Answer)
+                      )
+                    }}</span>
                   </el-tooltip>
                 </template>
               </el-table-column>
@@ -110,8 +190,14 @@
                 show-overflow-tooltip
               >
                 <template slot-scope="scope">
-                  <el-tag v-if="scope.row.IsJoinEvaluation" type="primary">{{ $fd('YesOrNo', scope.row.IsJoinEvaluation) }}</el-tag>
-                  <el-tag v-if="scope.row.IsJoinEvaluation === false" type="danger">{{ $fd('YesOrNo', scope.row.IsJoinEvaluation) }}</el-tag>
+                  <el-tag v-if="scope.row.IsJoinEvaluation" type="primary">{{
+                    $fd('YesOrNo', scope.row.IsJoinEvaluation)
+                  }}</el-tag>
+                  <el-tag
+                    v-if="scope.row.IsJoinEvaluation === false"
+                    type="danger"
+                    >{{ $fd('YesOrNo', scope.row.IsJoinEvaluation) }}</el-tag
+                  >
                 </template>
               </el-table-column>
               <el-table-column
@@ -122,14 +208,22 @@
                 show-overflow-tooltip
               >
                 <template slot-scope="scope">
-                  <el-tag v-if="scope.row.IsImageFiltering" type="primary">{{ $fd('YesOrNo', scope.row.IsImageFiltering) }}</el-tag>
-                  <el-tag v-if="scope.row.IsImageFiltering === false" type="danger">{{ $fd('YesOrNo', scope.row.IsImageFiltering) }}</el-tag>
+                  <el-tag v-if="scope.row.IsImageFiltering" type="primary">{{
+                    $fd('YesOrNo', scope.row.IsImageFiltering)
+                  }}</el-tag>
+                  <el-tag
+                    v-if="scope.row.IsImageFiltering === false"
+                    type="danger"
+                    >{{ $fd('YesOrNo', scope.row.IsImageFiltering) }}</el-tag
+                  >
                 </template>
               </el-table-column>
               <el-table-column
                 :label="$t('common:action:action')"
                 width="120"
-                v-hasPermi="['trials:trials-panel:subject:brainMetastasis:Edit']"
+                v-if="
+                  hasPermi(['trials:trials-panel:subject:brainMetastasis:Edit'])
+                "
               >
                 <template slot-scope="scope">
                   <!-- 选择受试者 -->
@@ -152,7 +246,13 @@
               </el-table-column>
             </el-table>
             <!-- 分页组件 -->
-            <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
+            <pagination
+              class="page"
+              :total="total"
+              :page.sync="searchData.PageIndex"
+              :limit.sync="searchData.PageSize"
+              @pagination="getList"
+            />
             <!-- 添加受试者阅片期 -->
             <el-dialog
               v-if="selectSubject.visible"
@@ -162,8 +262,18 @@
               custom-class="base-dialog-wrapper"
               :close-on-click-modal="false"
             >
-              <select-subject v-if="!isBatch" :data="rowData" @close="selectSubject.visible = false" @getList="getList"></select-subject>
-              <batch-select-subject v-else :select-list="selectList" @close="selectSubject.visible = false" @getList="getList"></batch-select-subject>
+              <select-subject
+                v-if="!isBatch"
+                :data="rowData"
+                @close="selectSubject.visible = false"
+                @getList="getList"
+              ></select-subject>
+              <batch-select-subject
+                v-else
+                :select-list="selectList"
+                @close="selectSubject.visible = false"
+                @getList="getList"
+              ></batch-select-subject>
             </el-dialog>
             <el-dialog
               v-if="selectSubjectImage.visible"
@@ -173,7 +283,11 @@
               custom-class="base-dialog-wrapper"
               :close-on-click-modal="false"
             >
-              <select-subject-image :data="rowData" @close="selectSubjectImage.visible = false" @getList="getList"></select-subject-image>
+              <select-subject-image
+                :data="rowData"
+                @close="selectSubjectImage.visible = false"
+                @getList="getList"
+              ></select-subject-image>
             </el-dialog>
           </div>
         </div>
@@ -183,7 +297,15 @@
 </template>
 <script>
 import { getTrialCriterionList2, getTrialSiteSelect } from '@/api/trials'
-import { getSubjectCriteriaEvaluationList, batchAddOrUpdateSubjectCriteriaEvaluation, getSubjectCriteriaEvaluationVisitFilterList, getHaveGeneratedTaskList, batchGenerateTask, getVisitStudyAndSeriesList, batchAddSubjectCriteriaEvaluationVisitStudyFilter } from '@/api/trials/subject'
+import {
+  getSubjectCriteriaEvaluationList,
+  batchAddOrUpdateSubjectCriteriaEvaluation,
+  getSubjectCriteriaEvaluationVisitFilterList,
+  getHaveGeneratedTaskList,
+  batchGenerateTask,
+  getVisitStudyAndSeriesList,
+  batchAddSubjectCriteriaEvaluationVisitStudyFilter,
+} from '@/api/trials/subject'
 import BaseContainer from '@/components/BaseContainer'
 import Pagination from '@/components/Pagination'
 import batchSelectSubject from './components/batchSelectSubject'
@@ -199,12 +321,18 @@ const searchDataDefault = () => {
     Asc: true,
     SortField: null,
     PageIndex: 1,
-    PageSize: 20
+    PageSize: 20,
   }
 }
 const MinPlanCount = 10
 export default {
-  components: { BaseContainer, Pagination, selectSubject, batchSelectSubject, selectSubjectImage },
+  components: {
+    BaseContainer,
+    Pagination,
+    selectSubject,
+    batchSelectSubject,
+    selectSubjectImage,
+  },
   data() {
     return {
       OtherInfo: [],
@@ -215,12 +343,18 @@ export default {
       siteOptions: [],
       trialId: this.$route.query.trialId,
       list: [],
-      selectSubject: { visible: false, title: this.$t('trials:subject:dialogTitle:SubjectsSelect') },
+      selectSubject: {
+        visible: false,
+        title: this.$t('trials:subject:dialogTitle:SubjectsSelect'),
+      },
       selectList: [],
       total: 0,
       rowData: null,
       isBatch: false,
-      selectSubjectImage: { visible: false, title: this.$t('trials:subject:action:ImageSelect') },
+      selectSubjectImage: {
+        visible: false,
+        title: this.$t('trials:subject:action:ImageSelect'),
+      },
     }
   },
   name: 'TrialsNotice',
@@ -229,7 +363,7 @@ export default {
       if (v) {
         this.getList()
       }
-    }
+    },
   },
   mounted() {
     this.getSite()
@@ -240,9 +374,11 @@ export default {
       return !row.IsJoinEvaluation
     },
     handleSelectSubjectImage(row) {
-      this.rowData = {...row}
+      this.rowData = { ...row }
       this.selectSubjectImage.visible = true
-      this.selectSubjectImage.title = `${this.$t('trials:subject:action:ImageSelect')}(${row.SubjectCode})`
+      this.selectSubjectImage.title = `${this.$t(
+        'trials:subject:action:ImageSelect'
+      )}(${row.SubjectCode})`
     },
     handleSelectChange(e) {
       this.selectList = e
@@ -250,7 +386,7 @@ export default {
     handleSelect(row) {
       this.isBatch = true
       if (row) {
-        this.rowData = {...row}
+        this.rowData = { ...row }
         this.isBatch = false
       } else {
         if (this.selectList.length === 0) {
@@ -280,12 +416,16 @@ export default {
       this.getList()
     },
     getReadingEvaluationList(QuestionId, list) {
-      var arr = list.filter(v => {
+      var arr = list.filter((v) => {
         return v.QuestionId === QuestionId
       })
       var text = ''
-      arr.forEach(v => {
-        text += ' ' + this.$fd('ArmEnum', v.ArmEnum) + ':' + this.$fd(v.FinalTranslateDictionaryCode, parseInt(v.Answer))
+      arr.forEach((v) => {
+        text +=
+          ' ' +
+          this.$fd('ArmEnum', v.ArmEnum) +
+          ':' +
+          this.$fd(v.FinalTranslateDictionaryCode, parseInt(v.Answer))
       })
       return text
     },
@@ -293,42 +433,45 @@ export default {
       getSubjectCriteriaEvaluationList({
         ...this.searchData,
         TrialId: this.trialId,
-        TrialReadingCriterionId: this.TrialReadingCriterionId
-      }).then(res => {
+        TrialReadingCriterionId: this.TrialReadingCriterionId,
+      }).then((res) => {
         this.list = res.Result.CurrentPageData
         this.OtherInfo = res.OtherInfo
         this.total = res.Result.TotalCount
       })
     },
     getTrialCriterionList() {
-      getTrialCriterionList2(this.trialId, false).then(res => {
-        this.trialCriterionList = res.Result
-        this.TrialReadingCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
-      }).catch(() => {})
+      getTrialCriterionList2(this.trialId, false)
+        .then((res) => {
+          this.trialCriterionList = res.Result
+          this.TrialReadingCriterionId =
+            this.trialCriterionList[0].TrialReadingCriterionId
+        })
+        .catch(() => {})
     },
     // 获取site下拉框数据
     getSite() {
-      getTrialSiteSelect(this.trialId).then(res => {
+      getTrialSiteSelect(this.trialId).then((res) => {
         this.siteOptions = res.Result
       })
     },
-  }
+  },
 }
 </script>
 <style lang="scss" scoped>
-  ::v-deep .hidden-row{
-    display: none;
-  }
-  ::v-deep .el-dialog__body {
-    padding: 0px 20px;
-  }
-  ::v-deep .el-dialog__header {
-    padding: 10px 20px;
-  }
+::v-deep .hidden-row {
+  display: none;
+}
+::v-deep .el-dialog__body {
+  padding: 0px 20px;
+}
+::v-deep .el-dialog__header {
+  padding: 10px 20px;
+}
 
-  ::v-deep .el-tag--danger.el-tag--dark {
-    // background-color: #f56c6c!important;
-    border-color: none!important;
-    // color: #fff!important;
-  }
+::v-deep .el-tag--danger.el-tag--dark {
+  // background-color: #f56c6c!important;
+  border-color: none !important;
+  // color: #fff!important;
+}
 </style>

From e83ac6714d8ad3e03a0cd7cd410cec2c10426d3b Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 7 Mar 2025 13:37:22 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E9=9D=9Edicom=E5=88=97=E8=A1=A8=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=8F=82=E6=95=B0iReading=E9=BB=98=E8=AE=A4=E4=B8=BAf?=
 =?UTF-8?q?alse?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/trials.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/trials.js b/src/api/trials.js
index f5b2cb21..2ebd6066 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -1378,7 +1378,7 @@ export function getForwardList(param) {
   })
 }
 
-export function getNoneDicomStudyList(subjectVisitId, sudyId = '', isFilterZip = false, visitTaskId = '', IsReading) {
+export function getNoneDicomStudyList(subjectVisitId, sudyId = '', isFilterZip = false, visitTaskId = '', IsReading = false) {
   return request({
     url: `/NoneDicomStudy/getNoneDicomStudyList?subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}&isFilterZip=${isFilterZip}&visitTaskId=${visitTaskId}&IsReading=${IsReading}`,
     method: 'get'

From 1af302961bc9d46bc3c2445876461f8068ed9fd8 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 7 Mar 2025 14:11:53 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E9=9D=9Edicom=E9=A2=84=E8=A7=88=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/none-dicom-show/index.vue | 166 +++++++++++++++++-----------
 1 file changed, 104 insertions(+), 62 deletions(-)

diff --git a/src/views/none-dicom-show/index.vue b/src/views/none-dicom-show/index.vue
index 00c8092e..9440a1cd 100644
--- a/src/views/none-dicom-show/index.vue
+++ b/src/views/none-dicom-show/index.vue
@@ -6,67 +6,86 @@
       </div>
       <div class="left-content">
         <!-- 检查层级 -->
-        <div v-for="(study, i) in studyList" :key="study.CodeView">
-          <div class="study-desc">
-            <span>{{ study.CodeView }}</span>
-            <span v-if="OtherInfo.IsShowStudyName" style="margin-left: 5px">
-              {{ study.StudyName }}
-            </span>
-            <span style="margin: 0 5px">{{ study.Modality }}</span>
-            <span>{{ getBodyPart(study.BodyPart) }}</span>
-          </div>
-          <!-- 文件层级 -->
-          <div
-            v-if="study.NoneDicomStudyFileList.length === 0"
-            class="empty-text"
-          >
-            <slot name="empty">{{ $t('trials:audit:message:noData') }}</slot>
-          </div>
-          <div v-else id="imgList" style="height: 100%; overflow: hidden">
-            <template v-for="(item, j) in study.NoneDicomStudyFileList">
-              <div
-                :id="`img${item.Id}`"
-                :key="item.Id"
-                :class="{
-                  'is-boxActive': item.Id === currentFileId,
-                }"
-                class="img-box"
-                @click="selected(item, i, j, true)"
-              >
-                <div v-if="item.FileName.length < 15" class="img-text">
-                  {{ `${j + 1}. ${item.FileName}` }}
-                </div>
-                <el-tooltip v-else :content="item.FileName" placement="bottom">
-                  <div class="img-text">
-                    {{ `${j + 1}. ${item.FileName}` }}
-                  </div>
-                </el-tooltip>
-                <div v-if="isQcCheck" class="switchBox">
-                  <div class="item">
-                    <span>{{ $t('trials:audit:table:isReading') }}</span>
-                    <el-switch
-                      v-model="item.IsReading"
-                      :disabled="item.IsDeleted || isAudit"
-                      @change="changeReadingStatus($event, study, item)"
-                      :active-text="$fd('YesOrNo', true)"
-                      :inactive-text="$fd('YesOrNo', false)"
-                    />
-                  </div>
-                  <div class="item">
-                    <span>{{ $t('trials:audit:table:isDelete') }}</span>
-                    <el-switch
-                      v-model="item.IsDeleted"
-                      :disabled="isAudit"
-                      @change="changeDeleteStatus($event, study, item)"
-                      :active-text="$fd('YesOrNo', true)"
-                      :inactive-text="$fd('YesOrNo', false)"
-                    />
-                  </div>
-                </div>
+        <el-collapse v-model="activeNames" @change="handleChange">
+          <el-collapse-item
+            v-for="(study, i) in studyList"
+            :key="study.CodeView"
+            :name="study.CodeView"
+            ><template slot="title">
+              <div class="study-desc">
+                <span>{{ study.CodeView }}</span>
+                <span v-if="OtherInfo.IsShowStudyName" style="margin-left: 5px">
+                  {{ study.StudyName }}
+                </span>
+                <span style="margin: 0 5px">{{ study.Modality }}</span>
+                <span>{{ getBodyPart(study.BodyPart) }}</span>
               </div>
             </template>
-          </div>
-        </div>
+            <!-- 文件层级 -->
+            <div
+              v-if="study.NoneDicomStudyFileList.length === 0"
+              class="empty-text"
+            >
+              <slot name="empty">{{ $t('trials:audit:message:noData') }}</slot>
+            </div>
+            <div v-else id="imgList" style="height: 100%; overflow: hidden">
+              <template v-for="(item, j) in study.NoneDicomStudyFileList">
+                <div
+                  :id="`img${item.Id}`"
+                  :key="item.Id"
+                  :class="{
+                    'is-boxActive': item.Id === currentFileId,
+                  }"
+                  class="img-box"
+                  @click="selected(item, i, j, true)"
+                >
+                  <div v-if="item.FileType === 'image/jpeg'" class="file-image">
+                    <el-image
+                      style="width: 100%; height: 100%"
+                      :src="`${OSSclientConfig.basePath}${item.Path}?x-oss-process=image/resize,w_50,h_50/format,png`"
+                      fit="contain"
+                      crossorigin="anonymous"
+                    />
+                  </div>
+                  <div v-if="item.FileName.length < 15" class="img-text">
+                    {{ `${j + 1}. ${item.FileName}` }}
+                  </div>
+                  <el-tooltip
+                    v-else
+                    :content="item.FileName"
+                    placement="bottom"
+                  >
+                    <div class="img-text">
+                      {{ `${j + 1}. ${item.FileName}` }}
+                    </div>
+                  </el-tooltip>
+                  <div v-if="isQcCheck" class="switchBox">
+                    <div class="item">
+                      <span>{{ $t('trials:audit:table:isReading') }}</span>
+                      <el-switch
+                        v-model="item.IsReading"
+                        :disabled="item.IsDeleted || isAudit"
+                        @change="changeReadingStatus($event, study, item)"
+                        :active-text="$fd('YesOrNo', true)"
+                        :inactive-text="$fd('YesOrNo', false)"
+                      />
+                    </div>
+                    <div class="item">
+                      <span>{{ $t('trials:audit:table:isDelete') }}</span>
+                      <el-switch
+                        v-model="item.IsDeleted"
+                        :disabled="isAudit"
+                        @change="changeDeleteStatus($event, study, item)"
+                        :active-text="$fd('YesOrNo', true)"
+                        :inactive-text="$fd('YesOrNo', false)"
+                      />
+                    </div>
+                  </div>
+                </div>
+              </template>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
       </div>
     </el-card>
     <!-- 预览图像 -->
@@ -136,6 +155,8 @@ export default {
       },
       isQcCheck: false,
       isAudit: false,
+
+      activeNames: [],
     }
   },
   async created() {
@@ -153,6 +174,7 @@ export default {
     // 默认选择第一个文件
   },
   methods: {
+    handleChange() {},
     changeReadingStatus(callback, row, file) {
       let statusStr = ''
       if (callback) {
@@ -282,6 +304,8 @@ export default {
           const studyIndex = this.studyList.findIndex((item) => {
             return item.NoneDicomStudyFileList.length > 0
           })
+          this.activeNames = this.studyList.map((item) => item.CodeView)
+          console.log(this.activeNames)
           if (studyIndex > -1) {
             var fileObj = this.studyList[studyIndex]['NoneDicomStudyFileList']
             this.selected(fileObj[0], studyIndex, 0, true)
@@ -364,7 +388,7 @@ export default {
   }
 }
 .study-desc {
-  padding: 15px 5px;
+  padding: 10px 5px;
   line-height: 20px;
   background-color: #d5d5d5;
   font-weight: 500;
@@ -409,6 +433,11 @@ export default {
     display: inline-block;
     box-sizing: border-box;
     border-bottom: 2px solid #f3f3f3;
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    padding: 5px 10px;
 
     cursor: pointer;
     // margin-bottom: 5px;
@@ -416,7 +445,8 @@ export default {
   }
   .img-text {
     display: inline-block;
-    width: 200px;
+    width: calc(100% - 60px);
+    margin-left: 5px;
     height: 50px;
     line-height: 50px;
     overflow: hidden;
@@ -444,7 +474,8 @@ export default {
   }
 }
 .switchBox {
-  margin-bottom: 5px;
+  width: 100%;
+  margin: 5px 0;
   color: #4e4e4e;
   .item {
     display: flex;
@@ -453,4 +484,15 @@ export default {
     margin-bottom: 5px;
   }
 }
+.file-image {
+  width: 50px;
+  height: 50px;
+}
+::v-deep .el-collapse-item__header {
+  background-color: #d5d5d5;
+}
+::v-deep .el-collapse-item__header {
+  min-height: 48px;
+  height: auto;
+}
 </style>

From c74b482f0d78b43b4d7c43003f8e857e3998a446 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 7 Mar 2025 14:13:57 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E9=9D=9Edicom=E9=A2=84=E8=A7=88=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/none-dicom-show/index.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/none-dicom-show/index.vue b/src/views/none-dicom-show/index.vue
index 9440a1cd..370c7bfe 100644
--- a/src/views/none-dicom-show/index.vue
+++ b/src/views/none-dicom-show/index.vue
@@ -495,4 +495,7 @@ export default {
   min-height: 48px;
   height: auto;
 }
+::v-deep .el-collapse-item__content{
+  padding-bottom: 0;
+}
 </style>