From 91c78127f2d693c5a3e10f46af57d45ed43fbad6 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 1 Aug 2024 15:46:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E9=98=85?=
 =?UTF-8?q?=E7=89=87=E6=84=8F=E8=A7=81=E5=8F=8D=E9=A6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customize/CustomizeMeasurementList.vue    | 81 ++++++++++++++++++-
 1 file changed, 80 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeMeasurementList.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeMeasurementList.vue
index afe87973..396521f0 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeMeasurementList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeMeasurementList.vue
@@ -23,10 +23,15 @@
         :criterionId="TrialReadingCriterionId">
       </QuestionsPreview>
     </div>
-    <div style="position: absolute;bottom:0;left: 0;z-index: 10;background: #000;width: 100%;display: flex;justify-content: right;align-items: center;height: 50px">
+    <div class="questions-footer">
+      <i class="el-icon-question feedback-icon" @click="openFeedBackTable" />
       <el-button size="mini" v-if="readingTaskState<2" style="margin-right: 10px" @click="handleSave(true)">
         {{$t('common:button:save')}}
       </el-button>
+      <el-button v-if="readingTaskState<2 && IseCRFShowInDicomReading" type="primary" size="mini" @click="skipTask">
+        <!-- 跳过 -->
+        {{ $t('trials:readingReport:button:skip') }}
+      </el-button>
       <el-button size="mini" style="margin-right: 10px"  v-if="readingTaskState<2 && IseCRFShowInDicomReading" @click="handleConfirm">
         {{ $t('common:button:submit') }}</el-button>
     </div>
@@ -88,6 +93,7 @@
 <script>
 import { submitDicomVisitTask } from '@/api/trials'
 import { getCustomTag, submitCustomTag, resetReadingTask } from '@/api/reading'
+import { setSkipReadingCache } from '@/api/reading'
 import DicomEvent from './../components/DicomEvent'
 import SignForm from '@/views/trials/components/newSignForm'
 import QuestionsPreview from './CustomizeQuestionsPreview'
@@ -394,6 +400,57 @@ export default {
         console.log(e)
       }
     },
+    async skipTask() {
+      try {
+        // 是否确认跳过？
+        const confirm = await this.$confirm(
+          this.$t('trials:readingReport:message:skipConfirm'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true
+          }
+        )
+        if (confirm !== 'confirm') return
+        this.loading = true
+        const res = await setSkipReadingCache({ visitTaskId: this.visitTaskId })
+        this.loading = false
+        if (res.IsSuccess) {
+          window.location.reload()
+        }
+      } catch (e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    openFeedBackTable() {
+      this.$FB({
+        type: 'imgfail',
+        trialId: this.$route.query.trialId,
+        visitTaskId: this.visitTaskId,
+        callBack: async() => {
+          console.log('callBack')
+          const confirm = await this.$confirm(
+            this.$t('trials:reading:confirm:feedbackmsg'),
+            {
+              type: 'warning',
+              distinguishCancelAndClose: true
+            }
+          )
+          if (confirm !== 'confirm') return
+          this.loading = true
+          try {
+            const res = await setSkipReadingCache({ visitTaskId: this.visitTaskId })
+            this.loading = false
+            if (res.IsSuccess) {
+              window.location.reload()
+            }
+          } catch (e) {
+            this.loading = false
+            console.log(e)
+          }
+        }
+      })
+    }
   }
 }
 </script>
@@ -484,5 +541,27 @@ export default {
     }
 
   }
+  .questions-footer{
+    position: absolute;
+    bottom:0;
+    left: 0;
+    z-index: 10;
+    background: #000;
+    width: 100%;
+    display: flex;
+    justify-content: right;
+    align-items: center;
+    height: 50px;
+    .feedback-icon{
+      padding: 0 10px;
+      color: #fff;
+      font-weight: 400;
+      font-size: 22px;
+      cursor: pointer;
+      &:hover{
+        color: #68a2d5;
+      }
+    }
+  }
 }
 </style>

From c5758b17dfba6e7bc74bb46e8a6e22135d654773 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 1 Aug 2024 15:58:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=98=85=E7=89=87=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/customize/CustomizeMeasurementList.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeMeasurementList.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeMeasurementList.vue
index 396521f0..9d2c2855 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeMeasurementList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeMeasurementList.vue
@@ -25,14 +25,14 @@
     </div>
     <div class="questions-footer">
       <i class="el-icon-question feedback-icon" @click="openFeedBackTable" />
-      <el-button size="mini" v-if="readingTaskState<2" style="margin-right: 10px" @click="handleSave(true)">
+      <el-button v-if="readingTaskState<2" style="margin-right: 10px" size="small" @click="handleSave(true)">
         {{$t('common:button:save')}}
       </el-button>
-      <el-button v-if="readingTaskState<2 && IseCRFShowInDicomReading" type="primary" size="mini" @click="skipTask">
+      <el-button v-if="readingTaskState<2 && IseCRFShowInDicomReading" type="primary" size="small" @click="skipTask">
         <!-- 跳过 -->
         {{ $t('trials:readingReport:button:skip') }}
       </el-button>
-      <el-button size="mini" style="margin-right: 10px"  v-if="readingTaskState<2 && IseCRFShowInDicomReading" @click="handleConfirm">
+      <el-button style="margin-right: 10px" size="small" v-if="readingTaskState<2 && IseCRFShowInDicomReading" @click="handleConfirm">
         {{ $t('common:button:submit') }}</el-button>
     </div>
     <!-- 签名框 -->
@@ -556,7 +556,7 @@ export default {
       padding: 0 10px;
       color: #fff;
       font-weight: 400;
-      font-size: 22px;
+      font-size: 24px;
       cursor: pointer;
       &:hover{
         color: #68a2d5;