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

src/views/trials/trials-panel/visit/crc-question/components/chatForm.vue

@@ -29,7 +29,9 @@
           />
           <div class="info">
             <p class="user-info">
-              <span style="font-weight: 700">{{ record.CreateUserFullName || record.CreateUserName }} </span>
+              <span style="font-weight: 700"
+                >{{ record.CreateUserFullName || record.CreateUserName }}
+              </span>
               <span>({{ record.CreateTime }}) </span>
             </p>
             <div
@@ -42,7 +44,9 @@
         <div v-else class="word-my">
           <div class="info">
             <p class="user-info">
-              <span style="font-weight: 700">{{ record.CreateUserFullName || record.CreateUserName }} </span>
+              <span style="font-weight: 700"
+                >{{ record.CreateUserFullName || record.CreateUserName }}
+              </span>
               <span>({{ record.CreateTime }}) </span>
             </p>
             <div
@@ -239,6 +243,7 @@
         ref="signForm"
         :sign-code-enum="signCode"
         :subject-visit-id="data.SubjectVisitId"
+        :sign-replace-text="signReplaceText"
         @closeDialog="closeReuploadFinishedDialog"
       />
     </el-dialog>
@@ -250,6 +255,7 @@ import {
   addQCChallengeReply,
   cRCRequestReUpload,
   verifyReuploadIsCanJump,
+  getVisitClinicalDataName,
 } from '@/api/trials'
 import { setReuploadFinished } from '@/api/trials/visit'
 import adminAvatar from '@/assets/Admin.png'
@@ -322,6 +328,7 @@ export default {
       ReuploadEnum: 0,
       trialId: '',
       uploadBtnLoading: false,
+      signReplaceText: null,
     }
   },
   mounted() {
@@ -544,9 +551,16 @@ export default {
     handleSetUploadFinished() {
       // 签名认证
       if (this.clinicalEnum > 0 && this.data.IsBaseLine) {
-        const { ClinicalDataConfirmation } = const_.processSignature
+        getVisitClinicalDataName({ id: this.data.SubjectVisitId })
-        this.signCode = ClinicalDataConfirmation
+          .then((res) => {
-        this.signVisible = true
+            this.signReplaceText = res.Result.ClinicalDataName
+            const { ClinicalDataConfirmation } = const_.processSignature
+            this.signCode = ClinicalDataConfirmation
+            this.signVisible = true
+          })
+          .catch((err) => {
+            console.log(err)
+          })
       } else {
         this.$confirm(this.$t('trials:crcQuestion:message:reuploadConfirm'), {
           type: 'warning',

src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue

@@ -127,7 +127,6 @@
       <el-table-column
         :label="$t('common:action:action')"
         min-width="100"
-        fixed="right"
       >
         <template slot-scope="scope">
           <!-- 预览 -->

src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue

@@ -27,6 +27,7 @@
       :data="nonDicomStudyList"
       style="width: 100%"
       :default-sort="{ prop: 'CreateTime', order: 'ascending' }"
+      :row-class-name="tableRowClassName"
     >
       <!-- 检查编号 -->
       <el-table-column
@@ -68,12 +69,14 @@
             v-if="scope.row.FileCount"
             trigger="click"
             placement="bottom"
+            popper-class="imgTable"
           >
             <el-table
               v-loading="filesLoading"
               :data="nonDicomfilesList"
               height="300"
               size="small"
+              :row-class-name="tableRowClassName"
             >
               <!-- 文件名称 -->
               <el-table-column
@@ -207,6 +210,7 @@
             v-if="allowAddOrEdit"
             icon="el-icon-upload2"
             circle
+            :disabled="scope.row.IsDeleted"
             :title="$t('trials:uploadNonDicoms:action:upload')"
             @click.native.prevent="handleUpload(scope.row)"
           />
@@ -1308,6 +1312,14 @@ export default {
       })
       return newArr.join(' | ')
     },
+    // 设置已删除序列行样式
+    tableRowClassName({ row, rowIndex }) {
+      if (row.IsDeleted) {
+        return 'delete-row'
+      } else {
+        return ''
+      }
+    },
   },
 }
 </script>
@@ -1351,4 +1363,16 @@ export default {
     pointer-events: none; //pointer-events:none用来控制该标签的点击穿透事件
   }
 }
+.non-dicom-wrapper {
+  ::v-deep .delete-row {
+    text-decoration-line: line-through;
+    color: #c0c4cc;
+  }
+}
+</style>
+<style>
+.imgTable .delete-row {
+  text-decoration-line: line-through;
+  color: #c0c4cc;
+}
 </style>