diff --git a/src/api/base-data/address/index.ts b/src/api/base-data/address/index.ts index 652e3a726405f85f3d3622f8cc1bcd894289e0d9..0d2f0f69341ab4f00b64064861792f1d75bde3de 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 b0fb22ea4d835f1e2132f50bf97a5d192b265b81..d3272beca2652fbf56e86279173d3d8c014be312 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 a59d402d5add319236f2227b4ad2c0c7710c2cac..04056e997e8c2a096fa6dedf04e193731b518ca2 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 1c43e848bb0d5c523eb6832f42d7117724026f11..f5068c62ee41fc4c9ea060e62405d53dbcc8482b 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 75b78b539d371410cedfeeb1aee421b02bed9b93..8666459da6352b59fbb1d152075ae8731551f159 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 0000000000000000000000000000000000000000..6a0661a303a4180abe9851363d422d374d266700 --- /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 0000000000000000000000000000000000000000..08ee6d93e63b77b64bdf76c0fd8eeb1310f85b33 --- /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 0000000000000000000000000000000000000000..73d8e2d8553526bbd858fc63354c879ac94ad70b --- /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 0000000000000000000000000000000000000000..58720ce9d7e088c64018c36dd52c510057961e73 --- /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 0000000000000000000000000000000000000000..d283decaed8874f2e4da6285d86efb58f1d0edb4 --- /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 0000000000000000000000000000000000000000..b7bafaa67380e36a135bb93b6537394ade6dab5e --- /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 e798bf7cf799d1d61b870e58100c3209be42ad28..0921b7a8fa31e875c486a0bfe9796dcc5df33e53 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 a56cf35b93be07ab8dcbbeb9cf3301dcf4fc1dbc..be923da7fdcaed84d08bcb08c83d0caccf88d533 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 ca8ad09c99b0104bc9efffde85805da9fad3ae82..46230d208dc42cce431fef0ac094e3391e03cc6f 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 e7cf4b8449d2f6c96aa114a90033e2d38a226097..ecc60793c008832b50aec3aa8a7f06d2df219a8f 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 7fdc2489464cb1b1d746fc3167388c5ebb7593ad..0ecd317352889e973c21826bfd733b29b539bf83 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 fba7a0df24ce07e884a9d243dbbd6565a137b531..33ef3317ec48a30f6ecc91acee4c44dab932fc83 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 fe0f662d1ab921bb2896501283e59c5e6401310d..e92955f504bda8a4ea2c07f08754f5b9d7e7d4a0 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 8571ce2bfc2c15c6211ca599951379530d6935e8..5aec8d75ec8d78fd18b0b71c830a17b3ff57cc3f 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 95d50675595ef8d012e9d68853da50c331fd21dc..aaa5f511585d0eccff122c27f235737244e25b9f 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 38173497f4d50efb9ab20914b4afe41ba38b32d3..b633313a2755c54fdd9df866ff4ea072e5aee44c 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 d97bf4de691708d50133d182426d8e9ef3a2456f..af9a5563e7199adfa14f3e4f11ded1d3f35292e8 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 f3905c5af4786eca7407b5dfbbb1035efa7241fd..1f6a3f02e03dfec2edbc4ca71fff4bcbe04aa581 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 49eca73c3f07689fd423c3e0673b32d2b4847ded..190582eda5b19a331b7f78887ee9c5ff707e1643 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 6de846c1544f78acdd564ae3c8745ad5186a4d59..ce1b181cf2558258a59c5c8e3722696596cd1166 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 60e1e98906338677f6f09978e93169fa2eee21ad..3d6cf9ada377b098d568214985648ee34859d2db 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 ce1d00d75ab23c8a062fca9d234babf3e0e26d44..44b7e1ad6e894a56c91f9ff5dd170b56040af3a5 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 0000000000000000000000000000000000000000..b4a51b1f1f1c8b07f645053e1a8a022835e65b07 --- /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 5484510885da9ff9e1694ec049b10029805380f1..6b597d46f2247ee79b5b80e1293418b4a397849c 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 8563096a43cad8aed4c4a8821c4d26f9628a6667..b173335a234d6b44abf7006bd926bda17ca9fa65 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 ba2aaa40f61c383b471ef583380a2397b1e164f9..b1f3834d867d9da917f0717ada67b30c460e2ade 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 3702d033769e5aefc58441bbba6f1af035b6dee4..ede624caa79c642840cb1ff0fa98fba1944ee06b 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 47610b905a08ca332f1b395578131b3228a05291..641780e5c70d3c5d9fdc52f3c893192a60768235 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 03e4f811ad2ddbab91dab924d533ba134e9cd210..dd4736cd125933319072a63c0969bc3ac1e7ce4f 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 0000000000000000000000000000000000000000..785306bf3544653423d76ab0341c0a2be6dfd556 --- /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/enums/biz/generateCodeType.ts b/src/enums/biz/generateCodeType.ts index 86937658da935243b529eb3d8d78673890e196e9..4dd9597372e64a1fac9371aec72109708ff72140 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/events/constants/pullEvent.js b/src/events/constants/pullEvent.js index 16ea2841e20e9da46f5f5bdebb1e6eca546a4294..2c7608a94ff8bd93c9a79f9e54bd877957e03b1c 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 0000000000000000000000000000000000000000..564b44c7aa7471ddd4d9ca598fb1ea5f1faba352 --- /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 0000000000000000000000000000000000000000..c342a37d84ac802980960bc30e8e6cf2ceb21e0b --- /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 0000000000000000000000000000000000000000..812126914366b4f32f6ba707703de371b9d55df9 --- /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 eaba03f036bac9a46b7247eef307178c9ad31805..660680b72e1ebd4e124f206c5f746a4ebdd1c7a2 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 61e92e3c50d4beff6b5f6f12c04672ded414c6b2..d551884c0f92ae6ea59f64caae173894a5bb2553 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 622b3bb1f143196be6031fd036937801b048ba9d..19a92ae54644dbbf798ad67129f92aca01ef6c78 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 8c0d3d5209eccd610013d41766d8c035aec25dba..464ad302abbf7ea72a84e6fe21ca1599d4d4b9d4 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/base-data/customer/add.vue b/src/views/base-data/customer/add.vue index cf9c6b566912ca187d1b58b4ccd0d6e6488c37aa..35cc37f25aefc154b50735650e155a7bb60aaa70 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 7426808f8d8fa3ad30782cc486de68b9a17d836d..d63bf17e76679125a3b2b73e287801b361baa5a8 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 98ead71fc37224d17d04da566fbb1c135ae6a3c8..f4f3fffff99c52c5ce8966677be291a582c4b01e 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 88f61e5776685f8dde28d64e9ed6e5ebf1c7109c..c057f3782e6b974b240014cfe0dd310f3cb0b446 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 a213feda854b2a3167523d548a6d8a6f36a105bc..18a05fc1983d2c847d9a1cc41feb9a8455ace0f7 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 b0718c6de638f74abf7e41a91bdb0f78e1ba8738..cdbc59a14b0bc0a582c279409e4174c235575d0f 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 bebe3d37c40648565c666afa19beadd5a86b8fb3..506c886e2f0d3dcbfb0af5db15d0080a44aa5cb7 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/customer-settle/check-sheet/index.vue b/src/views/customer-settle/check-sheet/index.vue index 928f82625498f438d9bbf49eb1cff76976ab4a0f..67a17b2dfd68d3fcef6d49beb3d7e6a115014475 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 b8acac28d8cbee7f435ff2072ea83d2bb2c718de..373b77c46ecbf1790da79c15a5ea14517bbeccf8 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 b0aa78a79d6f2fbdbc5258173ccba49c0e068f3c..a16bb6882f5975150dc7a8922b61f920cce73a14 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 6579c465381d434f53682922d6b1b7e14245b928..409a183270685d7880aabec351a37234c936ce2e 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 9a596183e30680f49b26a8e0569391b0df099df9..092c2528386bbbe725d2733480d278be34f4158b 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 f02793388dbb76a1e4cc12ba55033191618ce65c..10effbca8f4766131f37c4a7ca0d71a3e742c1ce 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 94d9be12781d16535a3faccd9ed60746f91b96f3..d18c4b78bf7557b39f6d3e2d161446facc4890af 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 4eea3b352424d9da9f09a6e720058fa6d3c65148..b029347d232c37f6d98842e1e9dbdd8aaed5d466 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 bca126e7e423060a44f8b3be1f1c01b46208bfb1..d13189086efe24f2f0cef95e5e5f46337f4ec120 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 739f8c4efe5e0e6edf6b6b2a25e5ffac02a1e828..f60cc0cea5caa440d7b9baeeaf917ce1b22afcc3 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 e87e06e214d113e8cb5b1b582998de235e65f1cd..7dc3a462fb136ee12f20ca983bf394f69d9635be 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 c581530a4416075cbf3696cf80e4926d045603d2..8c208ffefa0a78677d46ba51e049d2b005c6cbee 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 a2281a9b4536a0b276ed1c95e274bfe602abdf75..a96e95fdb64cf906482b41c4f0a6708bd7210f34 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 80f975bbeff4362d10c2b2daf33f16ecbd3aa1c5..d2066fb69a538a46ea336ffc8eb8d11ab5b4d075 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 28f0b40790877542f7f446586ab69c565f0b1453..95f250869765e5f32b69298bbbae0ef866b0b8c7 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 e67b62dfda78af1c9997f5e7d4c5feccb26e0167..3901ef70c860caa71db42c0ede8b9804a8a2b0f3 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 a2aa4770334d24565b0681d7091f2505465316e5..7533300e9c3149a205e44b512e3b2205c1d0ed8f 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 c3328779954a0f26b8d3371828304d01d422f4b9..9af4d1334bd5e1686da70407efc94307f2df65e1 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 2456f369371104994947a97dc1282cf0cf323618..5397a4687150dd2ed246dc6bbf59fa85e3b72603 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 6b222590fcd52dd251fdf0fe925749f56c8fb038..543007c6b871f1f1e1245f6ae2a4650b1120668f 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 1b23c060358d2fba493c843ab5e7a4a45592d5bf..bc562f8e1db3768ae66bc06157f64a261a12157a 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 79e044a360c837f15b9fb19a03b4406888f9d362..a91582bf01ac550320acdce5481a89f073017b08 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 351909a17bd0d1ab9a4b2ce7be4d20eb9c4a880d..8422ecb327c55e1c28a3b9294db887ea5a2bd38b 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 cb9d903e6c8394644c5338b3e01640b734c9b365..77af2ab968c104cae4678795bff8dadc8f650b67 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 0418b50f46466c4111be7d11963b93fdeb2b4cee..a432ded28c411f20f093f30f54b967c165c424dc 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 f3d36a8aeb30ea63f1226bdde09891fe007672de..88a3cc565541edaf68f289cb1548bc3af99fb875 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 83a56eb24e516221ad0c665feb4d63893f54e68b..273efd8c04dcf18e5a7d6ceb4c0298a114b60529 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 @@ diff --git a/src/views/system/dept/add.vue b/src/views/system/dept/add.vue index ae83de551730fb718e6903f7b6e682ff25ec016e..6fcc2807adbca1b8b1795b06d7e89a6fb70048cf 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 15b1e6c18ec392d2bcbb260f1dd0f5a88d4e3cb0..6fb93ca431a7333729c295a8166f59a2f561e385 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 c977b78fb925b5147cbf55e7789cd992f65eb5a4..56f68338fbf5fe0f9f99d26038f958829a24fb3e 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) => {