Merge remote-tracking branch 'origin/dev'

src/views/order/podUs/index.vue

@@ -1042,6 +1042,16 @@
               {{ row.finishTime?.replace('T', ' ') }}
             </div>
           </template>
+          <template #failTime="{ row }">
+            <div style="white-space: pre-line">
+              {{ row.failTime?.replace('T', ' ') }}
+            </div>
+          </template>
+          <template #failReason="{ row }">
+            <div style="white-space: pre-line">
+              {{ row.failReason }}
+            </div>
+          </template>
           <template #operate="{ row }">
             <div
               v-if="status === 'BATCH_DOWNLOAD'"
@@ -2148,6 +2158,13 @@ const tableColumns = computed(() => {
         align: 'center',
       },
       {
+        label: '失败原因',
+        width: 250,
+        prop: 'failReason',
+        slot: 'failReason',
+        align: 'left',
+      },
+      {
         label: '创建时间',
         width: 250,
         prop: 'createTime',
@@ -2161,6 +2178,13 @@ const tableColumns = computed(() => {
         slot: 'finishTime',
         align: 'center',
       },
+      // {
+      //   label: '失败时间',
+      //   width: 250,
+      //   prop: 'failTime',
+      //   slot: 'failTime',
+      //   align: 'center',
+      // },
       {
         label: '操作',
         slot: 'operate',