From 8c5a364d23817607f26b3edb0b0dae603269bee8 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 6 Mar 2024 15:09:33 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/mim-medical-audit/components/ChatForm.vue     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
index c787a79e..2604f92a 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
@@ -11,13 +11,13 @@
               <span>({{ record.CreateTime }}) </span>
             </p>
             <div class="info-content">
-              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && record.MedicalDialogCloseEnum!== null">
+              <template v-if="record.MedicalDialogCloseEnum!== null">
 
                 <div>{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}</div>
                 <div v-if="record.Content">{{ $t('trials:medicalFeedback:title:closereasonRemarks') }}{{ record.Content }}</div>
 
               </template>
-              <template v-else-if="[14, 30].includes(record.UserTypeEnumInt) && !record.Content">
+              <template v-else-if="!record.Content">
                 <div>
                   <!-- 您好，根据医学审核反馈，该阅片任务的评估有如下问题需要您确认或澄清： -->
                   {{ $t('trials:medicalFeedback:message:msg1') }}
@@ -50,7 +50,7 @@
                   {{ $t('trials:medicalFeedback:message:msg4') }}
                 </div>
               </template>
-              <template v-else-if="[14, 30].includes(record.UserTypeEnumInt) && record.Content">
+              <template v-else-if="record.Content">
                 <div>{{ record.Content }}</div>
               </template>
 
@@ -83,7 +83,7 @@
       </div>
     </div>
     <div
-      v-if="otherInfo && !otherInfo.IsClosedDialog && [14, 30].includes(userTypeEnumInt)"
+      v-if="otherInfo && !otherInfo.IsClosedDialog && hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit'])"
       class="chat-message"
     >
       <div class="message">

From 10a1238ab5c0e4471cea2dd97533b3a35c7e7d56 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 6 Mar 2024 16:09:24 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../medical-feedback/components/ChatForm.vue  | 45 +++++++------------
 .../mim-medical-audit/components/ChatForm.vue | 22 ++++-----
 .../components/MedicalAudit.vue               |  2 +-
 .../reading/mim-medical-audit/index.vue       |  6 +--
 4 files changed, 31 insertions(+), 44 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
index d6f5def4..a5634ecd 100644
--- a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
@@ -11,20 +11,20 @@
               <span>({{ record.CreateTime }}) </span>
             </p>
             <div class="info-content">
-              <template v-if="[14, 30].includes(record.userTypeEnumInt) && record.MedicalDialogCloseEnum!== null">
-
+              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && (record.MedicalDialogCloseEnum!== null || record.Content)">
                 <div>{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}</div>
                 <div v-if="record.Content">{{ $t('trials:medicalFeedback:title:closereasonRemarks') }}{{ record.Content }}</div>
+
               </template>
-              <template v-else-if="[14, 30].includes(record.userTypeEnumInt) && !record.Content">
+              <template v-else-if="[14, 30].includes(record.UserTypeEnumInt) && record.Questioning">
                 <div>
                   <!-- 您好，根据医学审核反馈，该阅片任务的评估有如下问题需要您确认或澄清： -->
                   {{ $t('trials:medicalFeedback:message:msg1') }}
-                  <ol>
+                  <ol style="font-weight: bold;">
                     {{ record.Questioning }}
                   </ol>
                 </div>
-                <div v-if="record.FileList && record.FileList.length > 0" style="margin-top:5px;">
+                <div v-if="record.FileList && record.FileList.length > 0" style="margin-top:10px;">
                   <!-- 本次医学审核相关截图（如适用）如下： -->
                   {{ $t('trials:medicalFeedback:message:msg2') }}
                   <ol>
@@ -37,43 +37,31 @@
                     </li>
                   </ol>
                 </div>
-                <div style="margin-top:5px;">
+                <div style="margin-top:10px;">
                   <!-- 根据本项目《独立影像评估章程》的相关约定，该类问题医学审核建议为： -->
                   {{ $t('trials:medicalFeedback:message:msg3') }}
                   <ol>
                     <span style="color:red">{{ $fd('AuditAdvice', record.AuditAdviceEnum) }}</span>
                   </ol>
