刘洋 7 月之前
父节点
当前提交
8c08a09778
共有 2 个文件被更改,包括 15 次插入7 次删除
  1. 6 1
      src/views/order/my-task/index.vue
  2. 9 6
      src/views/order/order-record-manage/index.vue

+ 6 - 1
src/views/order/my-task/index.vue

@@ -39,6 +39,9 @@
       <template #result="{ record }">{{
       <template #result="{ record }">{{
         taskResultEnum[record.result]
         taskResultEnum[record.result]
       }}</template>
       }}</template>
+      <template #createTime="{ record }">
+        {{ timestampFilter(record?.createTime) }}
+      </template>
       <template #action="{ record }">
       <template #action="{ record }">
         <a-button type="text" class="btn-primary" @click="download(record)"
         <a-button type="text" class="btn-primary" @click="download(record)"
           >下载</a-button
           >下载</a-button
@@ -57,6 +60,7 @@
   import { useAppStore } from '@/store';
   import { useAppStore } from '@/store';
   import { modalConfirm } from '@/utils/arco';
   import { modalConfirm } from '@/utils/arco';
   import { downloadByCrossUrl } from '@/utils';
   import { downloadByCrossUrl } from '@/utils';
+  import { timestampFilter } from '@/utils/filter';
 
 
   defineOptions({
   defineOptions({
     name: 'MyTask',
     name: 'MyTask',
@@ -117,7 +121,8 @@
       },
       },
       {
       {
         title: '创建时间',
         title: '创建时间',
-        dataIndex: 'operator',
+        dataIndex: 'createTime',
+        slotName: 'createTime',
       },
       },
       {
       {
         title: '操作',
         title: '操作',

+ 9 - 6
src/views/order/order-record-manage/index.vue

@@ -310,12 +310,15 @@
   }
   }
 
 
   const exportTable = async () => {
   const exportTable = async () => {
-    const res = await downloadByApi(() =>
-      orderDetailExport({ teachingId: searchModel.teachingId })
-    ).catch((e) => {
-      Message.error(e || '导出失败,请重新尝试!');
+    // const res = await downloadByApi(() =>
+    //   orderDetailExport({ teachingId: searchModel.teachingId })
+    // ).catch((e) => {
+    //   Message.error(e || '导出失败,请重新尝试!');
+    // });
+    // if (!res) return;
+    // Message.success('导出成功!');
+    orderDetailExport({ teachingId: searchModel.teachingId }).then(() => {
+      Message.success('导出中,请到"我的任务"中查看');
     });
     });
-    if (!res) return;
-    Message.success('导出成功!');
   };
   };
 </script>
 </script>