diff --git a/src/api/wms/package/index.ts b/src/api/wms/package/index.ts index fdb147004..9de36a25a 100644 --- a/src/api/wms/package/index.ts +++ b/src/api/wms/package/index.ts @@ -77,8 +77,13 @@ export const deletePackage = async (id: number) => { // 导出包装 Excel export const exportPackage = async (params) => { - return await request.download({ url: `/wms/package/export-excel`, params }) -} + if (params.isSearch) { + const data = {...params} + return await request.download({ url: `/wms/package/export-excel-senior`, data }) + } else { + return await request.download({ url: `/wms/package/export-excel`, params }) + } + } // 下载用户导入模板 export const importTemplate = () => { diff --git a/src/components/ImportForm/src/ImportForm.vue b/src/components/ImportForm/src/ImportForm.vue index 362fe8d0a..d911a51be 100644 --- a/src/components/ImportForm/src/ImportForm.vue +++ b/src/components/ImportForm/src/ImportForm.vue @@ -223,7 +223,7 @@ const submitFormSuccess = (response: any) => { // console.log(172, import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/' + response.data.errorFile) // console.log(172, import.meta.env.VITE_BASE_URL + '/admin-api/opt/profile/' + response.data.errorFile) window.open( - import.meta.env.VITE_BASE_URL + '/admin-api/profile/' + response.data.errorFile, + import.meta.env.VITE_BASE_URL + '/admin-api' + response.data.errorFile, '222' ) // downloadElement.setAttribute('href', import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + response.data.errorFile ) diff --git a/src/views/system/tenant/TenantForm.vue b/src/views/system/tenant/TenantForm.vue index a6085363f..fb238561d 100644 --- a/src/views/system/tenant/TenantForm.vue +++ b/src/views/system/tenant/TenantForm.vue @@ -26,8 +26,8 @@ - - + + @@ -175,4 +176,13 @@ const resetForm = () => { } formRef.value?.resetFields() } + +/**只能选取当前日期以后的日期 */ +const disabledDate =(time) => { + if (time.getTime() < Date.now()) { + return true; + } else { + return false; + } +} diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue index f802f472b..d1759be6f 100644 --- a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue @@ -218,7 +218,7 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await PackageApi.exportPackage(setSearchParams) + const data = await PackageApi.exportPackage(tableObject.params) download.excel(data, '包装.xlsx') } catch { } finally {