-
                 </div>
-                <div style="margin-top:5px;">
+                <div style="margin-top:10px;">
                   <!-- 为高效解决/处理以上全部医学反馈问题，麻烦您在对该阅片任务的评估准确复核后，明确是否认可医学反馈问题及结论。如不认可医学反馈，请逐条准确完整回复不认可的原因，非常感谢。 -->
                   {{ $t('trials:medicalFeedback:message:msg4') }}
                 </div>
               </template>
-              <template v-else-if="[14, 30].includes(record.userTypeEnumInt) && record.Content">
+              <template v-else-if="[14, 30].includes(record.UserTypeEnumInt)">
                 <div>{{ record.Content }}</div>
               </template>
-              <template v-else>
+
+              <template v-else-if="[13].includes(record.UserTypeEnumInt)">
                 <div>
-                  <!-- 是否认可医学反馈： -->
                   {{ $t('trials:medicalFeedback:title:isEndorse') }}{{ $fd('MedicalReviewDoctorUserIdea', record.DoctorUserIdeaEnum) }}
                 </div>
-                <div v-if="record.DoctorUserIdeaEnum===2">
-                  <!-- 原因： -->
-                  {{ $t('trials:medicalFeedback:title:reason') }}{{ record.DisagreeReason }}
-                </div>
-                <div v-if="record.IsApplyHeavyReading !== null">
+                <div v-if="record.DoctorUserIdeaEnum===2"> {{ $t('trials:medicalFeedback:title:reason') }}{{ record.DisagreeReason }}</div>
+                <div v-if="record.MedicalDialogCloseEnum!== null">
                   <!-- 是否申请重阅： -->
                   {{ $t('trials:medicalFeedback:title:isRequestReread') }}{{ $fd('YesOrNo', record.IsApplyHeavyReading) }}
                 </div>
-                <!-- <div v-if="record.ImagePath" style="margin-top:5px;">
-                  本次医学审核相关截图（如适用）如下：
-                  <el-button
-                    type="text"
-                    @click="previewImage(record.ImagePath)"
-                  >{{ record.FileName }}</el-button>
-
-                </div> -->
                 <div v-if="record.FileList && record.FileList.length > 0" style="margin-top:5px;">
                   <!-- 本次医学审核相关截图（如适用）如下： -->
                   {{ $t('trials:medicalFeedback:message:msg5') }}
@@ -87,12 +75,6 @@
                     </li>
                   </ol>
                 </div>
-                <!-- <div v-if="!!record.IsApplyHeavyReading">
-                  是否复制阅片表单{{ record.IsApplyHeavyReading ? '是' : '否' }}
-                </div>
-                <div v-if="!!record.IsCopyOrigenalForms">
-                  是否复制后续表单{{ record.IsCopyOrigenalForms ? '是' : '否' }}
-                </div> -->
               </template>
             </div>
           </div>
@@ -324,6 +306,9 @@ export default {
           border-bottom: 8px solid transparent;
         }
       }
