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

src/views/trials/trials-panel/visit/crc-upload/index.vue

@@ -361,7 +361,7 @@
           </template>
         </el-table-column>
         <!-- 最早拍片日期 -->
-        <el-table-column
+        <!-- <el-table-column
           prop="EarliestScanDate"
           :label="$t('trials:crcUpload:table:earliestScanDate')"
           show-overflow-tooltip
@@ -375,21 +375,38 @@
                 : ''
             }}
           </template>
-        </el-table-column>
+        </el-table-column> -->
-        <!-- 最晚拍片日期 -->
+        <!-- 最晚拍片日期 $t('trials:crcUpload:table:latestScanDate') -->
         <el-table-column
           prop="LatestScanDate"
-          :label="$t('trials:crcUpload:table:latestScanDate')"
+          :label="$t('trials:crcUpload:table:scanDate')"
           show-overflow-tooltip
           width="170"
           sortable="custom"
         >
           <template slot-scope="scope">
-            {{
+            <el-tooltip
-              scope.row.LatestScanDate
+              class="item"
-                ? moment(scope.row.LatestScanDate).format('YYYY-MM-DD')
+              effect="dark"
-                : ''
+              :content="`${
-            }}
+                scope.row.EarliestScanDate
+                  ? moment(scope.row.EarliestScanDate).format('YYYY-MM-DD')
+                  : ''
+              } ~ ${
+                scope.row.LatestScanDate
+                  ? moment(scope.row.LatestScanDate).format('YYYY-MM-DD')
+                  : ''
+              }`"
+              placement="top"
+            >
+              <span>
+                {{
+                  scope.row.LatestScanDate
+                    ? moment(scope.row.LatestScanDate).format('YYYY-MM-DD')
+                    : ''
+                }}
+              </span>
+            </el-tooltip>
           </template>
         </el-table-column>
         <!-- 提交状态 -->

src/views/trials/trials-panel/visit/qc-check/components/chatForm.vue

@@ -10,7 +10,7 @@
           <img v-else-if="record.UserTypeEnum*1 === 3" :src="qcAvatar" alt="QC">
           <div class="info">
             <p class="user-info">
-              <span style="font-weight:700;">{{ record.CreateUserName }} </span>
+              <span style="font-weight:700;">{{ record.CreateUserFullName }} </span>
               <span>({{ record.CreateTime }}) </span>
             </p>
             <div class="info-content" v-html="formattedText(record.TalkContent)" />

src/views/trials/trials-panel/visit/qc-question/index.vue

@@ -188,9 +188,9 @@
           width="160"
           sortable="custom"
         /> -->
-        <!-- 最新回复人 -->
+        <!-- 最新回复人LatestReplyUserName -->
         <el-table-column
-          prop="LatestReplyUserName"
+          prop="LatestReplyUserFullName"
           :label="$t('trials:qcQuality:table:latestReplyer')"
           show-overflow-tooltip
           width="120"