diff --git a/src/components/Upload/Excel.vue b/src/components/Upload/Excel.vue index ffc20da..eb7cb1e 100644 --- a/src/components/Upload/Excel.vue +++ b/src/components/Upload/Excel.vue @@ -1,155 +1,165 @@ - - - - - {{ $t('excel.operationNotice') }} - {{ $t('excel.clickUpload') }} - - - - {{ $t('excel.fileFormat') }} - {{ $t('excel.downloadTemplate') }} - - - - - - {{ $t('common.confirmButtonText') }} - {{ $t('common.cancelButtonText') }} - - + + + + + {{ $t("excel.operationNotice") }} + {{ $t("excel.clickUpload") }} + + + + {{ $t("excel.fileFormat") }} + {{ $t("excel.downloadTemplate") }} + + + + + + + {{ $t("common.confirmButtonText") }} + + {{ $t("common.cancelButtonText") }} + + - - - - - - - {{ error }} - - - - + + + + + + + {{ error }} + + + + - - diff --git a/src/hooks/table.ts b/src/hooks/table.ts index cfc9f69..48d9f7c 100644 --- a/src/hooks/table.ts +++ b/src/hooks/table.ts @@ -219,6 +219,7 @@ export function useTable(options?: BasicTableProps) { * @returns 返回一个Promise对象,用于异步处理结果 */ const downBlobFile = (url: string, query: any, fileName: string) => { + ElMessage.info("下载中,请稍后") return other.downBlobFile(url, query, fileName) } diff --git a/src/views/supermarketerp/supermarketSpu/form.vue b/src/views/supermarketerp/supermarketSpu/form.vue index 98bb244..65ad2eb 100644 --- a/src/views/supermarketerp/supermarketSpu/form.vue +++ b/src/views/supermarketerp/supermarketSpu/form.vue @@ -145,7 +145,7 @@ 取消 - 上一步 + 上一步 下一步 确 认 @@ -156,7 +156,6 @@ import { useDict } from "/@/hooks/dict" import { useMessage } from "/@/hooks/message" import { getObj, addObj, putObj, getSupermarketCategory, getSupermarketBrand } from "/@/api/supermarketerp/supermarketSpu" -import { getSupplierTypeSimpleAll } from "/@/api/supermarketerp/smErpSupplierType" import { rule } from "/@/utils/validate" import SupermarketUnit from "./components/supermarketUnit.vue" import supermarketInventory from "./components/supermarketInventory.vue"