+      /deep/.el-button--text{
+        color: #d0d0d0;
+      }
     }
   }
   .chat-message{
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
index 2604f92a..2c7c203a 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
@@ -11,21 +11,20 @@
               <span>({{ record.CreateTime }}) </span>
             </p>
             <div class="info-content">
-              <template v-if="record.MedicalDialogCloseEnum!== null">
-
+              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && (record.MedicalDialogCloseEnum!== null || record.Content)">
                 <div>{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}</div>
                 <div v-if="record.Content">{{ $t('trials:medicalFeedback:title:closereasonRemarks') }}{{ record.Content }}</div>
 
               </template>
-              <template v-else-if="!record.Content">
+              <template v-else-if="[14, 30].includes(record.UserTypeEnumInt) && record.Questioning">
                 <div>
                   <!-- 您好，根据医学审核反馈，该阅片任务的评估有如下问题需要您确认或澄清： -->
                   {{ $t('trials:medicalFeedback:message:msg1') }}
-                  <ol>
+                  <ol style="font-weight: bold;">
                     {{ record.Questioning }}
                   </ol>
                 </div>
-                <div v-if="record.FileList && record.FileList.length > 0" style="margin-top:5px;">
+                <div v-if="record.FileList && record.FileList.length > 0" style="margin-top:10px;">
                   <!-- 本次医学审核相关截图（如适用）如下： -->
                   {{ $t('trials:medicalFeedback:message:msg2') }}
                   <ol>
@@ -38,23 +37,23 @@
                     </li>
                   </ol>
                 </div>
-                <div style="margin-top:5px;">
+                <div style="margin-top:10px;">
                   <!-- 根据本项目《独立影像评估章程》的相关约定，该类问题医学审核建议为： -->
                   {{ $t('trials:medicalFeedback:message:msg3') }}
                   <ol>
                     <span style="color:red">{{ $fd('AuditAdvice', record.AuditAdviceEnum) }}</span>
                   </ol>
                 </div>
-                <div style="margin-top:5px;">
+                <div style="margin-top:10px;">
                   <!-- 为高效解决/处理以上全部医学反馈问题，麻烦您在对该阅片任务的评估准确复核后，明确是否认可医学反馈问题及结论。如不认可医学反馈，请逐条准确完整回复不认可的原因，非常感谢。 -->
                   {{ $t('trials:medicalFeedback:message:msg4') }}
                 </div>
               </template>
-              <template v-else-if="record.Content">
+              <template v-else-if="[14, 30].includes(record.UserTypeEnumInt)">
                 <div>{{ record.Content }}</div>
               </template>
 
-              <template v-else>
+              <template v-else-if="[13].includes(record.UserTypeEnumInt)">
                 <div>
                   {{ $t('trials:medicalFeedback:title:isEndorse') }}{{ $fd('MedicalReviewDoctorUserIdea', record.DoctorUserIdeaEnum) }}
                 </div>
@@ -83,7 +82,7 @@
       </div>
     </div>
     <div
-      v-if="otherInfo && !otherInfo.IsClosedDialog && hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit'])"
+      v-if="otherInfo && !otherInfo.IsClosedDialog && [14, 30].includes(userTypeEnumInt)"
       class="chat-message"
     >
       <div class="message">
@@ -351,6 +350,9 @@ export default {
           border-bottom: 8px solid transparent;
         }
       }
