From 691a3721a0d1a40e97f292edc9174218235164db Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 17 Dec 2025 13:46:10 +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

---
 .../uploadDicomAndNonedicom/nonedicomFile.vue | 38 +++++++++----------
 .../template/email/components/EmailList.vue   | 10 ++---
 .../dicoms/components/IVUS/QuestionList.vue   | 20 +++++++---
 .../dicoms/components/IVUS/UploadExcel.vue    | 38 ++++++++-----------
 .../Recist/TableQuestionFormItem.vue          |  2 +-
 .../dicoms3D/components/ReportPage.vue        | 15 +++++++-
 .../reading-task/components/TargetSection.vue | 14 ++++---
 7 files changed, 77 insertions(+), 60 deletions(-)

diff --git a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
index 6bcb388f..5715210b 100644
--- a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
@@ -10,21 +10,21 @@
         )"></div>
       </div>
     </div>
-    <!--检查列表-->
+    <!--检查列表 @sort-change="handleSortByColumn"-->
     <el-table :data="list" style="width: 100%" v-adaptive="{ bottomOffset: 60 }" :loading="loading"
-      @sort-change="handleSortByColumn" :default-sort="{ prop: 'TaskBlindName', order: 'descending' }">
-      <!--受试者-->
+      :default-sort="{ prop: 'TaskBlindName', order: 'descending' }">
+      <!--受试者 sortable="custom"-->
       <el-table-column prop="SubjectCode" :label="$t('upload:nonedicom:table:subject')" />
       <!--访视名称-->
-      <el-table-column prop="VisitName" :label="$t('upload:nonedicom:table:VisitName')" sortable="custom"
+      <el-table-column prop="VisitName" :label="$t('upload:nonedicom:table:VisitName')" sortable
         v-if="IsImageSegment" />
       <!--任务名称-->
-      <el-table-column prop="TaskBlindName" :label="$t('upload:nonedicom:table:taskName')" sortable="custom" v-else />
+      <el-table-column prop="TaskBlindName" :label="$t('upload:nonedicom:table:taskName')" sortable v-else />
       <!--检查类型-->
-      <el-table-column prop="Modality" :label="$t('upload:nonedicom:table:molityType')" sortable="custom">
+      <el-table-column prop="Modality" :label="$t('upload:nonedicom:table:molityType')" sortable>
       </el-table-column>
       <!--检查部位-->
-      <el-table-column prop="BodyPart" :label="$t('upload:nonedicom:table:bodyPart')" sortable="custom">
+      <el-table-column prop="BodyPart" :label="$t('upload:nonedicom:table:bodyPart')" sortable>
         <template slot-scope="scope">
           <span>{{ getBodyPart(scope.row.BodyPart, scope.row.BodyPartForEditOther) }}</span>
         </template>
@@ -228,8 +228,8 @@ let defaultSearchData = () => {
     SubjectId: null,
     TrialReadingCriterionId: null,
     SubjectCode: null,
-    Asc: false,
-    SortField: 'TaskBlindName',
+    // Asc: false,
+    // SortField: 'TaskBlindName',
   }
 }
 export default {
@@ -506,16 +506,16 @@ export default {
       }
     },
     // 排序
