Merge branch 'uat'

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

@@ -108,14 +108,6 @@
           {{ moment(scope.row.StudyTime).format('YYYY-MM-DD') }}
         </template>
       </el-table-column>
-      <!-- 上传时间 -->
-      <el-table-column
-        prop="UploadedTime"
-        :label="$t('trials:uploadedDicoms:table:uploadedTime')"
-        sortable
-        min-width="120"
-        show-overflow-tooltip
-      />
       <!-- 更新时间 -->
       <el-table-column
         prop="UpdateTime"
@@ -124,6 +116,14 @@
         show-overflow-tooltip
         sortable
       />
+      <!-- 上传时间 -->
+      <el-table-column
+        prop="UploadedTime"
+        :label="$t('trials:uploadedDicoms:table:uploadedTime')"
+        sortable
+        min-width="120"
+        show-overflow-tooltip
+      />
       <el-table-column
         :label="$t('common:action:action')"
         min-width="100"

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

@@ -152,14 +152,6 @@
           }}
         </template>
       </el-table-column>
-      <!-- 上传时间 -->
-      <el-table-column
-        prop="UploadedTime"
-        :label="$t('trials:uploadedDicoms:table:uploadedTime')"
-        min-width="120"
-        show-overflow-tooltip
-        sortable
-      />
       <!-- 更新时间 -->
       <el-table-column
         prop="UpdateTime"
@@ -168,6 +160,14 @@
         show-overflow-tooltip
         sortable
       />
+      <!-- 上传时间 -->
+      <el-table-column
+        prop="UploadedTime"
+        :label="$t('trials:uploadedDicoms:table:uploadedTime')"
+        min-width="120"
+        show-overflow-tooltip
+        sortable
+      />
       <el-table-column
         :label="$t('common:action:action')"
         min-width="260"

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

@@ -106,14 +106,6 @@
           {{ moment(scope.row.StudyTime).format('YYYY-MM-DD') }}
         </template>
       </el-table-column>
-      <!-- 上传时间 -->
-      <el-table-column
-        prop="UploadedTime"
-        :label="$t('trials:audit:table:studyUploadTime')"
-        min-width="80"
-        show-overflow-tooltip
-        sortable
-      />
       <!-- 更新时间 -->
       <el-table-column
         prop="UpdateTime"
@@ -122,6 +114,14 @@
         show-overflow-tooltip
         sortable
       />
+      <!-- 上传时间 -->
+      <el-table-column
+        prop="UploadedTime"
+        :label="$t('trials:audit:table:studyUploadTime')"
+        min-width="80"
+        show-overflow-tooltip
+        sortable
+      />
       <el-table-column
         :label="$t('common:action:action')"
         min-width="100"

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

@@ -98,6 +98,7 @@
               :data="studyList"
               :row-class-name="tableRowClassName"
               @selection-change="handleSelectionChangeDicom"
+              :default-sort="{ prop: 'UploadedTime', order: 'descending' }"
             >
               <el-table-column type="selection" width="55"> </el-table-column>
               <!-- 检查编号 -->
@@ -212,6 +213,22 @@
                   }}</span>
                 </template>
               </el-table-column>
+              <!-- 更新时间 -->
+              <el-table-column
+                prop="UpdateTime"
+                :label="$t('trials:audit:table:seriesOfUpdateTime')"
+                min-width="120"
+                sortable
+                show-overflow-tooltip
+              />
+              <!-- 上传时间 -->
+              <el-table-column
+                prop="UploadedTime"
+                :label="$t('trials:audit:table:seriesOfUploadedDate')"
+                min-width="120"
+                sortable
+                show-overflow-tooltip
+              />
               <el-table-column :label="$t('common:action:action')">
                 <template slot-scope="scope">
                   <!-- 预览 -->
@@ -294,17 +311,17 @@
                   }}
                 </template>
               </el-table-column>
-              <!-- 上传时间 -->
+                            <!-- 更新时间 -->
-              <el-table-column
+                            <el-table-column
-                prop="CreateTime"
+                prop="UpdateTime"
-                :label="$t('trials:audit:table:seriesOfUploadedDate')"
+                :label="$t('trials:audit:table:seriesOfUpdateTime')"
                 sortable
                 show-overflow-tooltip
               />
               <!-- 上传时间 -->
               <el-table-column
-                prop="UpdateTime"
+                prop="CreateTime"
-                :label="$t('trials:audit:table:seriesOfUpdateTime')"
+                :label="$t('trials:audit:table:seriesOfUploadedDate')"
                 sortable
                 show-overflow-tooltip
               />