+      /deep/.el-button--text{
+        color: #d0d0d0;
+      }
     }
   }
   .chat-message{
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/MedicalAudit.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/MedicalAudit.vue
index 87af097b..09909152 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/MedicalAudit.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/MedicalAudit.vue
@@ -203,7 +203,7 @@ export default {
       var auditIssuesValid = await this.$refs['auditIssues'].validForm()
       var auditConclusionsValid = await this.$refs['auditConclusions'].validForm()
       if (auditIssuesValid && auditConclusionsValid) {
-        this.$confirm('当前审核结论为“有问题”，是否发起质询？', {
+        this.$confirm(this.$t('trials:medicalFeedback:message:launchqc'), {
           type: 'warning',
           distinguishCancelAndClose: true
         })
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue
index c81714cc..a3c1fc10 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue
@@ -697,9 +697,9 @@ export default {
         this.currentRow = { ...row }
         this.auditVisible = true
         // 访视任务，打开阅片页面
-        // if (row.ReadingCategory === 1) {
-        //   this.handleViewReadingPage(row)
-        // }
+        if (row.ReadingCategory === 1) {
+          this.handleViewReadingPage(row)
+        }
       } else {
         // '请先确认医学审核问题模板配置！'
         this.$alert(this.$t('trials:medicalFeedback:message:confirmTemplate'), {

From 1154c700c32508035e4794f566b9733436ecaf97 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 6 Mar 2024 16:53:05 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/mim-medical-audit/components/MedicalAudit.vue    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/MedicalAudit.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/MedicalAudit.vue
index 09909152..a02eecfc 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/MedicalAudit.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/MedicalAudit.vue
@@ -11,7 +11,7 @@
           :row-data="rowData"
         />
       </div>
-      <div>
+      <div style="margin-top:15px;">
         <!-- 审核问题 -->
         <h3>{{ $t('trials:medicalFeedback:title:auditQuestions') }}</h3>
         <Issues
@@ -23,7 +23,7 @@
           :is-send-message="isSendMessage"
         />
       </div>
-      <div>
+      <div style="margin-top:10px;">
         <!-- 结论 -->
         <h3>{{ $t('trials:medicalFeedback:title:conclusions') }}</h3>
         <Conclusions
@@ -313,6 +313,7 @@ export default {
   height: 100%;
   display: flex;
   flex-direction: column;
+  margin-left: 15px;
 
   .medical-audit-content{
     flex: 1;

From 22c9732382caae3075f2ea1fbf562d8c73394618 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 6 Mar 2024 17:12:15 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E8=9E=8D=E5=90=88=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E5=8F=8A=E5=B8=83=E5=B1=80=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Lugano/QuestionList.vue | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
index 800d8694..9903667a 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
@@ -66,7 +66,7 @@
                         <!-- white-space: nowrap;overflow: hidden;text-overflow: ellipsis; -->
 
                         <div style="font-size: 11px;width:210px;height: 30px;display: flex;justify-content: flex-start;flex-wrap: nowrap;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-                          <el-tooltip v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'" class="item" effect="dark" :content="`融向${item.TableQuestions.Answers[i].SplitOrMergeLesionName}`" placement="bottom">
+                          <el-tooltip v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'" class="item" effect="dark" :content="`${$t('trials:reading:message:fused')}${item.TableQuestions.Answers[i].SplitOrMergeLesionName}`" placement="bottom">
                             <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'">
                               <span class="login-cycle" />
                             </div>
@@ -163,20 +163,20 @@
       v-loading="merge.loading"
       :visible.sync="merge.visible"
       :close-on-click-modal="false"
-      title="靶病灶融合"
+      :title="$t('trials:reading:lugano:message:merge')"
       width="500px"
     >
       <div class="merge-table">
         <div class="merge-label">
-          <label>当前病灶： </label>
+          <label>{{$t('trials:reading:lugano:label:currentLesion')}}</label>
           <span>{{ mergeInfo.lesionName }}</span>
           <span style="margin-left:10px">{{ mergeInfo.lesionPart }}</span>
         </div>
-        <div class="merge-label"><label>请选择融合病灶： </label></div>
+        <div class="merge-label"><label>{{$t('trials:reading:lugano:label:selectLesion')}}</label></div>
         <el-table
           :data="lesionData"
           style="width: 450px"
-          size="mini"
+          size="small"
           height="200"
           @selection-change="handleSelectionChange"
         >
@@ -186,12 +186,12 @@
           />
           <el-table-column
             prop="OrderMarkName"
-            label="编号"
-            width="80"
+            :label="$t('trials:reading:lugano:label:lesionNumber')"
+            width="100"
           />
           <el-table-column
             prop="Part"
-            label="部位"
+            :label="$t('trials:reading:lugano:label:lesionLocation')"
             min-width="120"
             show-overflow-tooltip
           />
@@ -1393,6 +1393,9 @@ export default {
       color:#ddd;
       font-size: 13px;
       margin-bottom: 10px;
+      span{
+        font-size: 15px;
+      }
     }
   }
 }

From 7308f43f8144cf264d033b8d1bc32f51a0128d96 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 6 Mar 2024 17:16:13 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E8=9E=8D=E5=90=88=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Lugano/QuestionList.vue        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
index 9903667a..98a0feb3 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
@@ -1363,10 +1363,10 @@ export default {
     padding:0 10px;
     /deep/.el-table{
       background-color:  #1e1e1e !important;
-      color: #dfdfdf;
+      color: #383838;
     }
     /deep/.el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf{
-      border-bottom: 1px solid #dfdfdf;
+      border-bottom: 1px solid #383838;
     }
     .el-table--border::after, .el-table--group::after, .el-table::before{
       background-color: #1e1e1e;
@@ -1375,6 +1375,7 @@ export default {
         th{
           background-color:  #1e1e1e !important;
           color: #dfdfdf;
+          border-bottom: 1px solid #383838;
         }
       }
     /deep/.el-table__body-wrapper{