diff --git a/src/api/eam/device/deviceAccounts/index.ts b/src/api/eam/device/deviceAccounts/index.ts index 5ecc4ac..e8fad04 100644 --- a/src/api/eam/device/deviceAccounts/index.ts +++ b/src/api/eam/device/deviceAccounts/index.ts @@ -51,7 +51,12 @@ export const deleteDeviceAccounts = async (id: number) => { // 导出设备台账 Excel export const exportDeviceAccounts = async (params) => { - return await request.download({ url: `/eam/device-accounts/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/eam/device-accounts/export-excel-senior`, data }) + } else { + return await request.download({ url: `/eam/device-accounts/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/views/eam/item/itemApplyMain/index.vue b/src/views/eam/item/itemApplyMain/index.vue index f061583..4264015 100644 --- a/src/views/eam/item/itemApplyMain/index.vue +++ b/src/views/eam/item/itemApplyMain/index.vue @@ -304,7 +304,7 @@ if (item.qty > item.availableQty) { console.log("item.qty",item.qty); console.log("item.availableQty",item.availableQty); - message.error('备件编号' + item.itemNumber + '要货计划数量不得大于订单可申请库存数量') + message.error('备件编号' + item.itemNumber + '申领数量不得大于订单可申请库存数量') return false; } } diff --git a/src/views/eam/item/itemInLocation/index.vue b/src/views/eam/item/itemInLocation/index.vue index e4681fa..fa73a0e 100644 --- a/src/views/eam/item/itemInLocation/index.vue +++ b/src/views/eam/item/itemInLocation/index.vue @@ -35,7 +35,7 @@ - @@ -45,7 +45,7 @@ import * as ItemInLocationApi from '@/api/eam/item/itemInLocation' import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' - import ImportForm from '@/components/ImportForm/src/ImportForm.vue' + import SYMonthImportForm from "@/components/ImportForm/src/SYMonthImportForm.vue"; import Detail from '@/components/Detail/src/Detail.vue' defineOptions({ name: 'ItemInLocation' }) @@ -86,6 +86,7 @@ defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 + defaultButtons.defaultImportBtn(null), // 导入 // { // label: '自定义扩展按钮', // name: 'zdy', @@ -200,7 +201,7 @@ // 导入附件弹窗所需的参数 const importTemplateData = reactive({ templateUrl: '', - templateTitle: '备件入库记录导入模版.xlsx' + templateTitle: '备件归还导入模板.xlsx' }) // 导入成功之后 const importSuccess = () => { diff --git a/src/views/eam/item/itemInLocation/itemInLocation.data.ts b/src/views/eam/item/itemInLocation/itemInLocation.data.ts index 231989c..d4b8f86 100644 --- a/src/views/eam/item/itemInLocation/itemInLocation.data.ts +++ b/src/views/eam/item/itemInLocation/itemInLocation.data.ts @@ -95,12 +95,12 @@ export const ItemInLocation = useCrudSchemas(reactive([ }, isForm: false }, - { - label: '操作', - field: 'action', - isForm: false, - table: { - fixed: 'right' - } - } + // { + // label: '操作', + // field: 'action', + // isForm: false, + // table: { + // fixed: 'right' + // } + // } ]))