From 4175bec17f144fd96b7c8bf2dee1c809a0782c80 Mon Sep 17 00:00:00 2001 From: lframework Date: Sun, 13 Apr 2025 10:16:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1=E3=80=81=E6=96=87=E4=BB=B6=E6=94=B6?= =?UTF-8?q?=E7=BA=B3=E7=AE=B1=E4=BF=AE=E6=94=B9=E6=88=90=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E3=80=82=202=E3=80=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BA=A4=E4=BA=92=E6=96=B9=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=88=B0=E5=AF=BC=E5=87=BA=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=AF=BC=E5=87=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/base-data/address/index.ts | 1 - src/api/customer-settle/check/index.ts | 3 +- src/api/customer-settle/fee/index.ts | 3 +- src/api/customer-settle/pre/index.ts | 3 +- src/api/customer-settle/sheet/index.ts | 3 +- src/api/export-task/index.ts | 57 +++++ .../model/exportingExportTaskBo.ts | 31 +++ src/api/export-task/model/failExportTaskBo.ts | 21 ++ .../model/queryFailExportTaskVo.ts | 8 + .../model/querySuccessExportTaskVo.ts | 8 + .../export-task/model/successExportTaskBo.ts | 36 +++ src/api/sc/logistics/sheet/index.ts | 1 - src/api/sc/purchase/order/index.ts | 1 - src/api/sc/purchase/receive/index.ts | 1 - src/api/sc/purchase/return/index.ts | 3 +- src/api/sc/retail/out/index.ts | 3 +- src/api/sc/retail/return/index.ts | 3 +- src/api/sc/sale/order/index.ts | 3 +- src/api/sc/sale/out/index.ts | 3 +- src/api/sc/sale/return/index.ts | 3 +- src/api/sc/stock/adjust/stock/index.ts | 3 +- src/api/sc/stock/product-stock-log/index.ts | 2 - src/api/sc/stock/product-stock/index.ts | 2 - src/api/sc/stock/take/plan/index.ts | 3 +- src/api/sc/stock/take/pre/index.ts | 3 +- src/api/sc/stock/take/sheet/index.ts | 3 +- src/api/sc/stock/transfer-sc/index.ts | 3 +- src/api/security-download/index.ts | 22 ++ src/api/settle/check/index.ts | 3 +- src/api/settle/fee/index.ts | 3 +- src/api/settle/in-item/index.ts | 3 +- src/api/settle/out-item/index.ts | 3 +- src/api/settle/pre/index.ts | 3 +- src/api/settle/sheet/index.ts | 3 +- src/enums/biz/exportTaskStatus.ts | 9 + src/events/constants/pullEvent.js | 2 + .../components/export-center/FailList.vue | 120 ++++++++++ .../components/export-center/SuccessList.vue | 146 ++++++++++++ .../header/components/export-center/index.vue | 222 ++++++++++++++++++ .../default/header/components/index.ts | 2 + .../header/components/notify/index.vue | 5 +- src/layouts/default/header/index.less | 10 + src/layouts/default/header/index.vue | 4 +- src/utils/utils.ts | 12 + src/views/base-data/address/index.vue | 2 +- .../customer-settle/check-sheet/index.vue | 2 +- src/views/customer-settle/fee-sheet/index.vue | 2 +- src/views/customer-settle/pre-sheet/index.vue | 2 +- src/views/customer-settle/sheet/index.vue | 2 +- src/views/sc/logistics/sheet/index.vue | 2 +- src/views/sc/purchase/order/index.vue | 2 +- src/views/sc/purchase/receive/index.vue | 2 +- src/views/sc/purchase/return/index.vue | 2 +- src/views/sc/retail/out/index.vue | 2 +- src/views/sc/retail/return/index.vue | 2 +- src/views/sc/sale/order/index.vue | 2 +- src/views/sc/sale/out/index.vue | 2 +- src/views/sc/sale/return/index.vue | 2 +- src/views/sc/stock/adjust/stock/index.vue | 2 +- src/views/sc/stock/product-log/index.vue | 2 +- src/views/sc/stock/product/index.vue | 2 +- src/views/sc/stock/take/plan/index.vue | 2 +- src/views/sc/stock/take/pre/index.vue | 2 +- src/views/sc/stock/take/sheet/index.vue | 2 +- src/views/sc/stock/transfer/index.vue | 2 +- src/views/settle/check-sheet/index.vue | 2 +- src/views/settle/fee-sheet/index.vue | 2 +- src/views/settle/in-item/index.vue | 2 +- src/views/settle/out-item/index.vue | 2 +- src/views/settle/pre-sheet/index.vue | 2 +- src/views/settle/sheet/index.vue | 2 +- src/views/smart-work/file-box/detail.vue | 28 ++- 72 files changed, 776 insertions(+), 92 deletions(-) create mode 100644 src/api/export-task/index.ts create mode 100644 src/api/export-task/model/exportingExportTaskBo.ts create mode 100644 src/api/export-task/model/failExportTaskBo.ts create mode 100644 src/api/export-task/model/queryFailExportTaskVo.ts create mode 100644 src/api/export-task/model/querySuccessExportTaskVo.ts create mode 100644 src/api/export-task/model/successExportTaskBo.ts create mode 100644 src/api/security-download/index.ts create mode 100644 src/enums/biz/exportTaskStatus.ts create mode 100644 src/layouts/default/header/components/export-center/FailList.vue create mode 100644 src/layouts/default/header/components/export-center/SuccessList.vue create mode 100644 src/layouts/default/header/components/export-center/index.vue diff --git a/src/api/base-data/address/index.ts b/src/api/base-data/address/index.ts index 652e3a7..0d2f0f6 100644 --- a/src/api/base-data/address/index.ts +++ b/src/api/base-data/address/index.ts @@ -180,7 +180,6 @@ export function exportList(data: QueryAddressVo): Promise { data, }, { - responseType: ResponseEnum.BLOB, contentType: ContentTypeEnum.FORM_URLENCODED, region, }, diff --git a/src/api/customer-settle/check/index.ts b/src/api/customer-settle/check/index.ts index b0fb22e..d3272be 100644 --- a/src/api/customer-settle/check/index.ts +++ b/src/api/customer-settle/check/index.ts @@ -1,5 +1,5 @@ import { defHttp } from '/@/utils/http/axios'; -import { ContentTypeEnum, ResponseEnum } from '@/enums/httpEnum'; +import { ContentTypeEnum } from '@/enums/httpEnum'; import { PageResult } from '@/api/model/pageResult'; import { QueryCustomerSettleCheckSheetVo } from '@/api/customer-settle/check/model/queryCustomerSettleCheckSheetVo'; import { QueryCustomerSettleCheckSheetBo } from '@/api/customer-settle/check/model/queryCustomerSettleCheckSheetBo'; @@ -42,7 +42,6 @@ export function exportList(data: QueryCustomerSettleCheckSheetVo): Promise }, { region, - responseType: ResponseEnum.BLOB, contentType: ContentTypeEnum.FORM_URLENCODED, }, ); diff --git a/src/api/customer-settle/fee/index.ts b/src/api/customer-settle/fee/index.ts index a59d402..04056e9 100644 --- a/src/api/customer-settle/fee/index.ts +++ b/src/api/customer-settle/fee/index.ts @@ -1,5 +1,5 @@ import { defHttp } from '/@/utils/http/axios'; -import { ContentTypeEnum, ResponseEnum } from '@/enums/httpEnum'; +import { ContentTypeEnum } from '@/enums/httpEnum'; import { PageResult } from '@/api/model/pageResult'; import { QueryCustomerSettleFeeSheetVo } from '@/api/customer-settle/fee/model/queryCustomerSettleFeeSheetVo'; import { QueryCustomerSettleFeeSheetBo } from '@/api/customer-settle/fee/model/queryCustomerSettleFeeSheetBo'; @@ -40,7 +40,6 @@ export function exportList(data: QueryCustomerSettleFeeSheetVo): Promise { }, { region, - responseType: ResponseEnum.BLOB, contentType: ContentTypeEnum.FORM_URLENCODED, }, ); diff --git a/src/api/customer-settle/pre/index.ts b/src/api/customer-settle/pre/index.ts index 1c43e84..f5068c6 100644 --- a/src/api/customer-settle/pre/index.ts +++ b/src/api/customer-settle/pre/index.ts @@ -1,5 +1,5 @@ import { defHttp } from '/@/utils/http/axios'; -import { ContentTypeEnum, ResponseEnum } from '@/enums/httpEnum'; +import { ContentTypeEnum } from '@/enums/httpEnum'; import { PageResult } from '@/api/model/pageResult'; import { QueryCustomerSettlePreSheetVo } from '@/api/customer-settle/pre/model/queryCustomerSettlePreSheetVo'; import { QueryCustomerSettlePreSheetBo } from '@/api/customer-settle/pre/model/queryCustomerSettlePreSheetBo'; @@ -40,7 +40,6 @@ export function exportList(data: QueryCustomerSettlePreSheetVo): Promise { }, { region, - responseType: ResponseEnum.BLOB, contentType: ContentTypeEnum.FORM_URLENCODED, }, ); diff --git a/src/api/customer-settle/sheet/index.ts b/src/api/customer-settle/sheet/index.ts index 75b78b5..8666459 100644 --- a/src/api/customer-settle/sheet/index.ts +++ b/src/api/customer-settle/sheet/index.ts @@ -1,5 +1,5 @@ import { defHttp } from '/@/utils/http/axios'; -import { ContentTypeEnum, ResponseEnum } from '@/enums/httpEnum'; +import { ContentTypeEnum } from '@/enums/httpEnum'; import { PageResult } from '@/api/model/pageResult'; import { QueryCustomerSettleSheetVo } from '@/api/customer-settle/sheet/model/queryCustomerSettleSheetVo'; import { QueryCustomerSettleSheetBo } from '@/api/customer-settle/sheet/model/queryCustomerSettleSheetBo'; @@ -42,7 +42,6 @@ export function exportList(data: QueryCustomerSettleSheetVo): Promise { }, { region, - responseType: ResponseEnum.BLOB, contentType: ContentTypeEnum.FORM_URLENCODED, }, ); diff --git a/src/api/export-task/index.ts b/src/api/export-task/index.ts new file mode 100644 index 0000000..6a0661a --- /dev/null +++ b/src/api/export-task/index.ts @@ -0,0 +1,57 @@ +import { defHttp } from '/@/utils/http/axios'; +import { ExportingExportTaskBo } from '@/api/export-task/model/exportingExportTaskBo'; +import { SuccessExportTaskBo } from '@/api/export-task/model/successExportTaskBo'; +import { PageResult } from '@/api/model/pageResult'; +import { QuerySuccessExportTaskVo } from '@/api/export-task/model/querySuccessExportTaskVo'; +import { FailExportTaskBo } from '@/api/export-task/model/failExportTaskBo'; +import { QueryFailExportTaskVo } from '@/api/export-task/model/queryFailExportTaskVo'; + +const baseUrl = '/export/task'; +const region = 'cloud-api'; + +/** + * 正在导出列表 + */ +export function queryExporting(): Promise { + return defHttp.get( + { + url: baseUrl + '/exporting', + }, + { + errorMessageMode: 'none', + region, + }, + ); +} + +/** + * 导出成功列表 + */ +export function querySuccess( + params: QuerySuccessExportTaskVo, +): Promise> { + return defHttp.get>( + { + url: baseUrl + '/success', + params, + }, + { + region, + }, + ); +} + +/** + * 导出失败列表 + */ +export function queryFail(params: QueryFailExportTaskVo): Promise> { + return defHttp.get>( + { + url: baseUrl + '/fail', + params, + }, + { + region, + }, + ); +} diff --git a/src/api/export-task/model/exportingExportTaskBo.ts b/src/api/export-task/model/exportingExportTaskBo.ts new file mode 100644 index 0000000..08ee6d9 --- /dev/null +++ b/src/api/export-task/model/exportingExportTaskBo.ts @@ -0,0 +1,31 @@ +export interface ExportingExportTaskBo { + /** + * ID + */ + id: string; + + /** + * 名称 + */ + name: string; + + /** + * 总数据条数 + */ + totalCount: number; + + /** + * 当前完成数据条数 + */ + curCount: number; + + /** + * 状态 + */ + status: number; + + /** + * 创建时间 + */ + createTime: string; +} diff --git a/src/api/export-task/model/failExportTaskBo.ts b/src/api/export-task/model/failExportTaskBo.ts new file mode 100644 index 0000000..73d8e2d --- /dev/null +++ b/src/api/export-task/model/failExportTaskBo.ts @@ -0,0 +1,21 @@ +export interface FailExportTaskBo { + /** + * ID + */ + id: string; + + /** + * 名称 + */ + name: string; + + /** + * 创建时间 + */ + createTime: string; + + /** + * 错误信息 + */ + errorMsg: string; +} diff --git a/src/api/export-task/model/queryFailExportTaskVo.ts b/src/api/export-task/model/queryFailExportTaskVo.ts new file mode 100644 index 0000000..58720ce --- /dev/null +++ b/src/api/export-task/model/queryFailExportTaskVo.ts @@ -0,0 +1,8 @@ +import { PageVo } from '@/api/model/pageVo'; + +export interface QueryFailExportTaskVo extends PageVo { + /** + * 名称 + */ + name: string; +} diff --git a/src/api/export-task/model/querySuccessExportTaskVo.ts b/src/api/export-task/model/querySuccessExportTaskVo.ts new file mode 100644 index 0000000..d283dec --- /dev/null +++ b/src/api/export-task/model/querySuccessExportTaskVo.ts @@ -0,0 +1,8 @@ +import { PageVo } from '@/api/model/pageVo'; + +export interface QuerySuccessExportTaskVo extends PageVo { + /** + * 名称 + */ + name: string; +} diff --git a/src/api/export-task/model/successExportTaskBo.ts b/src/api/export-task/model/successExportTaskBo.ts new file mode 100644 index 0000000..b7bafaa --- /dev/null +++ b/src/api/export-task/model/successExportTaskBo.ts @@ -0,0 +1,36 @@ +export interface SuccessExportTaskBo { + /** + * ID + */ + id: string; + + /** + * 名称 + */ + name: string; + + /** + * 文件大小 + */ + fileSize: string; + + /** + * 上传记录ID + */ + recordId: string; + + /** + * 总数据条数 + */ + totalCount: number; + + /** + * 创建时间 + */ + createTime: string; + + /** + * 完成时间 + */ + finishTime: string; +} diff --git a/src/api/sc/logistics/sheet/index.ts b/src/api/sc/logistics/sheet/index.ts index e798bf7..0921b7a 100644 --- a/src/api/sc/logistics/sheet/index.ts +++ b/src/api/sc/logistics/sheet/index.ts @@ -209,7 +209,6 @@ export function exportList(data: QueryLogisticsSheetVo): Promise { }, { region, - responseType: ResponseEnum.BLOB, contentType: ContentTypeEnum.FORM_URLENCODED, }, ); diff --git a/src/api/sc/purchase/order/index.ts b/src/api/sc/purchase/order/index.ts index a56cf35..be923da 100644 --- a/src/api/sc/purchase/order/index.ts +++ b/src/api/sc/purchase/order/index.ts @@ -91,7 +91,6 @@ export function exportList(data: QueryPurchaseOrderVo): Promise { }, { region, - responseType: ResponseEnum.BLOB, contentType: ContentTypeEnum.FORM_URLENCODED, }, ); diff --git a/src/api/sc/purchase/receive/index.ts b/src/api/sc/purchase/receive/index.ts index ca8ad09..46230d2 100644 --- a/src/api/sc/purchase/receive/index.ts +++ b/src/api/sc/purchase/receive/index.ts @@ -90,7 +90,6 @@ export function exportList(data: QueryReceiveSheetVo): Promise { }, { region, - responseType: ResponseEnum.BLOB, contentType: ContentTypeEnum.FORM_URLENCODED, }, ); diff --git a/src/api/sc/purchase/return/index.ts b/src/api/sc/purchase/return/index.ts index e7cf4b8..ecc6079 100644 --- a/src/api/sc/purchase/return/index.ts +++ b/src/api/sc/purchase/return/index.ts @@ -1,5 +1,5 @@ import { defHttp } from '/@/utils/http/axios'; -import { ContentTypeEnum, ResponseEnum } from '@/enums/httpEnum'; +import { ContentTypeEnum } from '@/enums/httpEnum'; import { A4ExcelPortraitPrintBo } from '@/api/model/a4ExcelPortraitPrintBo'; import { PageResult } from '@/api/model/pageResult'; import { QueryPurchaseReturnVo } from '@/api/sc/purchase/return/model/queryPurchaseReturnVo'; @@ -56,7 +56,6 @@ export function exportList(data: QueryPurchaseReturnVo): Promise { }, { region, - responseType: ResponseEnum.BLOB, contentType: ContentTypeEnum.FORM_URLENCODED, }, ); diff --git a/src/api/sc/retail/out/index.ts b/src/api/sc/retail/out/index.ts index 7fdc248..0ecd317 100644 --- a/src/api/sc/retail/out/index.ts +++ b/src/api/sc/retail/out/index.ts @@ -1,5 +1,5 @@ import { defHttp } from '/@/utils/http/axios'; -import { ContentTypeEnum, ResponseEnum } from '@/enums/httpEnum'; +import { ContentTypeEnum } from '@/enums/httpEnum'; import { A4ExcelPortraitPrintBo } from '@/api/model/a4ExcelPortraitPrintBo'; import { PageResult } from '@/api/model/pageResult'; import { GetPaymentDateBo } from '@/api/sc/purchase/receive/model/getPaymentDateBo'; @@ -62,7 +62,6 @@ export function exportList(data: QueryRetailOutSheetVo): Promise { }, { region, - responseType: ResponseEnum.BLOB, contentType: ContentTypeEnum.FORM_URLENCODED, }, ); diff --git a/src/api/sc/retail/return/index.ts b/src/api/sc/retail/return/index.ts index fba7a0d..33ef331 100644 --- a/src/api/sc/retail/return/index.ts +++ b/src/api/sc/retail/return/index.ts @@ -1,5 +1,5 @@ import { defHttp } from '/@/utils/http/axios'; -import { ContentTypeEnum, ResponseEnum } from '@/enums/httpEnum'; +import { ContentTypeEnum } from '@/enums/httpEnum'; import { A4ExcelPortraitPrintBo } from '@/api/model/a4ExcelPortraitPrintBo'; import { PageResult } from '@/api/model/pageResult'; import { QueryRetailReturnBo } from '@/api/sc/retail/return/model/queryRetailReturnBo'; @@ -56,7 +56,6 @@ export function exportList(data: QueryRetailReturnVo): Promise { }, { region, - responseType: ResponseEnum.BLOB, contentType: ContentTypeEnum.FORM_URLENCODED, }, ); diff --git a/src/api/sc/sale/order/index.ts b/src/api/sc/sale/order/index.ts index fe0f662..e92955f 100644 --- a/src/api/sc/sale/order/index.ts +++ b/src/api/sc/sale/order/index.ts @@ -1,5 +1,5 @@ import { defHttp } from '/@/utils/http/axios'; -import { ContentTypeEnum, ResponseEnum } from '@/enums/httpEnum'; +import { ContentTypeEnum } from '@/enums/httpEnum'; import { A4ExcelPortraitPrintBo } from '@/api/model/a4ExcelPortraitPrintBo'; import { QuerySaleOrderVo } from '@/api/sc/sale/order/model/querySaleOrderVo'; import { PageResult } from '@/api/model/pageResult'; @@ -61,7 +61,6 @@ export function exportList(data: QuerySaleOrderVo): Promise { }, { region, - responseType: ResponseEnum.BLOB, contentType: ContentTypeEnum.FORM_URLENCODED, }, ); diff --git a/src/api/sc/sale/out/index.ts b/src/api/sc/sale/out/index.ts index 8571ce2..5aec8d7 100644 --- a/src/api/sc/sale/out/index.ts +++ b/src/api/sc/sale/out/index.ts @@ -1,5 +1,5 @@ import { defHttp } from '/@/utils/http/axios'; -import { ContentTypeEnum, ResponseEnum } from '@/enums/httpEnum'; +import { ContentTypeEnum } from '@/enums/httpEnum'; import { A4ExcelPortraitPrintBo } from '@/api/model/a4ExcelPortraitPrintBo'; import { PageResult } from '@/api/model/pageResult'; import { GetPaymentDateBo } from '@/api/sc/purchase/receive/model/getPaymentDateBo'; @@ -60,7 +60,6 @@ export function exportList(data: QuerySaleOutSheetVo): Promise { }, { region, - responseType: ResponseEnum.BLOB, contentType: ContentTypeEnum.FORM_URLENCODED, }, ); diff --git a/src/api/sc/sale/return/index.ts b/src/api/sc/sale/return/index.ts index 95d5067..aaa5f51 100644 --- a/src/api/sc/sale/return/index.ts +++ b/src/api/sc/sale/return/index.ts @@ -1,5 +1,5 @@ import { defHttp } from '/@/utils/http/axios'; -import { ContentTypeEnum, ResponseEnum } from '@/enums/httpEnum'; +import { ContentTypeEnum } from '@/enums/httpEnum'; import { A4ExcelPortraitPrintBo } from '@/api/model/a4ExcelPortraitPrintBo'; import { PageResult } from '@/api/model/pageResult'; import { QuerySaleReturnVo } from '@/api/sc/sale/return/model/querySaleReturnVo'; @@ -56,7 +56,6 @@ export function exportList(data: QuerySaleReturnVo): Promise { }, { region, - responseType: ResponseEnum.BLOB, contentType: ContentTypeEnum.FORM_URLENCODED, }, ); diff --git a/src/api/sc/stock/adjust/stock/index.ts b/src/api/sc/stock/adjust/stock/index.ts index 3817349..b633313 100644 --- a/src/api/sc/stock/adjust/stock/index.ts +++ b/src/api/sc/stock/adjust/stock/index.ts @@ -1,5 +1,5 @@ import { defHttp } from '/@/utils/http/axios'; -import { ContentTypeEnum, ResponseEnum } from '@/enums/httpEnum'; +import { ContentTypeEnum } from '@/enums/httpEnum'; import { PageResult } from '@/api/model/pageResult'; import { QueryStockAdjustSheetVo } from '@/api/sc/stock/adjust/stock/model/queryStockAdjustSheetVo'; import { QueryStockAdjustSheetBo } from '@/api/sc/stock/adjust/stock/model/queryStockAdjustSheetBo'; @@ -42,7 +42,6 @@ export function exportList(data: QueryStockAdjustSheetVo): Promise { }, { region, - responseType: ResponseEnum.BLOB, contentType: ContentTypeEnum.FORM_URLENCODED, }, ); diff --git a/src/api/sc/stock/product-stock-log/index.ts b/src/api/sc/stock/product-stock-log/index.ts index d97bf4d..af9a556 100644 --- a/src/api/sc/stock/product-stock-log/index.ts +++ b/src/api/sc/stock/product-stock-log/index.ts @@ -1,5 +1,4 @@ import { defHttp } from '/@/utils/http/axios'; -import { ResponseEnum } from '@/enums/httpEnum'; import { PageResult } from '@/api/model/pageResult'; import { QueryProductStockLogVo } from '@/api/sc/stock/product-stock-log/model/queryProductStockLogVo'; import { QueryProductStockLogBo } from '@/api/sc/stock/product-stock-log/model/queryProductStockLogBo'; @@ -33,7 +32,6 @@ export function exportList(params: QueryProductStockLogVo): Promise { }, { region, - responseType: ResponseEnum.BLOB, }, ); } diff --git a/src/api/sc/stock/product-stock/index.ts b/src/api/sc/stock/product-stock/index.ts index f3905c5..1f6a3f0 100644 --- a/src/api/sc/stock/product-stock/index.ts +++ b/src/api/sc/stock/product-stock/index.ts @@ -1,5 +1,4 @@ import { defHttp } from '/@/utils/http/axios'; -import { ResponseEnum } from '@/enums/httpEnum'; import { PageResult } from '@/api/model/pageResult'; import { QueryProductStockVo } from '@/api/sc/stock/product-stock/model/queryProductStockVo'; import { QueryProductStockBo } from '@/api/sc/stock/product-stock/model/queryProductStockBo'; @@ -33,7 +32,6 @@ export function exportList(params: QueryProductStockVo): Promise { }, { region, - responseType: ResponseEnum.BLOB, }, ); } diff --git a/src/api/sc/stock/take/plan/index.ts b/src/api/sc/stock/take/plan/index.ts index 49eca73..190582e 100644 --- a/src/api/sc/stock/take/plan/index.ts +++ b/src/api/sc/stock/take/plan/index.ts @@ -1,5 +1,5 @@ import { defHttp } from '/@/utils/http/axios'; -import { ContentTypeEnum, ResponseEnum } from '@/enums/httpEnum'; +import { ContentTypeEnum } from '@/enums/httpEnum'; import { PageResult } from '@/api/model/pageResult'; import { TakeStockPlanSelectorBo } from '@/api/sc/stock/take/plan/model/takeStockPlanSelectorBo'; import { TakeStockPlanSelectorVo } from '@/api/sc/stock/take/plan/model/takeStockPlanSelectorVo'; @@ -70,7 +70,6 @@ export function exportList(data: QueryTakeStockPlanVo): Promise { }, { region, - responseType: ResponseEnum.BLOB, contentType: ContentTypeEnum.FORM_URLENCODED, }, ); diff --git a/src/api/sc/stock/take/pre/index.ts b/src/api/sc/stock/take/pre/index.ts index 6de846c..ce1b181 100644 --- a/src/api/sc/stock/take/pre/index.ts +++ b/src/api/sc/stock/take/pre/index.ts @@ -1,5 +1,5 @@ import { defHttp } from '/@/utils/http/axios'; -import { ContentTypeEnum, ResponseEnum } from '@/enums/httpEnum'; +import { ContentTypeEnum } from '@/enums/httpEnum'; import { PageResult } from '@/api/model/pageResult'; import { PreTakeStockSheetSelectorVo } from '@/api/sc/stock/take/pre/model/preTakeStockSheetSelectorVo'; import { PreTakeStockSheetSelectorBo } from '@/api/sc/stock/take/pre/model/preTakeStockSheetSelectorBo'; @@ -71,7 +71,6 @@ export function exportList(data: QueryPreTakeStockSheetVo): Promise { }, { region, - responseType: ResponseEnum.BLOB, contentType: ContentTypeEnum.FORM_URLENCODED, }, ); diff --git a/src/api/sc/stock/take/sheet/index.ts b/src/api/sc/stock/take/sheet/index.ts index 60e1e98..3d6cf9a 100644 --- a/src/api/sc/stock/take/sheet/index.ts +++ b/src/api/sc/stock/take/sheet/index.ts @@ -1,5 +1,5 @@ import { defHttp } from '/@/utils/http/axios'; -import { ContentTypeEnum, ResponseEnum } from '@/enums/httpEnum'; +import { ContentTypeEnum } from '@/enums/httpEnum'; import { PageResult } from '@/api/model/pageResult'; import { QueryTakeStockSheetBo } from '@/api/sc/stock/take/sheet/model/queryTakeStockSheetBo'; import { QueryTakeStockSheetVo } from '@/api/sc/stock/take/sheet/model/queryTakeStockSheetVo'; @@ -40,7 +40,6 @@ export function exportList(data: QueryTakeStockSheetVo): Promise { }, { region, - responseType: ResponseEnum.BLOB, contentType: ContentTypeEnum.FORM_URLENCODED, }, ); diff --git a/src/api/sc/stock/transfer-sc/index.ts b/src/api/sc/stock/transfer-sc/index.ts index ce1d00d..44b7e1a 100644 --- a/src/api/sc/stock/transfer-sc/index.ts +++ b/src/api/sc/stock/transfer-sc/index.ts @@ -1,5 +1,5 @@ import { defHttp } from '/@/utils/http/axios'; -import { ContentTypeEnum, ResponseEnum } from '@/enums/httpEnum'; +import { ContentTypeEnum } from '@/enums/httpEnum'; import { PageResult } from '@/api/model/pageResult'; import { QueryScTransferOrderVo } from '@/api/sc/stock/transfer-sc/model/queryScTransferOrderVo'; import { QueryScTransferOrderBo } from '@/api/sc/stock/transfer-sc/model/queryScTransferOrderBo'; @@ -43,7 +43,6 @@ export function exportList(data: QueryScTransferOrderVo): Promise { }, { region, - responseType: ResponseEnum.BLOB, contentType: ContentTypeEnum.FORM_URLENCODED, }, ); diff --git a/src/api/security-download/index.ts b/src/api/security-download/index.ts new file mode 100644 index 0000000..b4a51b1 --- /dev/null +++ b/src/api/security-download/index.ts @@ -0,0 +1,22 @@ +import { defHttp } from '/@/utils/http/axios'; + +const baseUrl = '/download/security'; +const region = 'cloud-api'; + +/** + * 下载文件（获取签名URL） + * @param id + */ +export function getSecurityDownloadUrl(id: string): Promise { + return defHttp.get( + { + url: baseUrl + '/url', + params: { + id, + }, + }, + { + region, + }, + ); +} diff --git a/src/api/settle/check/index.ts b/src/api/settle/check/index.ts index 5484510..6b597d4 100644 --- a/src/api/settle/check/index.ts +++ b/src/api/settle/check/index.ts @@ -1,5 +1,5 @@ import { defHttp } from '/@/utils/http/axios'; -import { ContentTypeEnum, ResponseEnum } from '@/enums/httpEnum'; +import { ContentTypeEnum } from '@/enums/httpEnum'; import { PageResult } from '@/api/model/pageResult'; import { QuerySettleCheckSheetVo } from '@/api/settle/check/model/querySettleCheckSheetVo'; import { QuerySettleCheckSheetBo } from '@/api/settle/check/model/querySettleCheckSheetBo'; @@ -42,7 +42,6 @@ export function exportList(data: QuerySettleCheckSheetVo): Promise { }, { region, - responseType: ResponseEnum.BLOB, contentType: ContentTypeEnum.FORM_URLENCODED, }, ); diff --git a/src/api/settle/fee/index.ts b/src/api/settle/fee/index.ts index 8563096..b173335 100644 --- a/src/api/settle/fee/index.ts +++ b/src/api/settle/fee/index.ts @@ -1,5 +1,5 @@ import { defHttp } from '/@/utils/http/axios'; -import { ContentTypeEnum, ResponseEnum } from '@/enums/httpEnum'; +import { ContentTypeEnum } from '@/enums/httpEnum'; import { PageResult } from '@/api/model/pageResult'; import { QuerySettleFeeSheetVo } from '@/api/settle/fee/model/querySettleFeeSheetVo'; import { QuerySettleFeeSheetBo } from '@/api/settle/fee/model/querySettleFeeSheetBo'; @@ -38,7 +38,6 @@ export function exportList(data: QuerySettleFeeSheetVo): Promise { }, { region, - responseType: ResponseEnum.BLOB, contentType: ContentTypeEnum.FORM_URLENCODED, }, ); diff --git a/src/api/settle/in-item/index.ts b/src/api/settle/in-item/index.ts index ba2aaa4..b1f3834 100644 --- a/src/api/settle/in-item/index.ts +++ b/src/api/settle/in-item/index.ts @@ -1,6 +1,6 @@ import { defHttp } from '/@/utils/http/axios'; import { PageResult } from '@/api/model/pageResult'; -import { ContentTypeEnum, ResponseEnum } from '@/enums/httpEnum'; +import { ContentTypeEnum } from '@/enums/httpEnum'; import { SettleInItemSelectorVo } from '@/api/settle/in-item/model/settleInItemSelectorVo'; import { SettleInItemSelectorBo } from '@/api/settle/in-item/model/settleInItemSelectorBo'; import { QuerySettleInItemBo } from '@/api/settle/in-item/model/querySettleInItemBo'; @@ -157,7 +157,6 @@ export function exportList(data: QuerySettleInItemVo): Promise { data, }, { - responseType: ResponseEnum.BLOB, contentType: ContentTypeEnum.FORM_URLENCODED, region, }, diff --git a/src/api/settle/out-item/index.ts b/src/api/settle/out-item/index.ts index 3702d03..ede624c 100644 --- a/src/api/settle/out-item/index.ts +++ b/src/api/settle/out-item/index.ts @@ -1,6 +1,6 @@ import { defHttp } from '/@/utils/http/axios'; import { PageResult } from '@/api/model/pageResult'; -import { ContentTypeEnum, ResponseEnum } from '@/enums/httpEnum'; +import { ContentTypeEnum } from '@/enums/httpEnum'; import { SettleOutItemSelectorVo } from '@/api/settle/out-item/model/settleOutItemSelectorVo'; import { SettleOutItemSelectorBo } from '@/api/settle/out-item/model/settleOutItemSelectorBo'; import { QuerySettleOutItemBo } from '@/api/settle/out-item/model/querySettleOutItemBo'; @@ -157,7 +157,6 @@ export function exportList(data: QuerySettleOutItemVo): Promise { data, }, { - responseType: ResponseEnum.BLOB, contentType: ContentTypeEnum.FORM_URLENCODED, region, }, diff --git a/src/api/settle/pre/index.ts b/src/api/settle/pre/index.ts index 47610b9..641780e 100644 --- a/src/api/settle/pre/index.ts +++ b/src/api/settle/pre/index.ts @@ -1,5 +1,5 @@ import { defHttp } from '/@/utils/http/axios'; -import { ContentTypeEnum, ResponseEnum } from '@/enums/httpEnum'; +import { ContentTypeEnum } from '@/enums/httpEnum'; import { PageResult } from '@/api/model/pageResult'; import { QuerySettlePreSheetVo } from '@/api/settle/pre/model/querySettlePreSheetVo'; import { QuerySettlePreSheetBo } from '@/api/settle/pre/model/querySettlePreSheetBo'; @@ -38,7 +38,6 @@ export function exportList(data: QuerySettlePreSheetVo): Promise { }, { region, - responseType: ResponseEnum.BLOB, contentType: ContentTypeEnum.FORM_URLENCODED, }, ); diff --git a/src/api/settle/sheet/index.ts b/src/api/settle/sheet/index.ts index 03e4f81..dd4736c 100644 --- a/src/api/settle/sheet/index.ts +++ b/src/api/settle/sheet/index.ts @@ -1,5 +1,5 @@ import { defHttp } from '/@/utils/http/axios'; -import { ContentTypeEnum, ResponseEnum } from '@/enums/httpEnum'; +import { ContentTypeEnum } from '@/enums/httpEnum'; import { PageResult } from '@/api/model/pageResult'; import { QuerySettleSheetVo } from '@/api/settle/sheet/model/querySettleSheetVo'; import { QuerySettleSheetBo } from '@/api/settle/sheet/model/querySettleSheetBo'; @@ -40,7 +40,6 @@ export function exportList(data: QuerySettleSheetVo): Promise { }, { region, - responseType: ResponseEnum.BLOB, contentType: ContentTypeEnum.FORM_URLENCODED, }, ); diff --git a/src/enums/biz/exportTaskStatus.ts b/src/enums/biz/exportTaskStatus.ts new file mode 100644 index 0000000..785306b --- /dev/null +++ b/src/enums/biz/exportTaskStatus.ts @@ -0,0 +1,9 @@ +import { BaseEnum, BaseEnumItem } from '@/enums/baseEnum'; + +const EXPORT_TASK_STATUS: BaseEnum = new BaseEnum(); +EXPORT_TASK_STATUS.set('CREATED', new BaseEnumItem(0, '等待导出')); +EXPORT_TASK_STATUS.set('EXPORTING', new BaseEnumItem(1, '正在导出')); +EXPORT_TASK_STATUS.set('SUCCESS', new BaseEnumItem(2, '导出成功')); +EXPORT_TASK_STATUS.set('FAIL', new BaseEnumItem(3, '导出失败')); + +export { EXPORT_TASK_STATUS }; diff --git a/src/events/constants/pullEvent.js b/src/events/constants/pullEvent.js index 16ea284..2c7608a 100644 --- a/src/events/constants/pullEvent.js +++ b/src/events/constants/pullEvent.js @@ -10,4 +10,6 @@ export default { SYS_NOTICE: 'sysNotice', // 站内信 SYS_SITE_MESSAGE: 'siteMessage', + // 导出任务 + EXPORT_TASK: 'exportTask', }; diff --git a/src/layouts/default/header/components/export-center/FailList.vue b/src/layouts/default/header/components/export-center/FailList.vue new file mode 100644 index 0000000..564b44c --- /dev/null +++ b/src/layouts/default/header/components/export-center/FailList.vue @@ -0,0 +1,120 @@ + + + + diff --git a/src/layouts/default/header/components/export-center/SuccessList.vue b/src/layouts/default/header/components/export-center/SuccessList.vue new file mode 100644 index 0000000..c342a37 --- /dev/null +++ b/src/layouts/default/header/components/export-center/SuccessList.vue @@ -0,0 +1,146 @@ + + + + diff --git a/src/layouts/default/header/components/export-center/index.vue b/src/layouts/default/header/components/export-center/index.vue new file mode 100644 index 0000000..8121269 --- /dev/null +++ b/src/layouts/default/header/components/export-center/index.vue @@ -0,0 +1,222 @@ + + + diff --git a/src/layouts/default/header/components/index.ts b/src/layouts/default/header/components/index.ts index eaba03f..660680b 100644 --- a/src/layouts/default/header/components/index.ts +++ b/src/layouts/default/header/components/index.ts @@ -9,4 +9,6 @@ export const LayoutBreadcrumb = createAsyncComponent(() => import('./Breadcrumb. export const Notify = createAsyncComponent(() => import('./notify/index.vue')); +export const ExportCenter = createAsyncComponent(() => import('./export-center/index.vue')); + export { FullScreen }; diff --git a/src/layouts/default/header/components/notify/index.vue b/src/layouts/default/header/components/notify/index.vue index 61e92e3..d551884 100644 --- a/src/layouts/default/header/components/notify/index.vue +++ b/src/layouts/default/header/components/notify/index.vue @@ -16,7 +16,10 @@ + + @@ -58,7 +60,7 @@ import LayoutMenu from '../menu/index.vue'; import LayoutTrigger from '../trigger/index.vue'; - import { FullScreen, LayoutBreadcrumb, Notify, UserDropDown } from './components'; + import { FullScreen, LayoutBreadcrumb, Notify, UserDropDown, ExportCenter } from './components'; defineOptions({ name: 'LayoutHeader' }); diff --git a/src/utils/utils.ts b/src/utils/utils.ts index 622b3bb..19a92ae 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -728,6 +728,18 @@ export const eq = function (n1, n2) { return math.bignumber(n1).eq(n2); }; +/** + * 获取{decimal}位小数 + * @param number + * @param decimal 小数位数 + */ +export const getNumber = function (number, decimal) { + return math.format(math.bignumber(number), { + notation: 'fixed', + precision: decimal, + }); +}; + /** * 获取当前月有多少天 * @returns {number} diff --git a/src/views/base-data/address/index.vue b/src/views/base-data/address/index.vue index 8c0d3d5..464ad30 100644 --- a/src/views/base-data/address/index.vue +++ b/src/views/base-data/address/index.vue @@ -241,7 +241,7 @@ api .exportList(this.buildQueryParams({})) .then(() => { - this.$msg.createSuccessTip('导出成功！'); + this.$msg.createSuccess('创建导出任务成功，请前往“导出中心”进行下载。'); }) .finally(() => { this.loading = false; diff --git a/src/views/customer-settle/check-sheet/index.vue b/src/views/customer-settle/check-sheet/index.vue index 928f826..67a17b2 100644 --- a/src/views/customer-settle/check-sheet/index.vue +++ b/src/views/customer-settle/check-sheet/index.vue @@ -441,7 +441,7 @@ api .exportList(this.buildQueryParams({})) .then(() => { - this.$msg.createSuccessTip('导出成功！'); + this.$msg.createSuccess('创建导出任务成功，请前往“导出中心”进行下载。'); }) .finally(() => { this.loading = false; diff --git a/src/views/customer-settle/fee-sheet/index.vue b/src/views/customer-settle/fee-sheet/index.vue index b8acac2..373b77c 100644 --- a/src/views/customer-settle/fee-sheet/index.vue +++ b/src/views/customer-settle/fee-sheet/index.vue @@ -431,7 +431,7 @@ api .exportList(this.buildQueryParams({})) .then(() => { - this.$msg.createSuccessTip('导出成功！'); + this.$msg.createSuccess('创建导出任务成功，请前往“导出中心”进行下载。'); }) .finally(() => { this.loading = false; diff --git a/src/views/customer-settle/pre-sheet/index.vue b/src/views/customer-settle/pre-sheet/index.vue index b0aa78a..a16bb68 100644 --- a/src/views/customer-settle/pre-sheet/index.vue +++ b/src/views/customer-settle/pre-sheet/index.vue @@ -431,7 +431,7 @@ api .exportList(this.buildQueryParams({})) .then(() => { - this.$msg.createSuccessTip('导出成功！'); + this.$msg.createSuccess('创建导出任务成功，请前往“导出中心”进行下载。'); }) .finally(() => { this.loading = false; diff --git a/src/views/customer-settle/sheet/index.vue b/src/views/customer-settle/sheet/index.vue index 6579c46..409a183 100644 --- a/src/views/customer-settle/sheet/index.vue +++ b/src/views/customer-settle/sheet/index.vue @@ -401,7 +401,7 @@ api .exportList(this.buildQueryParams({})) .then(() => { - this.$msg.createSuccessTip('导出成功！'); + this.$msg.createSuccess('创建导出任务成功，请前往“导出中心”进行下载。'); }) .finally(() => { this.loading = false; diff --git a/src/views/sc/logistics/sheet/index.vue b/src/views/sc/logistics/sheet/index.vue index 9a59618..092c252 100644 --- a/src/views/sc/logistics/sheet/index.vue +++ b/src/views/sc/logistics/sheet/index.vue @@ -325,7 +325,7 @@ api .exportList(this.buildQueryParams({})) .then(() => { - this.$msg.createSuccessTip('导出成功！'); + this.$msg.createSuccess('创建导出任务成功，请前往“导出中心”进行下载。'); }) .finally(() => { this.loading = false; diff --git a/src/views/sc/purchase/order/index.vue b/src/views/sc/purchase/order/index.vue index f027933..10effbc 100644 --- a/src/views/sc/purchase/order/index.vue +++ b/src/views/sc/purchase/order/index.vue @@ -435,7 +435,7 @@ api .exportList(this.buildQueryParams({})) .then(() => { - this.$msg.createSuccessTip('导出成功！'); + this.$msg.createSuccess('创建导出任务成功，请前往“导出中心”进行下载。'); }) .finally(() => { this.loading = false; diff --git a/src/views/sc/purchase/receive/index.vue b/src/views/sc/purchase/receive/index.vue index 94d9be1..d18c4b7 100644 --- a/src/views/sc/purchase/receive/index.vue +++ b/src/views/sc/purchase/receive/index.vue @@ -515,7 +515,7 @@ api .exportList(this.buildQueryParams({})) .then(() => { - this.$msg.createSuccessTip('导出成功！'); + this.$msg.createSuccess('创建导出任务成功，请前往“导出中心”进行下载。'); }) .finally(() => { this.loading = false; diff --git a/src/views/sc/purchase/return/index.vue b/src/views/sc/purchase/return/index.vue index 4eea3b3..b029347 100644 --- a/src/views/sc/purchase/return/index.vue +++ b/src/views/sc/purchase/return/index.vue @@ -499,7 +499,7 @@ api .exportList(this.buildQueryParams({})) .then(() => { - this.$msg.createSuccessTip('导出成功！'); + this.$msg.createSuccess('创建导出任务成功，请前往“导出中心”进行下载。'); }) .finally(() => { this.loading = false; diff --git a/src/views/sc/retail/out/index.vue b/src/views/sc/retail/out/index.vue index bca126e..d131890 100644 --- a/src/views/sc/retail/out/index.vue +++ b/src/views/sc/retail/out/index.vue @@ -451,7 +451,7 @@ api .exportList(this.buildQueryParams({})) .then(() => { - this.$msg.createSuccessTip('导出成功！'); + this.$msg.createSuccess('创建导出任务成功，请前往“导出中心”进行下载。'); }) .finally(() => { this.loading = false; diff --git a/src/views/sc/retail/return/index.vue b/src/views/sc/retail/return/index.vue index 739f8c4..f60cc0c 100644 --- a/src/views/sc/retail/return/index.vue +++ b/src/views/sc/retail/return/index.vue @@ -496,7 +496,7 @@ api .exportList(this.buildQueryParams({})) .then(() => { - this.$msg.createSuccessTip('导出成功！'); + this.$msg.createSuccess('创建导出任务成功，请前往“导出中心”进行下载。'); }) .finally(() => { this.loading = false; diff --git a/src/views/sc/sale/order/index.vue b/src/views/sc/sale/order/index.vue index e87e06e..7dc3a46 100644 --- a/src/views/sc/sale/order/index.vue +++ b/src/views/sc/sale/order/index.vue @@ -417,7 +417,7 @@ api .exportList(this.buildQueryParams({})) .then(() => { - this.$msg.createSuccessTip('导出成功！'); + this.$msg.createSuccess('创建导出任务成功，请前往“导出中心”进行下载。'); }) .finally(() => { this.loading = false; diff --git a/src/views/sc/sale/out/index.vue b/src/views/sc/sale/out/index.vue index c581530..8c208ff 100644 --- a/src/views/sc/sale/out/index.vue +++ b/src/views/sc/sale/out/index.vue @@ -498,7 +498,7 @@ api .exportList(this.buildQueryParams({})) .then(() => { - this.$msg.createSuccessTip('导出成功！'); + this.$msg.createSuccess('创建导出任务成功，请前往“导出中心”进行下载。'); }) .finally(() => { this.loading = false; diff --git a/src/views/sc/sale/return/index.vue b/src/views/sc/sale/return/index.vue index a2281a9..a96e95f 100644 --- a/src/views/sc/sale/return/index.vue +++ b/src/views/sc/sale/return/index.vue @@ -496,7 +496,7 @@ api .exportList(this.buildQueryParams({})) .then(() => { - this.$msg.createSuccessTip('导出成功！'); + this.$msg.createSuccess('创建导出任务成功，请前往“导出中心”进行下载。'); }) .finally(() => { this.loading = false; diff --git a/src/views/sc/stock/adjust/stock/index.vue b/src/views/sc/stock/adjust/stock/index.vue index 80f975b..d2066fb 100644 --- a/src/views/sc/stock/adjust/stock/index.vue +++ b/src/views/sc/stock/adjust/stock/index.vue @@ -397,7 +397,7 @@ api .exportList(this.buildQueryParams({})) .then(() => { - this.$msg.createSuccessTip('导出成功！'); + this.$msg.createSuccess('创建导出任务成功，请前往“导出中心”进行下载。'); }) .finally(() => { this.loading = false; diff --git a/src/views/sc/stock/product-log/index.vue b/src/views/sc/stock/product-log/index.vue index 28f0b40..95f2508 100644 --- a/src/views/sc/stock/product-log/index.vue +++ b/src/views/sc/stock/product-log/index.vue @@ -398,7 +398,7 @@ api .exportList(this.buildQueryParams({})) .then(() => { - this.$msg.createSuccessTip('导出成功！'); + this.$msg.createSuccess('创建导出任务成功，请前往“导出中心”进行下载。'); }) .finally(() => { this.loading = false; diff --git a/src/views/sc/stock/product/index.vue b/src/views/sc/stock/product/index.vue index e67b62d..3901ef7 100644 --- a/src/views/sc/stock/product/index.vue +++ b/src/views/sc/stock/product/index.vue @@ -154,7 +154,7 @@ api .exportList(this.buildQueryParams({})) .then(() => { - this.$msg.createSuccessTip('导出成功！'); + this.$msg.createSuccess('创建导出任务成功，请前往“导出中心”进行下载。'); }) .finally(() => { this.loading = false; diff --git a/src/views/sc/stock/take/plan/index.vue b/src/views/sc/stock/take/plan/index.vue index a2aa477..7533300 100644 --- a/src/views/sc/stock/take/plan/index.vue +++ b/src/views/sc/stock/take/plan/index.vue @@ -277,7 +277,7 @@ api .exportList(this.buildQueryParams({})) .then(() => { - this.$msg.createSuccessTip('导出成功！'); + this.$msg.createSuccess('创建导出任务成功，请前往“导出中心”进行下载。'); }) .finally(() => { this.loading = false; diff --git a/src/views/sc/stock/take/pre/index.vue b/src/views/sc/stock/take/pre/index.vue index c332877..9af4d13 100644 --- a/src/views/sc/stock/take/pre/index.vue +++ b/src/views/sc/stock/take/pre/index.vue @@ -227,7 +227,7 @@ api .exportList(this.buildQueryParams({})) .then(() => { - this.$msg.createSuccessTip('导出成功！'); + this.$msg.createSuccess('创建导出任务成功，请前往“导出中心”进行下载。'); }) .finally(() => { this.loading = false; diff --git a/src/views/sc/stock/take/sheet/index.vue b/src/views/sc/stock/take/sheet/index.vue index 2456f36..5397a46 100644 --- a/src/views/sc/stock/take/sheet/index.vue +++ b/src/views/sc/stock/take/sheet/index.vue @@ -464,7 +464,7 @@ api .exportList(this.buildQueryParams({})) .then(() => { - this.$msg.createSuccessTip('导出成功！'); + this.$msg.createSuccess('创建导出任务成功，请前往“导出中心”进行下载。'); }) .finally(() => { this.loading = false; diff --git a/src/views/sc/stock/transfer/index.vue b/src/views/sc/stock/transfer/index.vue index 6b22259..543007c 100644 --- a/src/views/sc/stock/transfer/index.vue +++ b/src/views/sc/stock/transfer/index.vue @@ -418,7 +418,7 @@ api .exportList(this.buildQueryParams({})) .then(() => { - this.$msg.createSuccessTip('导出成功！'); + this.$msg.createSuccess('创建导出任务成功，请前往“导出中心”进行下载。'); }) .finally(() => { this.loading = false; diff --git a/src/views/settle/check-sheet/index.vue b/src/views/settle/check-sheet/index.vue index 1b23c06..bc562f8 100644 --- a/src/views/settle/check-sheet/index.vue +++ b/src/views/settle/check-sheet/index.vue @@ -425,7 +425,7 @@ api .exportList(this.buildQueryParams({})) .then(() => { - this.$msg.createSuccessTip('导出成功！'); + this.$msg.createSuccess('创建导出任务成功，请前往“导出中心”进行下载。'); }) .finally(() => { this.loading = false; diff --git a/src/views/settle/fee-sheet/index.vue b/src/views/settle/fee-sheet/index.vue index 79e044a..a91582b 100644 --- a/src/views/settle/fee-sheet/index.vue +++ b/src/views/settle/fee-sheet/index.vue @@ -421,7 +421,7 @@ api .exportList(this.buildQueryParams({})) .then(() => { - this.$msg.createSuccessTip('导出成功！'); + this.$msg.createSuccess('创建导出任务成功，请前往“导出中心”进行下载。'); }) .finally(() => { this.loading = false; diff --git a/src/views/settle/in-item/index.vue b/src/views/settle/in-item/index.vue index 351909a..8422ecb 100644 --- a/src/views/settle/in-item/index.vue +++ b/src/views/settle/in-item/index.vue @@ -261,7 +261,7 @@ api .exportList(this.buildQueryParams({})) .then(() => { - this.$msg.createSuccessTip('导出成功！'); + this.$msg.createSuccess('创建导出任务成功，请前往“导出中心”进行下载。'); }) .finally(() => { this.loading = false; diff --git a/src/views/settle/out-item/index.vue b/src/views/settle/out-item/index.vue index cb9d903..77af2ab 100644 --- a/src/views/settle/out-item/index.vue +++ b/src/views/settle/out-item/index.vue @@ -261,7 +261,7 @@ api .exportList(this.buildQueryParams({})) .then(() => { - this.$msg.createSuccessTip('导出成功！'); + this.$msg.createSuccess('创建导出任务成功，请前往“导出中心”进行下载。'); }) .finally(() => { this.loading = false; diff --git a/src/views/settle/pre-sheet/index.vue b/src/views/settle/pre-sheet/index.vue index 0418b50..a432ded 100644 --- a/src/views/settle/pre-sheet/index.vue +++ b/src/views/settle/pre-sheet/index.vue @@ -421,7 +421,7 @@ api .exportList(this.buildQueryParams({})) .then(() => { - this.$msg.createSuccessTip('导出成功！'); + this.$msg.createSuccess('创建导出任务成功，请前往“导出中心”进行下载。'); }) .finally(() => { this.loading = false; diff --git a/src/views/settle/sheet/index.vue b/src/views/settle/sheet/index.vue index f3d36a8..88a3cc5 100644 --- a/src/views/settle/sheet/index.vue +++ b/src/views/settle/sheet/index.vue @@ -399,7 +399,7 @@ api .exportList(this.buildQueryParams({})) .then(() => { - this.$msg.createSuccessTip('导出成功！'); + this.$msg.createSuccess('创建导出任务成功，请前往“导出中心”进行下载。'); }) .finally(() => { this.loading = false; diff --git a/src/views/smart-work/file-box/detail.vue b/src/views/smart-work/file-box/detail.vue index 83a56eb..273efd8 100644 --- a/src/views/smart-work/file-box/detail.vue +++ b/src/views/smart-work/file-box/detail.vue @@ -12,15 +12,8 @@ {{ formData.name }} - - - - - 点此下载 + + 点此下载 {{ $utils.isEmpty(formData.fileSize) ? '-' : formData.fileSize }} @@ -44,6 +37,7 @@ -- Gitee From cba8aa698e4e02438305b2460218e679c7041965 Mon Sep 17 00:00:00 2001 From: lframework Date: Sun, 13 Apr 2025 15:57:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BC=96=E5=8F=B7=E8=A7=84=E5=88=99?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E7=9A=84?= =?UTF-8?q?=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/enums/biz/generateCodeType.ts | 9 +++++++++ src/views/base-data/customer/add.vue | 17 ++++++++++++++++- src/views/base-data/member/add.vue | 17 ++++++++++++++++- src/views/base-data/product/brand/add.vue | 17 ++++++++++++++++- src/views/base-data/product/info/add.vue | 17 ++++++++++++++++- src/views/base-data/shop/add.vue | 17 ++++++++++++++++- src/views/base-data/store-center/add.vue | 17 ++++++++++++++++- src/views/base-data/supplier/add.vue | 17 ++++++++++++++++- src/views/system/dept/add.vue | 17 ++++++++++++++++- src/views/system/role/add.vue | 17 ++++++++++++++++- src/views/system/user/add.vue | 4 ++-- 11 files changed, 155 insertions(+), 11 deletions(-) diff --git a/src/enums/biz/generateCodeType.ts b/src/enums/biz/generateCodeType.ts index 8693765..4dd9597 100644 --- a/src/enums/biz/generateCodeType.ts +++ b/src/enums/biz/generateCodeType.ts @@ -2,6 +2,15 @@ import { BaseEnum, BaseEnumItem } from '@/enums/baseEnum'; const GENERATE_CODE_TYPE: BaseEnum = new BaseEnum(); GENERATE_CODE_TYPE.set('USER', new BaseEnumItem(1, '用户编号')); +GENERATE_CODE_TYPE.set('DEPT', new BaseEnumItem(2, '部门编号')); +GENERATE_CODE_TYPE.set('ROLE', new BaseEnumItem(3, '角色编号')); +GENERATE_CODE_TYPE.set('SC', new BaseEnumItem(4, '仓库编号')); +GENERATE_CODE_TYPE.set('CUSTOMER', new BaseEnumItem(5, '客户编号')); +GENERATE_CODE_TYPE.set('SUPPLIER', new BaseEnumItem(6, '供应商编号')); +GENERATE_CODE_TYPE.set('MEMBER', new BaseEnumItem(7, '会员编号')); +GENERATE_CODE_TYPE.set('SHOP', new BaseEnumItem(8, '门店编号')); +GENERATE_CODE_TYPE.set('BRAND', new BaseEnumItem(9, '品牌编号')); +GENERATE_CODE_TYPE.set('PRODUCT', new BaseEnumItem(10, '商品编号')); GENERATE_CODE_TYPE.set('PURCHASE_ORDER', new BaseEnumItem(200, '采购订单号')); GENERATE_CODE_TYPE.set('RECEIVE_SHEET', new BaseEnumItem(201, '采购收货单号')); GENERATE_CODE_TYPE.set('PURCHASE_RETURN', new BaseEnumItem(202, '采购退单号')); diff --git a/src/views/base-data/customer/add.vue b/src/views/base-data/customer/add.vue index cf9c6b5..35cc37f 100644 --- a/src/views/base-data/customer/add.vue +++ b/src/views/base-data/customer/add.vue @@ -12,7 +12,14 @@ - + + + 点此生成 + @@ -135,6 +142,7 @@ import { defineComponent } from 'vue'; import { validCode, isEmail } from '@/utils/validate'; import * as api from '@/api/base-data/customer'; + import { generateCode } from '@/api/components'; export default defineComponent({ components: {}, @@ -241,11 +249,18 @@ open() { // 初始化表单数据 this.initFormData(); + + this.onGenerateCode(); }, // 名称改变 changeName(e) { this.formData.mnemonicCode = this.$utils.getCamelCharsUpperCase(e); }, + onGenerateCode() { + generateCode(this.$enums.GENERATE_CODE_TYPE.CUSTOMER.code).then((res) => { + this.formData.code = res; + }); + }, }, }); diff --git a/src/views/base-data/member/add.vue b/src/views/base-data/member/add.vue index 7426808..d63bf17 100644 --- a/src/views/base-data/member/add.vue +++ b/src/views/base-data/member/add.vue @@ -12,7 +12,14 @@ - + + + 点此生成 + @@ -109,6 +116,7 @@ import moment from 'moment'; import { validCode, isEmail } from '@/utils/validate'; import * as api from '@/api/base-data/member'; + import { generateCode } from '@/api/components'; export default defineComponent({ components: {}, @@ -202,6 +210,13 @@ open() { // 初始化表单数据 this.initFormData(); + + this.onGenerateCode(); + }, + onGenerateCode() { + generateCode(this.$enums.GENERATE_CODE_TYPE.MEMBER.code).then((res) => { + this.formData.code = res; + }); }, }, }); diff --git a/src/views/base-data/product/brand/add.vue b/src/views/base-data/product/brand/add.vue index 98ead71..f4f3fff 100644 --- a/src/views/base-data/product/brand/add.vue +++ b/src/views/base-data/product/brand/add.vue @@ -16,7 +16,14 @@ :rules="rules" > - + + + 点此生成 + @@ -49,6 +56,7 @@ import { defineComponent } from 'vue'; import { validCode } from '@/utils/validate'; import * as api from '@/api/base-data/product/brand'; + import { generateCode } from '@/api/components'; export default defineComponent({ components: {}, @@ -119,6 +127,13 @@ open() { // 初始化表单数据 this.initFormData(); + + this.onGenerateCode(); + }, + onGenerateCode() { + generateCode(this.$enums.GENERATE_CODE_TYPE.BRAND.code).then((res) => { + this.formData.code = res; + }); }, }, }); diff --git a/src/views/base-data/product/info/add.vue b/src/views/base-data/product/info/add.vue index 88f61e5..c057f37 100644 --- a/src/views/base-data/product/info/add.vue +++ b/src/views/base-data/product/info/add.vue @@ -30,7 +30,14 @@ > - + + + 点此生成 + @@ -313,6 +320,7 @@ import * as propertyApi from '@/api/base-data/product/property'; import { PlusOutlined, DeleteOutlined } from '@ant-design/icons-vue'; import { multiplePageMix } from '@/mixins/multiplePageMix'; + import { generateCode } from '@/api/components'; export default defineComponent({ name: 'AddProduct', @@ -495,6 +503,8 @@ this.formData = {}; this.modelorList = []; + + this.onGenerateCode(); }, // 提交表单事件 async submit() { @@ -679,6 +689,11 @@ }); }); }, + onGenerateCode() { + generateCode(this.$enums.GENERATE_CODE_TYPE.PRODUCT.code).then((res) => { + this.formData.code = res; + }); + }, }, }); diff --git a/src/views/base-data/shop/add.vue b/src/views/base-data/shop/add.vue index a213fed..18a05fc 100644 --- a/src/views/base-data/shop/add.vue +++ b/src/views/base-data/shop/add.vue @@ -16,7 +16,14 @@ :rules="rules" > - + + + 点此生成 + @@ -47,6 +54,7 @@ import LocationMap from '@/components/LocationMap'; import { validCode } from '@/utils/validate'; import * as api from '@/api/base-data/shop'; + import { generateCode } from '@/api/components'; export default defineComponent({ components: { @@ -121,6 +129,13 @@ open() { // 初始化表单数据 this.initFormData(); + + this.onGenerateCode(); + }, + onGenerateCode() { + generateCode(this.$enums.GENERATE_CODE_TYPE.SHOP.code).then((res) => { + this.formData.code = res; + }); }, }, }); diff --git a/src/views/base-data/store-center/add.vue b/src/views/base-data/store-center/add.vue index b0718c6..cdbc59a 100644 --- a/src/views/base-data/store-center/add.vue +++ b/src/views/base-data/store-center/add.vue @@ -12,7 +12,14 @@ - + + + 点此生成 + @@ -73,6 +80,7 @@ import { defineComponent } from 'vue'; import { validCode } from '@/utils/validate'; import * as api from '@/api/base-data/store-center'; + import { generateCode } from '@/api/components'; export default defineComponent({ components: {}, @@ -169,6 +177,13 @@ open() { // 初始化表单数据 this.initFormData(); + + this.onGenerateCode(); + }, + onGenerateCode() { + generateCode(this.$enums.GENERATE_CODE_TYPE.SC.code).then((res) => { + this.formData.code = res; + }); }, }, }); diff --git a/src/views/base-data/supplier/add.vue b/src/views/base-data/supplier/add.vue index bebe3d3..506c886 100644 --- a/src/views/base-data/supplier/add.vue +++ b/src/views/base-data/supplier/add.vue @@ -12,7 +12,14 @@ - + + + 点此生成 + @@ -152,6 +159,7 @@ import { defineComponent } from 'vue'; import { validCode, isEmail } from '@/utils/validate'; import * as api from '@/api/base-data/supplier'; + import { generateCode } from '@/api/components'; export default defineComponent({ components: {}, @@ -278,11 +286,18 @@ open() { // 初始化表单数据 this.initFormData(); + + this.onGenerateCode(); }, // 名称改变 changeName(e) { this.formData.mnemonicCode = this.$utils.getCamelCharsUpperCase(e); }, + onGenerateCode() { + generateCode(this.$enums.GENERATE_CODE_TYPE.SUPPLIER.code).then((res) => { + this.formData.code = res; + }); + }, }, }); diff --git a/src/views/system/dept/add.vue b/src/views/system/dept/add.vue index ae83de5..6fcc280 100644 --- a/src/views/system/dept/add.vue +++ b/src/views/system/dept/add.vue @@ -17,7 +17,14 @@ :rules="rules" > - + + + 点此生成 + @@ -47,6 +54,7 @@ import { defineComponent } from 'vue'; import { validCode } from '@/utils/validate'; import * as api from '@/api/system/dept'; + import { generateCode } from '@/api/components'; export default defineComponent({ components: {}, @@ -120,6 +128,13 @@ open() { // 初始化表单数据 this.initFormData(); + + this.onGenerateCode(); + }, + onGenerateCode() { + generateCode(this.$enums.GENERATE_CODE_TYPE.DEPT.code).then((res) => { + this.formData.code = res; + }); }, }, }); diff --git a/src/views/system/role/add.vue b/src/views/system/role/add.vue index 15b1e6c..6fb93ca 100644 --- a/src/views/system/role/add.vue +++ b/src/views/system/role/add.vue @@ -16,7 +16,14 @@ :rules="rules" > - + + + 点此生成 + @@ -43,6 +50,7 @@ import { defineComponent } from 'vue'; import { validCode } from '@/utils/validate'; import * as api from '@/api/system/role'; + import { generateCode } from '@/api/components'; export default defineComponent({ components: {}, @@ -112,6 +120,13 @@ open() { // 初始化表单数据 this.initFormData(); + + this.onGenerateCode(); + }, + onGenerateCode() { + generateCode(this.$enums.GENERATE_CODE_TYPE.ROLE.code).then((res) => { + this.formData.code = res; + }); }, }, }); diff --git a/src/views/system/user/add.vue b/src/views/system/user/add.vue index c977b78..56f6833 100644 --- a/src/views/system/user/add.vue +++ b/src/views/system/user/add.vue @@ -135,8 +135,6 @@ telephone: '', description: '', }; - - this.onGenerateCode(); }, // 提交表单事件 submit() { @@ -171,6 +169,8 @@ open() { // 初始化表单数据 this.initFormData(); + + this.onGenerateCode(); }, onGenerateCode() { generateCode(this.$enums.GENERATE_CODE_TYPE.USER.code).then((res) => { -- Gitee