From 1022fa2888ade7d2023c52aeaec23d795dd7ab9f Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 17 Jun 2025 16:49:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=98=85=E7=89=87=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0admin=E8=A7=92=E8=89=B2=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials/trials-panel/reading/read-order/index.vue  | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/read-order/index.vue b/src/views/trials/trials-panel/reading/read-order/index.vue
index 4bc3dfd2..6d0dff80 100644
--- a/src/views/trials/trials-panel/reading/read-order/index.vue
+++ b/src/views/trials/trials-panel/reading/read-order/index.vue
@@ -71,7 +71,7 @@
                     </el-button>
                     <!-- 随机排序 -->
                     <el-button type="primary" @click="randomOrder"
-                        :disabled="!searchData.TrialReadingCriterionId || !searchData.DoctorUserId">
+                        :disabled="!searchData.TrialReadingCriterionId || !searchData.DoctorUserId" v-if="!isAdmin">
                         {{ $t('trials:readingTracking:button:order') }}
                     </el-button>
                 </el-form-item>
@@ -189,7 +189,7 @@
                     <template slot-scope="scope">
                         <el-input-number v-model="scope.row.RandomOrder"
                             @change="(value, old) => handleChange(scope.row, value, old)" :min="0" style="width: 150px;"
-                            v-if="scope.row.ReadingTaskState !== 1"></el-input-number>
+                            v-if="scope.row.ReadingTaskState !== 1 && !isAdmin"></el-input-number>
                         <span v-else>{{ scope.row.RandomOrder }}</span>
                     </template>
                 </el-table-column>
@@ -260,7 +260,12 @@ export default {
         }
     },
     created() {
-        if (!this.hasPermi(['role:pm', 'role:apm'])) return this.$router.replace("/login")
+        if (!this.hasPermi(['role:pm', 'role:apm', 'role:admin'])) return this.$router.replace("/login")
+    },
+    computed: {
+        isAdmin() {
+            return !!this.hasPermi(['role:admin'])
+        }
     },
     mounted() {
         this.getSite()

From d8315fbfff1b5456aaf08633e6e10465a9bbb2de Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 18 Jun 2025 09:55:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=98=85=E7=89=87=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=8C=89=E9=92=AE=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms3D/components/ReadPage.vue  | 93 ++++++++++++++++++-
 1 file changed, 91 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
index b019dd7a..0fd73b15 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -303,6 +303,38 @@
                 </div>
               </div>
             </div>
+            <div
+                class="tool-item"
+                :title="$t('trials:reading:button:upload')"
+                v-if="trialCriterion.ImageUploadEnum > 0 && readingTaskState < 2"
+                v-hasPermi="['role:ir']"
+              >
+                <div class="tool-wrapper">
+                <div class="icon" @click.prevent="openUploadImage('upload')">
+                  <i class="el-icon-upload2 svg-icon" />
+                </div>
+              </div>
+            </div>
+            <div
+              v-if="trialCriterion.ImageDownloadEnum > 0"
+              v-hasPermi="[
+                'role:ir',
+                'role:mim',
+                'role:mc',
+                'role:pm',
+                'role:apm',
+                'role:ea',
+                'role:qa',
+              ]"
+              class="tool-item"
+              :title="$t('trials:reading:button:download')"
+            >
+              <div class="tool-wrapper">
+                <div class="icon" @click.prevent="openUploadImage('download')">
+                  <i class="el-icon-download svg-icon" />
+                </div>
+              </div>
+            </div>
             <!-- 伪彩 -->
              <template v-if="readingTool === 2">
                 <colorMap v-show="isFusion" ref="colorMap" @setColorMap="setColorMap" @voiChange="voiChange" />
@@ -526,10 +558,28 @@
       width="850px" >
       <FusionForm v-if="fusionVisible" :activeTaskIndex="activeTaskIndex" :taskList="visitTaskList" @close="closeFusion" @fusion="handleFusion" />
     </el-dialog>
