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

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

@@ -813,7 +813,7 @@ export default {
   },
   data() {
     return {
-      uploadActiveName: "pacs",
+      uploadActiveName: "file",
       editStudyInfoVisible: false,
       studyForm: {
         StudyCode: "",

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

@@ -70,62 +70,126 @@
     <template slot="main-container">
       <el-table
         v-loading="loading"
-        v-adaptive="{ bottomOffset: 120 }"
+        v-adaptive="{ bottomOffset: 150 }"
         height="100"
         :data="list"
         class="table"
         @selection-change="handleSelectChange"
         @sort-change="handleSortByColumn"
-        :default-sort="{ prop: 'studyTime', order: 'descending' }"
+        :default-sort="{ prop: 'StudyTime', order: 'descending' }"
       >
         <el-table-column type="selection" align="center" width="45" />
         <el-table-column type="index" width="50" />
-        <!--病历号-->
+        <!--患者信息-->
-        <el-table-column
-          :label="$t('trials:visit:crcUpload:uploadDicomPacs:table:patientId')"
-          prop="PatientIdStr"
-          min-width="160"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <!--患者姓名-->
         <el-table-column
           :label="
-            $t('trials:visit:crcUpload:uploadDicomPacs:table:patientName')
+            $t('trials:visit:crcUpload:uploadDicomPacs:table:patientMessage')
           "
-          prop="PatientName"
+          prop="PatientIdStr"
-          min-width="90"
+          min-width="140"
           show-overflow-tooltip
           sortable="custom"
-        />
+        >
-        <!--性别-->
+          <template slot="header">
-        <el-table-column
+            <el-tooltip placement="top">
-          :label="$t('trials:visit:crcUpload:uploadDicomPacs:table:patientSex')"
+              <div slot="content">
-          prop="PatientSex"
+                {{ $t("trials:uploadDicomList:table:pId") }}<br />
-          min-width="160"
+                {{ $t("trials:uploadDicomList:table:patientName") }}<br />
-          show-overflow-tooltip
+                {{ $t("trials:uploadDicomList:table:pInfo") }}
-          sortable="custom"
+              </div>
-        />
+              <span>{{ $t("trials:uploadDicomList:table:patientInfo") }}</span>
-        <!--出生日期-->
+            </el-tooltip>
-        <el-table-column
+          </template>
-          :label="$t('trials:visit:crcUpload:uploadDicomPacs:table:patientSex')"
+          <template slot-scope="scope">
-          prop="CalledAEList"
+            <div style="line-height: 15px">
-          min-width="90"
+              <div>
-          show-overflow-tooltip
+                <span v-if="scope.row.PatientIdStr"
-          sortable="custom"
+                  ><span style="font-weight: 500">PID: </span
-          ><template slot-scope="scope">
+                  >{{ scope.row.PatientIdStr }}</span
-            {{ scope.row.CallingAEList.join(", ") }}
+                >
+                <span v-else style="color: #f44336">N/A</span>
+              </div>
+              <div>
+                <span :class="[scope.row.PatientName ? '' : 'colorOfRed']">
+                  {{ scope.row.PatientName ? scope.row.PatientName : "N/A" }}
+                </span>
+              </div>
+              <div>
+                <span :class="[scope.row.PatientSex ? '' : 'colorOfRed']">
+                  {{ scope.row.PatientSex ? scope.row.PatientSex : "N/A" }},
+                </span>
+
+                <span :class="[scope.row.PatientAge ? '' : 'colorOfRed']">
+                  {{ scope.row.PatientAge ? scope.row.PatientAge : "N/A" }},
+                </span>
+
+                <span :class="[scope.row.PatientBirthDate ? '' : 'colorOfRed']">
+                  {{
+                    scope.row.PatientBirthDate
+                      ? scope.row.PatientBirthDate
+                      : "N/A"
+                  }}
+                </span>
+              </div>
+            </div>
           </template>
         </el-table-column>
-
+        <!--检查申请号-->
-        <!--检查信息-->
+        <el-table-column
+          :label="
+            $t('trials:visit:crcUpload:uploadDicomPacs:table:accNumber')
+          "
+          prop="AccNumber"
+          min-width="90"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!--检查模态-->
         <el-table-column
           :label="$t('trials:visit:crcUpload:uploadDicomPacs:table:modalities')"
           prop="Modalities"
+          min-width="120"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!--检查部位-->
+        <el-table-column
+          :label="
+            $t('trials:visit:crcUpload:uploadDicomPacs:table:bodyPartExamined')
+          "
+          prop="BodyPartExamined"
+          min-width="120"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!--检查描述-->
+        <el-table-column
+          :label="
+            $t('trials:visit:crcUpload:uploadDicomPacs:table:description')
+          "
+          prop="Description"
           min-width="160"
           show-overflow-tooltip
           sortable="custom"
         />
+        <!--序列数量-->
+        <el-table-column
+          :label="
+            $t('trials:visit:crcUpload:uploadDicomPacs:table:seriesCount')
+          "
+          prop="SeriesCount"
+          show-overflow-tooltip
+          sortable="custom"
+        />
+        <!--图像数量-->
+        <el-table-column
+          :label="
+            $t('trials:visit:crcUpload:uploadDicomPacs:table:instanceCount')
+          "
+          prop="InstanceCount"
+          show-overflow-tooltip
+          sortable="custom"
+        />
         <!--检查日期-->
         <el-table-column
           :label="$t('trials:visit:crcUpload:uploadDicomPacs:table:studyTime')"
@@ -134,29 +198,15 @@
           show-overflow-tooltip
           sortable="custom"
         />
-        <!--图像数量-->
+        <el-table-column :label="$t('common:action:action')" fixed="right">
-        <el-table-column
-          :label="
-            $t('trials:visit:crcUpload:uploadDicomPacs:table:instanceCount')
-          "
-          prop="InstanceCount"
-          min-width="160"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <el-table-column
-          :label="$t('common:action:action')"
-          min-width="260"
-          fixed="right"
-        >
           <template slot-scope="scope">
             <!-- 添加 -->
             <el-button
-              icon="el-icon-view"
               :title="$t('common:button:add')"
-              circle
+              type="text"
               @click="handleAdd(scope.row)"
-            />
+              >{{ $t("common:button:add") }}</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -187,7 +237,7 @@ const searchDataDefault = () => {
     PageIndex: 1,
     PageSize: 20,
     Asc: true,
-    SortField: "StartTime",
+    SortField: "StudyTime",
   };
 };
 export default {
@@ -222,11 +272,11 @@ export default {
         return this.$message.warning(
           this.$t("trials:visit:crcUpload:uploadDicomPacs:message:notCheck")
         );
-      let arr = this.tableSelectData.map((item) => item.ScpStudyId);
+      let arr = this.tableSelectData.map((item) => item.SCPStudyId);
       this.submitVisitStudyBinding(arr);
     },
     handleAdd(row) {
-      let arr = [row.ScpStudyId];
+      let arr = [row.SCPStudyId];
       this.submitVisitStudyBinding(arr);
     },
     // 添加检查