Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main

src/views/trials/trials-panel/reading/consistency-analysis/index.vue

@@ -339,17 +339,15 @@
           width="110"
         >
           <template slot-scope="scope">
-            <!-- 查看阅片结果 -->
+            <!-- 查看阅片结果:disabled="scope.row.ReadingTaskState !== 2" -->
             <el-button
-              :disabled="scope.row.ReadingTaskState !== 2"
               icon="el-icon-view"
               circle
               :title="$t('trials:consistencyAnalysis:action:view')"
               @click="lookReadingResults(scope.row)"
             />
-            <!-- 设置为失效 -->
+            <!-- 设置为失效  !scope.row.IsReReadingOrBackInfluenceAnalysis|| scope.row.TaskState === 1-->
             <el-button
-              :disabled="!scope.row.IsReReadingOrBackInfluenceAnalysis || scope.row.TaskState === 1"
               v-if="hasPermi(['trials:trials-panel:reading:consistency-analysis:edit'])"
               icon="el-icon-close"
               circle

src/views/trials/trials-panel/reading/pm-medical-feedback/components/GenerateMedicalReviewTaskList.vue

@@ -191,7 +191,7 @@
         </el-table-column>
         <!-- 阅片人 -->
         <el-table-column
-          prop="UserName"
+           prop="DoctorUser.UserName"
           :label="$t('trials:pmMedicalReview:select:reader')"
           width="120"
           sortable="custom"