+
+    <upload-dicom-and-nonedicom
+      v-if="uploadImageVisible"
+      :subject-id="uploadSubjectId"
+      :subject-code="uploadSubjectCode"
+      :criterion="uploadTrialCriterion"
+      :visible.sync="uploadImageVisible"
+      :visit-task-id="taskId"
+      :is-reading-task-view-in-order="isReadingTaskViewInOrder"
+    />
+    <download-dicom-and-nonedicom
+      v-if="downloadImageVisible"
+      :subject-id="uploadSubjectId"
+      :subject-code="uploadSubjectCode"
+      :criterion="uploadTrialCriterion"
+      :task-id="taskId"
+      :visible.sync="downloadImageVisible"
+    />
   </div>
 </template>
 <script>
-import { getRelatedVisitTask, getReadingVisitStudyList, getTableAnswerRowInfoList, deleteCustomTag } from '@/api/trials'
+import { getRelatedVisitTask, getReadingVisitStudyList, getTableAnswerRowInfoList, deleteCustomTag, getCriterionReadingInfo } from '@/api/trials'
 import { getDoctorShortcutKey, getUserWLTemplateList } from '@/api/user'
 import { getCustomTag, submitCustomTag } from '@/api/reading'
 import {
@@ -565,6 +615,8 @@ import ClinicalData from '@/views/trials/trials-panel/reading/clinical-data'
 import FusionForm from './FusionForm.vue'
 import colorMap from './colorMap.vue'
 import RectangleROITool from './tools/RectangleROITool'
+import uploadDicomAndNonedicom from '@/components/uploadDicomAndNonedicom'
+import downloadDicomAndNonedicom from '@/components/downloadDicomAndNonedicom'
 const { visibility } = annotation
 const { ViewportType, Events } = Enums
 const renderingEngineId = 'myRenderingEngine'
@@ -638,7 +690,9 @@ export default {
     Others,
     ClinicalData,
     FusionForm,
-    colorMap
+    colorMap,
+    downloadDicomAndNonedicom,
+    uploadDicomAndNonedicom,
   },
   data() {
     return {
@@ -711,6 +765,17 @@ export default {
       fusionSerieId: {},
       loadingText: null,
       // resetAnnotation: false , // 是否初始化标记 （融合时使用）
+
+         // 上传
+      downloadImageVisible: false,
+      uploadImageVisible: false,
+      uploadSubjectId: null,
+      uploadSubjectCode: null,
+      uploadTrialCriterion: {},
+      uploadStatus: 'upload',
+      taskId: '',
+      isReadingTaskViewInOrder: null,
+      trialCriterion: {}
     }
   },
   computed: {
@@ -739,6 +804,7 @@ export default {
     }
   },
   watch: {
+    currentReadingTaskState(){console.log(this.currentReadingTaskState,'currentReadingTaskState')},
     activeTaskId: {
       immediate: true,
       handler(id) {
@@ -788,6 +854,7 @@ export default {
   },
   mounted() {
     this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
+    this.isReadingTaskViewInOrder = this.taskInfo.IsReadingTaskViewInOrder
     this.criterionType = this.taskInfo.CriterionType
     const digitPlaces = Number(localStorage.getItem('digitPlaces'))
     this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
@@ -812,6 +879,7 @@ export default {
       this.initLoader()
       this.getWwcTpl()
       this.getHotKeys()
+      this.getTrialCriterion()
     })
   },
   methods: {
@@ -2851,6 +2919,27 @@ export default {
     closeFusion() {
       this.fusionVisible = false
     },
+    getTrialCriterion() {
+      getCriterionReadingInfo({
+        TrialId: this.$route.query.trialId,
+        TrialReadingCriterionId: this.$route.query.TrialReadingCriterionId
+      })
+        .then((res) => {
+          this.trialCriterion = res.Result
+        })
+        .catch(() => {})
+    },
+    openUploadImage(status) {
+      const idx = this.visitTaskList.findIndex(i => i.IsCurrentTask)
+      if (idx > -1) {
+        this.taskId = this.visitTaskList[idx].VisitTaskId
+      }
+      this.uploadSubjectCode = localStorage.getItem("subjectCode")
+      this.uploadSubjectId = localStorage.getItem("subjectId")
+      this.uploadTrialCriterion = this.trialCriterion
+      this.uploadStatus = status
+      this[`${status}ImageVisible`] = true
+    },
   }
 }
 </script>