From 6279d1db56c140055448e987166839b2b9573424 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 16 Apr 2024 13:42:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/read-task/index.vue  | 14 +++----
 .../reading/reading-tracking/index.vue        | 42 ++++++++++++++++---
 2 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/read-task/index.vue b/src/views/trials/trials-panel/reading/read-task/index.vue
index 9c1811a..0c9abec 100644
--- a/src/views/trials/trials-panel/reading/read-task/index.vue
+++ b/src/views/trials/trials-panel/reading/read-task/index.vue
@@ -241,29 +241,29 @@
               @click="handleReadImage(scope.row)"
             />
             <!-- 重阅 -->
-            <el-button
+            <!-- <el-button
               v-hasPermi="['trials:readTask:reread']"
               circle
               :title="$t('trials:readTask:button:reread')"
               icon="el-icon-collection"
-              @click="handleReadImage(scope.row)"
-            />
+              @click="openApplyReReading(scope.row)"
+            /> -->
             <!-- 下载报告 -->
-            <el-button
+            <!-- <el-button
               v-hasPermi="['trials:readTask:report']"
               circle
               :title="$t('trials:reading:button:uploadReport')"
               icon="el-icon-collection"
               @click="handleReadImage(scope.row)"
-            />
+            /> -->
             <!-- 审核记录 -->
-            <el-button
+            <!-- <el-button
               v-hasPermi="['trials:readTask:auditRecord']"
               circle
               :title="$t('trials:auditRecord:table:auditRecords')"
               icon="el-icon-collection"
               @click="handleReadImage(scope.row)"
-            />
+            /> -->
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/trials/trials-panel/reading/reading-tracking/index.vue b/src/views/trials/trials-panel/reading/reading-tracking/index.vue
index 3ec1bf9..ad056a4 100644
--- a/src/views/trials/trials-panel/reading/reading-tracking/index.vue
+++ b/src/views/trials/trials-panel/reading/reading-tracking/index.vue
@@ -167,8 +167,11 @@
           prop="DoctorUser"
           :label="$t('trials:reviewAssign:searchForm:reader')"
           show-overflow-tooltip
-          sortable="custom"
-        />
+        >
+          <template slot-scope="scope">
+            <span>{{ scope.row.DoctorUser.UserName }}</span>
+          </template>
+        </el-table-column>
         <!-- 阅片标准 -->
         <el-table-column
           prop="TrialReadingCriterionName"
@@ -191,9 +194,12 @@
         >
           <template slot-scope="scope">
             <!--阅片结果-->
-            <el-button type="text" @click="readResult(scope.row)" disabled>{{
-              $t("trials:auditRecord:table:readingResult")
-            }}</el-button>
+            <el-button
+              type="text"
+              @click="readResult(scope.row)"
+              :disabled="scope.row.ReadingTaskState !== 2"
+              >{{ $t("trials:auditRecord:table:readingResult") }}</el-button
+            >
             <!--下载报告-->
             <el-button
               type="text"
@@ -220,6 +226,7 @@
 import BaseContainer from "@/components/BaseContainer";
 import Pagination from "@/components/Pagination";
 import { getPatientVisitTaskList } from "@/api/readManagenent.js";
+import { getToken } from "@/utils/auth";
 const defaultSearchData = () => {
   return {
     SubjectCode: null,
@@ -306,7 +313,30 @@ export default {
     // 下载报告
     downloadReport() {},
     // 阅片结果
-    readResult() {},
+    readResult(row) {
+      if (this.openWindow) {
+        this.openWindow.close();
+      }
+      var token = getToken();
+      var path;
+      // if (row.ReadingTool === 0) {
+      path = `/readingDicoms?TrialReadingCriterionId=${
+        row.TrialReadingCriterionId
+      }&trialId=${this.$route.query.trialId}&subjectCode=${
+        row.SubjectCode
+      }&subjectId=${row.SubjectId}&visitTaskId=${
+        row.Id
+      }&isReadingTaskViewInOrder=${true}&criterionType=${
+        row.CriterionType
+      }&readingTool=${row.ReadingTool}&TokenKey=${token}`;
+      // } else {
+      //   path = `/noneDicomReading?TrialReadingCriterionId=${row.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${row.SubjectCode}&subjectId=${row.SubjectId}&visitTaskId=${row.Id}&isReadingTaskViewInOrder=${row.IsReadingTaskViewInOrder}&criterionType=${row.CriterionType}&readingTool=${row.ReadingTool}&TokenKey=${token}`;
+      // }
+      // const routeData = this.$router.resolve({
+      //   path: `/readingPage?subjectId=${row.SubjectId}&trialId=${row.TrialId}&visitTaskId=${row.Id}&TokenKey=${token}`
+      // })
+      this.openWindow = window.open(path, "_blank");
+    },
   },
 };
 </script>