From b9bc527a0b55cafdd6c9d569083a70aa9af336d6 Mon Sep 17 00:00:00 2001 From: siontion Date: Sun, 4 Feb 2024 13:33:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=BA=93=E5=AD=98=20?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 盘点库存 筛选条件控制 --- .../src/api/heli/equip/index.ts | 79 ++++++++++--------- .../src/api/heli/mouldtype/index.ts | 79 ++++++++++--------- .../src/views/heli/equip/index.vue | 31 +++----- .../src/views/heli/storage/StorageForm.vue | 4 +- .../src/views/heli/storage/StorageOut.vue | 4 +- .../views/heli/storagecheck/checkdetail.vue | 2 +- .../src/views/heli/storagecheck/materials.vue | 10 ++- 7 files changed, 104 insertions(+), 105 deletions(-) diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/equip/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/equip/index.ts index cd96b3ae..6c87f6bc 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/heli/equip/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/equip/index.ts @@ -1,38 +1,41 @@ -import request from '@/config/axios' - -export interface EquipVO { - id: number - name: string - mouldTypeId: number - status: number -} - -// 查询设备信息分页 -export const getEquipPage = async (params) => { - return await request.get({ url: `/heli/equip/page`, params }) -} - -// 查询设备信息详情 -export const getEquip = async (id: number) => { - return await request.get({ url: `/heli/equip/get?id=` + id }) -} - -// 新增设备信息 -export const createEquip = async (data: EquipVO) => { - return await request.post({ url: `/heli/equip/create`, data }) -} - -// 修改设备信息 -export const updateEquip = async (data: EquipVO) => { - return await request.put({ url: `/heli/equip/update`, data }) -} - -// 删除设备信息 -export const deleteEquip = async (id: number) => { - return await request.delete({ url: `/heli/equip/delete?id=` + id }) -} - -// 导出设备信息 Excel -export const exportEquip = async (params) => { - return await request.download({ url: `/heli/equip/export-excel`, params }) -} \ No newline at end of file +import request from '@/config/axios' + +export interface EquipVO { + id: number + name: string + mouldTypeId: number + status: number +} +// 查询设备信息全页数据 +export const getSimpList = async () => { + return await request.get({ url: `/heli/equip/all-simples` }) +} +// 查询设备信息分页 +export const getEquipPage = async (params) => { + return await request.get({ url: `/heli/equip/page`, params }) +} + +// 查询设备信息详情 +export const getEquip = async (id: number) => { + return await request.get({ url: `/heli/equip/get?id=` + id }) +} + +// 新增设备信息 +export const createEquip = async (data: EquipVO) => { + return await request.post({ url: `/heli/equip/create`, data }) +} + +// 修改设备信息 +export const updateEquip = async (data: EquipVO) => { + return await request.put({ url: `/heli/equip/update`, data }) +} + +// 删除设备信息 +export const deleteEquip = async (id: number) => { + return await request.delete({ url: `/heli/equip/delete?id=` + id }) +} + +// 导出设备信息 Excel +export const exportEquip = async (params) => { + return await request.download({ url: `/heli/equip/export-excel`, params }) +} diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/mouldtype/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/mouldtype/index.ts index 7f7bb76d..dd43ee4c 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/heli/mouldtype/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/mouldtype/index.ts @@ -1,37 +1,42 @@ -import request from '@/config/axios' - -export interface MouldTypeVO { - id: number - name: string - status: number -} - -// 查询模具类型分页 -export const getMouldTypePage = async (params) => { - return await request.get({ url: `/heli/mould-type/page`, params }) -} - -// 查询模具类型详情 -export const getMouldType = async (id: number) => { - return await request.get({ url: `/heli/mould-type/get?id=` + id }) -} - -// 新增模具类型 -export const createMouldType = async (data: MouldTypeVO) => { - return await request.post({ url: `/heli/mould-type/create`, data }) -} - -// 修改模具类型 -export const updateMouldType = async (data: MouldTypeVO) => { - return await request.put({ url: `/heli/mould-type/update`, data }) -} - -// 删除模具类型 -export const deleteMouldType = async (id: number) => { - return await request.delete({ url: `/heli/mould-type/delete?id=` + id }) -} - -// 导出模具类型 Excel -export const exportMouldType = async (params) => { - return await request.download({ url: `/heli/mould-type/export-excel`, params }) -} \ No newline at end of file +import request from '@/config/axios' + +export interface MouldTypeVO { + id: number + name: string + status: number +} + +// 查询模具类型全页数据 +export const getSimpList = async () => { + return await request.get({ url: `/heli/mould-type/all-simples` }) +} + +// 查询模具类型分页 +export const getMouldTypePage = async (params) => { + return await request.get({ url: `/heli/mould-type/page`, params }) +} + +// 查询模具类型详情 +export const getMouldType = async (id: number) => { + return await request.get({ url: `/heli/mould-type/get?id=` + id }) +} + +// 新增模具类型 +export const createMouldType = async (data: MouldTypeVO) => { + return await request.post({ url: `/heli/mould-type/create`, data }) +} + +// 修改模具类型 +export const updateMouldType = async (data: MouldTypeVO) => { + return await request.put({ url: `/heli/mould-type/update`, data }) +} + +// 删除模具类型 +export const deleteMouldType = async (id: number) => { + return await request.delete({ url: `/heli/mould-type/delete?id=` + id }) +} + +// 导出模具类型 Excel +export const exportMouldType = async (params) => { + return await request.download({ url: `/heli/mould-type/export-excel`, params }) +} diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/equip/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/equip/index.vue index 01b70468..4fc59c29 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/equip/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/equip/index.vue @@ -8,19 +8,10 @@ :inline="true" label-width="68px" > - - - - + - - - + + + @@ -173,6 +160,7 @@ import download from '@/utils/download' import * as EquipApi from '@/api/heli/equip' import EquipForm from './EquipForm.vue' +import * as MoudleTypeApi from '@api/heli/mouldtype' defineOptions({ name: 'Equip' }) @@ -258,7 +246,8 @@ const handleExport = async () => { } /** 初始化 **/ -onMounted(() => { - getList() +onMounted( async() => { + await MoudleTypeApi.getSimpList() + await getList() }) \ No newline at end of file diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue index ae156611..c3cab636 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue @@ -280,7 +280,7 @@ 存 提 交 - 报 + 作 废 @@ -368,7 +368,7 @@ const handleStatus = async (num) => { return } // 提示用户是否保存入库信息 - await message.confirm('确认'+(num==2?'提交':'报废')+'入库信息?') + await message.confirm('确认'+(num==2?'提交':'作废')+'入库信息?') formData.value.status = num //保存表单数据 diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue index 4bfa35cf..0a6a712b 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue @@ -283,7 +283,7 @@ 存 提 交 - 报 + 作 废 @@ -402,7 +402,7 @@ const handleStatus = async (num) => { } // 提示用户是否保存出库信息 - await message.confirm('确认'+(num==2?'提交':'报废')+'出库信息?') + await message.confirm('确认'+(num==2?'提交':'作废')+'出库信息?') //保存表单数据 await saveFormData() diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue index 1123bd22..f452b6a3 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue @@ -92,7 +92,7 @@ - 新增 + 获取物料 diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/materials.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/materials.vue index 62a87fb0..5de8a9e0 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/materials.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/materials.vue @@ -3,17 +3,17 @@ - + - + - + 搜索 - + 重置 @@ -51,6 +51,7 @@ import * as StorageLogApi from '@/api/heli/storagelog' //:selectable="row=>row.disabled || chkboxEnable" const chkboxEnable = ref(true) +const queryEnable = ref(true) const { t } = useI18n() // 国际化 const message = useMessage() // 消息弹窗 @@ -107,6 +108,7 @@ const open = async (noZero: number, whId?: number, isAll?: number) => { list.value = data // total.value = data.total chkboxEnable.value = isAll === 2 ? false : true + //queryEnable.value = isAll === 2?true:false var iNum = 1 list.value.forEach((row) => {