From c31bc89746ec580ee1372f2c7a685cf2d8c81e6f Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 27 Nov 2025 09:40:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=B6=E6=AE=B5=E6=A0=87=E6=B3=A8=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../downloadDicomAndNonedicom/index.vue       |  2 +-
 .../uploadDicomAndNonedicom/dicomFile.vue     |  5 ++-
 .../uploadDicomAndNonedicom/study-view.vue    | 10 ++++-
 .../reading-task/components/TargetSection.vue | 43 ++++++++++++++++---
 4 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/src/components/downloadDicomAndNonedicom/index.vue b/src/components/downloadDicomAndNonedicom/index.vue
index 4c3582a2..cf60e9ab 100644
--- a/src/components/downloadDicomAndNonedicom/index.vue
+++ b/src/components/downloadDicomAndNonedicom/index.vue
@@ -479,7 +479,7 @@ export default {
       let trialId = this.$route.query.trialId
       var token = getToken()
       const routeData = this.$router.resolve({
-        path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&TokenKey=${token}&isReading=true`,
+        path: `/showNoneDicoms?trialId=${trialId}&visitTaskId=${row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&TokenKey=${token}&isReading=true`,
       })
       this.open = window.open(routeData.href, '_blank')
     },
diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue
index a727fc00..842eef4f 100644
--- a/src/components/uploadDicomAndNonedicom/dicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue
@@ -301,7 +301,8 @@
       </el-table-column>
     </el-table>
     <study-view v-if="model_cfg.visible" :model_cfg="model_cfg" :IsDicom="true" :bodyPart="bodyPart"
-      :modelList="modelList" :isUpload="openIsUpload" :TrialModality="TrialModality" @getList="getList" />
+      :subjectVisitId="openSubjectVisitId" :modelList="modelList" :isUpload="openIsUpload"
+      :TrialModality="TrialModality" @getList="getList" />
   </div>
 </template>
 <script>
@@ -415,6 +416,7 @@ export default {
       open: null,
       bodyPart: {},
       openIsUpload: false,
+      openSubjectVisitId: null,
       TrialModality: [],
     }
   },
@@ -533,6 +535,7 @@ export default {
     // 打开弹窗
     handleOpenDialog(item, list, isUpload = false) {
       this.openIsUpload = isUpload
+      this.openSubjectVisitId = item.SubjectVisitId || item.SourceSubjectVisitId
       this.model_cfg.title = `${item.SubjectCode || ''} > ${this.IsImageSegment ? item.VisitName : item.TaskBlindName}`
       this.modelList = item[list]
       this.model_cfg.visible = true
diff --git a/src/components/uploadDicomAndNonedicom/study-view.vue b/src/components/uploadDicomAndNonedicom/study-view.vue
index 28be2ef4..f0215efb 100644
--- a/src/components/uploadDicomAndNonedicom/study-view.vue
+++ b/src/components/uploadDicomAndNonedicom/study-view.vue
@@ -2,6 +2,9 @@
   <div v-if="model_cfg.visible">
     <base-model :config="model_cfg">
       <div slot="dialog-body">
+        <el-button v-if="!isUpload" type='primary' size="small" style="float:right;" @click="preview">
+          {{ $t("common:button:preview") }}
+        </el-button>
         <el-table :data="modelList" style="width: 100%" height="300">
           <!--检查编号-->
           <el-table-column prop="StudyCode" :label="$t('trials:uploadImage:table:StudyCode')" />
@@ -109,6 +112,10 @@ export default {
     visitTaskId: {
       type: String,
     },
+    subjectVisitId: {
+      type: String,
+      default: ''
+    },
     IsDicom: {
       required: true,
       type: Boolean,
@@ -153,8 +160,9 @@ export default {
       let routeData = null
       if (this.IsDicom) {
         var token = getToken()
+        let trialId = this.$route.query.trialId
         routeData = this.$router.resolve({
-          path: `/showdicom?studyId=${row.Id}&TokenKey=${token}&type=Study&visitTaskId=${this.visitTaskId}&isReading=true`,
+          path: `/showvisitdicoms?trialId=${trialId}&subjectVisitId=${this.subjectVisitId}&isReading=1&TokenKey=${token}`,
         })
       } else {
         let trialId = this.$route.query.trialId
diff --git a/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue b/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue
index ddc0fab8..60d7a846 100644
--- a/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue
+++ b/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue
@@ -1,5 +1,23 @@
 <template>
     <BaseContainer>
+        <div slot="search-container">
+            <el-form :inline="true">
+                <!-- 受试者编号 -->
+                <el-form-item :label="$t('trials:pendingReadingTasks:table:subjectCode')">
+                    <el-input v-model="searchData.SubjectCode" style="width: 130px" clearable />
+                </el-form-item>
+                <el-form-item>
+                    <!-- 查询 -->
+                    <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">
+                        {{ $t('common:button:reset') }}
+                    </el-button>
+                </el-form-item>
+            </el-form>
+        </div>
         <div slot="main-container">
             <el-table v-adaptive="{ bottomOffset: 75 }" :data="list" stripe height="100" @sort-change="handleSortChange"
                 v-loading="loading">
@@ -18,23 +36,26 @@
                     sortable="custom" />
                 <!-- 访视数量 -->
                 <el-table-column prop="VisitCount" :label="$t('trials:pendingReadingTasks:table:VisitCount')"
-                    show-overflow-tooltip />
+                    show-overflow-tooltip sortable="custom" />
                 <!-- dicom检查数量 -->
                 <el-table-column prop="DicomStudyCount" :label="$t('trials:pendingReadingTasks:table:DicomStudyCount')"
-                    show-overflow-tooltip />
+                    show-overflow-tooltip sortable="custom" />
                 <!-- 非dicom检查数量 -->
                 <el-table-column prop="NoneDicomStudyCount"
-                    :label="$t('trials:pendingReadingTasks:table:NoneDicomStudyCount')" show-overflow-tooltip />
+                    :label="$t('trials:pendingReadingTasks:table:NoneDicomStudyCount')" show-overflow-tooltip
+                    sortable="custom" />
                 <!-- 标记访视数量 -->
                 <el-table-column prop="MarkVisitCount" :label="$t('trials:pendingReadingTasks:table:MarkVisitCount')"
-                    show-overflow-tooltip />
+                    show-overflow-tooltip sortable="custom" />
                 <!-- 标记dicom检查数量 -->
                 <el-table-column prop="MarkDicomStudyCount"
-                    :label="$t('trials:pendingReadingTasks:table:MarkDicomStudyCount')" show-overflow-tooltip />
+                    :label="$t('trials:pendingReadingTasks:table:MarkDicomStudyCount')" show-overflow-tooltip
+                    sortable="custom" />
                 <!-- 标记非dicom检查数量 -->
                 <el-table-column prop="MarkNoneDicomStudyCount"
-                    :label="$t('trials:pendingReadingTasks:table:MarkNoneDicomStudyCount')" show-overflow-tooltip />
-                <el-table-column :label="$t('common:action:action')" width="250" fixed="right">
+                    :label="$t('trials:pendingReadingTasks:table:MarkNoneDicomStudyCount')" show-overflow-tooltip
+                    sortable="custom" />
+                <el-table-column :label="$t('common:action:action')" width="100" fixed="right">
                     <template slot-scope="scope">
                         <!-- 阅片 -->
                         <!-- <el-button :disabled="scope.row.ExistReadingApply" circle :title="scope.row.ExistReadingApply
@@ -118,6 +139,14 @@ export default {
         this.getList()
     },
     methods: {
+        handleSearch() {
+            this.searchData.PageIndex = 1
+            this.getList()
+        },
+        handleReset() {
+            this.searchData = searchDataDefault()
+            this.getList()
+        },
         async getList() {
             try {
                 this.searchData.TrialId = this.$route.query.trialId