-    handleSortByColumn(column) {
-      if (column.order === 'ascending') {
-        this.searchData.Asc = true
-      } else {
-        this.searchData.Asc = false
-      }
-      this.searchData.SortField = column.prop
-      this.searchData.PageIndex = 1
-      this.getList()
-    },
+    // handleSortByColumn(column) {
+    //   if (column.order === 'ascending') {
+    //     this.searchData.Asc = true
+    //   } else {
+    //     this.searchData.Asc = false
+    //   }
+    //   this.searchData.SortField = column.prop
+    //   this.searchData.PageIndex = 1
+    //   this.getList()
+    // },
     // 获取待上传文件信息
     handleSelectionChange(selection) {
       this.selectArr = selection
diff --git a/src/views/dictionary/template/email/components/EmailList.vue b/src/views/dictionary/template/email/components/EmailList.vue
index fea070e9..82c3393d 100644
--- a/src/views/dictionary/template/email/components/EmailList.vue
+++ b/src/views/dictionary/template/email/components/EmailList.vue
@@ -9,11 +9,11 @@
           </el-select>
         </el-form-item>
         <!-- 是否加急 -->
-        <el-form-item :label="$t('dictionary:email:label:IsUrgent')" v-if="!systemLevel">
+        <!-- <el-form-item :label="$t('dictionary:email:label:IsUrgent')" v-if="!systemLevel">
           <el-select v-model="searchData.IsUrgent" clearable style="width: 100px">
-            <el-option v-for="item of $d.EmailUrgent" :value="item.value" :label="item.label" :key="item.id" />
+            <el-option v-for="item of $d.YesOrNo" :value="item.value" :label="item.label" :key="item.id" />
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <!-- 是否启用 -->
         <el-form-item :label="$t('trials:emailManageCfg:table:IsEnable')" v-if="!systemLevel">
           <el-select v-model="searchData.IsEnable" clearable style="width: 100px">
@@ -41,7 +41,7 @@
             <el-option v-for="item of UserTypeList" :value="item.value" :label="item.label" :key="item.id" />
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('trials:emailManageCfg:form:EmailUrgent')" v-if="systemLevel === 1">
+        <el-form-item :label="$t('trials:emailManageCfg:form:EmailUrgent')">
           <el-select v-model="searchData.EmailUrgentEnum" clearable style="width: 100px">
             <el-option v-for="item of $d.EmailUrgent" :value="item.value" :label="item.label" :key="item.id" />
           </el-select>
@@ -86,7 +86,7 @@
         :label="$t('trials:reviewTrack:table:criterionName')" show-overflow-tooltip sortable="custom" min-width="120">
         <template slot-scope="scope">
           {{scope.row.CriterionTypeList ? scope.row.CriterionTypeList.map(item => $fd('CriterionType', item)).join(', ')
-          : ''}}
+            : ''}}
         </template>
       </el-table-column>
       <!-- 邮件主题（中文） -->
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
index 1c3857d4..6302e20a 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
@@ -37,7 +37,8 @@
                       <div class="add-icon" @click.prevent="downloadTpl">
                         <i class="el-icon-download" />
                       </div>
-                      <div class="add-icon" style="margin: 0 5px;" @click.prevent="uploadTpl(item.LesionType, item.QuestionName)">
+                      <div class="add-icon" style="margin: 0 5px;"
+                        @click.prevent="uploadTpl(item.LesionType, item.QuestionName)">
                         <i class="el-icon-upload2" />
                       </div>
                       <div class="add-icon" @click.prevent="handleAddOrEdit('add', item)">
@@ -71,13 +72,14 @@
                         </span>
                       </template>
                     </el-table-column>
-                    <el-table-column v-if="readingTaskState < 2 && item.LesionType === 102"
+                    <el-table-column v-if="readingTaskState < 2 && (item.LesionType === 102 || item.LesionType === 103)"
                       :label="$t('common:action:action')" width="90px" fixed="right">
                       <template slot-scope="scope">
                         <el-button type="text" size="mini" @click="handleAddOrEdit('edit', item, scope.$index)">
                           {{ $t('common:button:edit') }}
                         </el-button>
-                        <el-button type="text" size="mini" @click="handleDelete(item, scope.$index)">
+                        <el-button type="text" size="mini" @click="handleDelete(item, scope.$index)"
+                          v-if="item.LesionType === 102">
                           {{ $t('common:button:delete') }}
                         </el-button>
                       </template>
@@ -174,7 +176,8 @@
       <!-- 导入 -->
       <el-dialog v-if="upload.visible" :visible.sync="upload.visible" :close-on-click-modal="false"
         :title="upload.title" width="500px">
-        <UploadExcel :visit-task-id="visitTaskId" :TableName="upload.TableName" @close="uploadDlgClose" />
+        <UploadExcel :visit-task-id="visitTaskId" :TableName="upload.TableName" :lesion-type="upload.lesionType"
+          @close="uploadDlgClose" />
       </el-dialog>
     </div>
   </div>
@@ -232,8 +235,8 @@ export default {
       questionForm: {},
       formChanged: false,
       digitPlaces: 2,
-      addOrEdit: { visible: false, title: '' },
-      upload: { visible: false, title: '', TableName: '' },
+      addOrEdit: { visible: false, title: '', lesionType: null },
+      upload: { visible: false, title: '', TableName: '', lesionType: null },
       qsList: [],
       answersList: [],
       qsForm: {},
@@ -595,6 +598,7 @@ export default {
         this.$set(this.qsForm, i.Id, v)
       })
       this.addOrEdit.visible = true
+      this.addOrEdit.lesionType = row.LesionType
     },
     async saveFormData() {
       const valid = await this.$refs.tableQsForm.validate()
@@ -619,6 +623,9 @@ export default {
           trialId: this.trialId,
           answerList: answers
         }
+        if (this.addOrEdit.lesionType === 103) {
+          params.computationTrigger = 9
+        }
         const res = await submitTableQuestion(params)
         if (res.IsSuccess) {
           // this.refreshQuestions()
@@ -669,6 +676,7 @@ export default {
       }
     },
     uploadTpl(lesionType, TableName) {
+      this.upload.lesionType = lesionType
       this.upload.TableName = TableName
       this.upload.title = `导入（ ${this.$fd('LesionType', lesionType)} ）`
       this.upload.visible = true
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/UploadExcel.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/UploadExcel.vue
index abf167de..bce2d363 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/UploadExcel.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/UploadExcel.vue
@@ -1,30 +1,15 @@
 <template>
-  <el-form
-    ref="uploadExcel"
-    class="upload-excel-file"
-  >
+  <el-form ref="uploadExcel" class="upload-excel-file">
     <!-- 文件 -->
     <el-form-item :label="$t('trials:consistencyCheck:label:file')">
       <div class="upload-container">
-        <el-upload
-          class="upload-demo"
-          action
-          accept=".xlsx,.xls,.csv"
-          :before-upload="beforeUpload"
-          :http-request="handleUploadFile"
-          :on-preview="handlePreview"
-          :show-file-list="true"
-          :limit="1"
-          :on-exceed="handleExceed"
-        >
+        <el-upload class="upload-demo" action accept=".xlsx,.xls,.csv" :before-upload="beforeUpload"
+          :http-request="handleUploadFile" :on-preview="handlePreview" :show-file-list="true" :limit="1"
+          :on-exceed="handleExceed">
           <el-button size="small" type="primary">
             {{ $t('trials:consistencyCheck:dialogButton:upload') }}
           </el-button>
-          <span
-            slot="tip"
-            style="margin-left:10px;"
-            class="el-upload__tip"
-          >
+          <span slot="tip" style="margin-left:10px;" class="el-upload__tip">
             ({{ $t('trials:consistencyCheck:message:excelFileOnly') }})
           </span>
         </el-upload>
@@ -40,6 +25,10 @@ export default {
       type: String,
       required: true
     },
+    lesionType: {
+      type: Number,
+      required: true
+    },
     TableName: {
       type: String,
       default: ''
@@ -101,21 +90,24 @@ export default {
 </script>
 
 <style lang="scss">
-.upload-excel-file{
+.upload-excel-file {
   .upload-container .el-upload--text {
     border: none;
     width: 80px;
     height: 40px;
   }
+
   .upload-container .el-input--small {
     margin-bottom: 5px;
   }
+
   .upload-container .el-icon-circle-check {
     color: #428bca;
     font-size: 13px;
   }
-  .account_item_clear{
-    .el-tag__close{
+
+  .account_item_clear {
+    .el-tag__close {
       display: none !important;
     }
   }
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/TableQuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/TableQuestionFormItem.vue
index 90ea4e1a..4ad1aa14 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/TableQuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/TableQuestionFormItem.vue
@@ -64,7 +64,7 @@
               data: {
                 TableQuestionId: qs.Id,
                 RowIndex: qsForm.RowIndex,
-                QuestionName: question.QuestionName
+                QuestionName: qs.QuestionName
               }
             })" />
         </div>
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
index 0a7bf5d3..7f611b89 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
@@ -69,7 +69,20 @@
             width="350px"
           >
             <template slot-scope="scope">
-              <span v-if="scope.row.QuestionName" :style="{color: ((scope.row.isLymphNodes === 1 && scope.row.QuestionMark === 1) || (scope.row.isLymphNodes === 0 && scope.row.QuestionMark === 0)) && (scope.row.LesionType === 0 || scope.row.LesionType === 5) ? '#f66' : '#fff'}">{{ scope.row.QuestionName }}</span>
+              <span v-if="scope.row.QuestionName" :style="{color: ((scope.row.isLymphNodes === 1 && scope.row.QuestionMark === 1) || (scope.row.isLymphNodes === 0 && scope.row.QuestionMark === 0)) && (scope.row.LesionType === 0 || scope.row.LesionType === 5) ? '#f66' : '#fff'}">{{ scope.row.QuestionName }}
+                <svg-icon
+                  v-if="scope.row.ShowChartTypeEnum > 0 || (scope.row.LesionType === 0 && scope.row.ReportLayType === 1) || (scope.row.LesionType === 4 && scope.row.ReportLayType === 1)"
+                  icon-class="readingChart" class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({
+                    e,
+                    data: {
+                      QuestionId: scope.row.RowIndex ? null : scope.row.QuestionId,
+                      TableQuestionId: scope.row.RowIndex ? scope.row.TableQuestionId : null,
+                      RowIndex: scope.row.RowIndex ? scope.row.RowIndex : null,
+                      ReportChartTypeEnum: (scope.row.LesionType === 0 && scope.row.ReportLayType === 1) ? 0 : (scope.row.LesionType === 4 && scope.row.ReportLayType === 1) ? 1 : null,
+                      QuestionName: scope.row.QuestionName
+                    }
+                  })" />
+              </span>
               <span
                 v-else
                 style="font-weight: bold;font-size: 16px;color: #f44336;"
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 969152e0..091c2d21 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
@@ -46,15 +46,19 @@
                     sortable="custom" /> -->
                 <!-- 标记访视数量 -->
                 <el-table-column prop="MarkVisitCount" :label="$t('trials:pendingReadingTasks:table:MarkVisitCount')"
-                    show-overflow-tooltip sortable="custom" />
+                    show-overflow-tooltip>
+                    <template slot-scope="scope">
+                        <span>{{ `${scope.row.MarkIVUSVisitCount || 0}/${scope.row.MarkOCTVisitCount || 0}` }}</span>
+                    </template>
+                </el-table-column>
                 <!-- 标记dicom检查数量 -->
-                <el-table-column prop="MarkDicomStudyCount"
+                <!-- <el-table-column prop="MarkDicomStudyCount"
                     :label="$t('trials:pendingReadingTasks:table:MarkDicomStudyCount')" show-overflow-tooltip
-                    sortable="custom" />
+                    sortable="custom" /> -->
                 <!-- 标记非dicom检查数量 -->
-                <el-table-column prop="MarkNoneDicomStudyCount"
+                <!-- <el-table-column prop="MarkNoneDicomStudyCount"
                     :label="$t('trials:pendingReadingTasks:table:MarkNoneDicomStudyCount')" show-overflow-tooltip
-                    sortable="custom" />
+                    sortable="custom" /> -->
                 <el-table-column :label="$t('common:action:action')" width="100" fixed="right">
                     <template slot-scope="scope">
                         <!-- 阅片 -->