From b89cb56a878534f7c41cd2ad501a404af529d1a8 Mon Sep 17 00:00:00 2001 From: yejiaxing <591141169@qq.com> Date: Mon, 5 Feb 2024 09:07:02 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eam/item/applicationRecordDetail/index.ts | 40 +-- .../eam/item/applicationRecordMain/index.ts | 14 +- src/api/eam/item/countadjustWork/index.ts | 51 ++++ ....data.ts => applicationRecordMain.data.ts} | 8 +- .../eam/item/applicationRecord/index.vue | 53 ++-- .../countadjustWork/countadjustWork.data.ts | 52 ++++ src/views/eam/item/countadjustWork/index.vue | 244 ++++++++++++++++++ src/views/eam/item/itemApplyMain/index.vue | 2 +- src/views/eam/item/itemOrderMain/index.vue | 2 +- .../item/itemOrderMain/itemOrderMain.data.ts | 13 +- 10 files changed, 410 insertions(+), 69 deletions(-) create mode 100644 src/api/eam/item/countadjustWork/index.ts rename src/views/eam/item/applicationRecord/{itemApplyMain.data.ts => applicationRecordMain.data.ts} (95%) create mode 100644 src/views/eam/item/countadjustWork/countadjustWork.data.ts create mode 100644 src/views/eam/item/countadjustWork/index.vue diff --git a/src/api/eam/item/applicationRecordDetail/index.ts b/src/api/eam/item/applicationRecordDetail/index.ts index 0e5a01c..7d1ed1a 100644 --- a/src/api/eam/item/applicationRecordDetail/index.ts +++ b/src/api/eam/item/applicationRecordDetail/index.ts @@ -1,25 +1,25 @@ import request from '@/config/axios' export interface ItemApplyDetailVO { - number: string - name: string - type: string - applyId: number - applyDeptId: number - approveId: number - approveTime: Date - outId: number - outTime: Date - siteId: string - available: string - concurrencyStamp: number + number : string + name : string + type : string + applyId : number + applyDeptId : number + approveId : number + approveTime : Date + outId : number + outTime : Date + siteId : string + available : string + concurrencyStamp : number } // 查询备件申领记录主列表 -export const getItemApplyDetailPage = async (params) => { +export const getApplicationRecordDetailPage = async (params) => { if (params.isSearch) { delete params.isSearch - const data = {...params} + const data = { ...params } return await request.post({ url: '/eam/item-apply-detail/senior', data }) } else { return await request.get({ url: `/eam/item-apply-detail/page`, params }) @@ -27,31 +27,31 @@ export const getItemApplyDetailPage = async (params) => { } // 查询备件申领记录主详情 -export const getItemApplyDetail = async (id: number) => { +export const getApplicationRecordDetail = async (id : number) => { return await request.get({ url: `/eam/item-apply-detail/get?id=` + id }) } // 新增备件申领记录主 -export const createItemApplyDetail = async (data: ItemApplyDetailVO) => { +export const createApplicationRecordDetail = async (data : ItemApplyDetailVO) => { return await request.post({ url: `/eam/item-apply-detail/create`, data }) } // 修改备件申领记录主 -export const updateItemApplyDetail = async (data: ItemApplyDetailVO) => { +export const updateApplicationRecordDetail = async (data : ItemApplyDetailVO) => { return await request.put({ url: `/eam/item-apply-detail/update`, data }) } // 删除备件申领记录主 -export const deleteItemApplyDetail = async (id: number) => { +export const deleteApplicationRecordDetail = async (id : number) => { return await request.delete({ url: `/eam/item-apply-detail/delete?id=` + id }) } // 导出备件申领记录主 Excel -export const exportItemApplyDetail = async (params) => { +export const exportApplicationRecordDetail = async (params) => { return await request.download({ url: `/eam/item-apply-detail/export-excel`, params }) } // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/eam/item-apply-detail/get-import-template' }) -} +} \ No newline at end of file diff --git a/src/api/eam/item/applicationRecordMain/index.ts b/src/api/eam/item/applicationRecordMain/index.ts index fd0e19e..aba5ca4 100644 --- a/src/api/eam/item/applicationRecordMain/index.ts +++ b/src/api/eam/item/applicationRecordMain/index.ts @@ -16,7 +16,7 @@ export interface ItemApplyMainVO { } // 查询备件申领记录主列表 -export const getItemApplyMainPage = async (params) => { +export const getApplicationRecordMainPage = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} @@ -27,31 +27,31 @@ export const getItemApplyMainPage = async (params) => { } // 查询备件申领记录主详情 -export const getItemApplyMain = async (id: number) => { +export const getApplicationRecordMain = async (id: number) => { return await request.get({ url: `/eam/item-apply-main/get?id=` + id }) } // 新增备件申领记录主 -export const createItemApplyMain = async (data: ItemApplyMainVO) => { +export const createApplicationRecordMain = async (data: ItemApplyMainVO) => { return await request.post({ url: `/eam/item-apply-main/create`, data }) } // 修改备件申领记录主 -export const updateItemApplyMain = async (data: ItemApplyMainVO) => { +export const updateApplicationRecordMain = async (data: ItemApplyMainVO) => { return await request.put({ url: `/eam/item-apply-main/update`, data }) } // 删除备件申领记录主 -export const deleteItemApplyMain = async (id: number) => { +export const deleteApplicationRecordMain = async (id: number) => { return await request.delete({ url: `/eam/item-apply-main/delete?id=` + id }) } // 导出备件申领记录主 Excel -export const exportItemApplyMain = async (params) => { +export const exportApplicationRecordMain = async (params) => { return await request.download({ url: `/eam/item-apply-main/export-excel`, params }) } // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/eam/item-apply-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/eam/item/countadjustWork/index.ts b/src/api/eam/item/countadjustWork/index.ts new file mode 100644 index 0000000..003a203 --- /dev/null +++ b/src/api/eam/item/countadjustWork/index.ts @@ -0,0 +1,51 @@ +import request from '@/config/axios' + +export interface CountadjustPlanVO { + id : number + number : string + name : string + classification : string + isInAccount : string + status : string +} + +// 查询备件盘点计划列表 +export const getCountadjustWorkPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = { ...params } + return await request.post({ url: '/eam/countadjust-plan/senior', data }) + } else { + return await request.get({ url: `/eam/countadjust-plan/page`, params }) + } +} + +// 查询备件盘点计划详情 +export const getCountadjustWork = async (id : number) => { + return await request.get({ url: `/eam/countadjust-plan/get?id=` + id }) +} + +// 新增备件盘点计划 +export const createCountadjustWork = async (data : CountadjustPlanVO) => { + return await request.post({ url: `/eam/countadjust-plan/create`, data }) +} + +// 修改备件盘点计划 +export const updateCountadjustWork = async (data : CountadjustPlanVO) => { + return await request.put({ url: `/eam/countadjust-plan/update`, data }) +} + +// 删除备件盘点计划 +export const deleteCountadjustWork = async (id : number) => { + return await request.delete({ url: `/eam/countadjust-plan/delete?id=` + id }) +} + +// 导出备件盘点计划 Excel +export const exportCountadjustWork = async (params) => { + return await request.download({ url: `/eam/countadjust-plan/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/countadjust-plan/get-import-template' }) +} \ No newline at end of file diff --git a/src/views/eam/item/applicationRecord/itemApplyMain.data.ts b/src/views/eam/item/applicationRecord/applicationRecordMain.data.ts similarity index 95% rename from src/views/eam/item/applicationRecord/itemApplyMain.data.ts rename to src/views/eam/item/applicationRecord/applicationRecordMain.data.ts index 5a49b10..77ded41 100644 --- a/src/views/eam/item/applicationRecord/itemApplyMain.data.ts +++ b/src/views/eam/item/applicationRecord/applicationRecordMain.data.ts @@ -8,7 +8,7 @@ const { t } = useI18n() // 国际化 /** * @returns {Array} 备件申请主表 */ -export const ItemApplyMain = useCrudSchemas(reactive([ +export const ApplicationRecordMain = useCrudSchemas(reactive([ { label: '领用编号', field: 'number', @@ -84,7 +84,7 @@ export const ItemApplyMain = useCrudSchemas(reactive([ ])) //表单校验 -export const ItemApplyMainRules = reactive({ +export const ApplicationRecordMainRules = reactive({ name: [ { required: true, message: '请填写描述', trigger: 'change' } ], @@ -99,7 +99,7 @@ export const ItemApplyMainRules = reactive({ /** * @returns {Array} 备件申请子表 */ -export const ItemApplyDetail = useCrudSchemas(reactive([ +export const ApplicationRecordDetail = useCrudSchemas(reactive([ { label: '备件编号', field: 'itemNumber', @@ -216,7 +216,7 @@ export const ItemApplyDetail = useCrudSchemas(reactive([ ])) //表单校验 -export const ItemApplyDetailRules = reactive({ +export const ApplicationRecordDetailRules = reactive({ lineNumber: [ { required: true, message: '请输入行号', trigger: 'blur' }, { max: 50, message: '不得超过50个字符', trigger: 'blur' } diff --git a/src/views/eam/item/applicationRecord/index.vue b/src/views/eam/item/applicationRecord/index.vue index 8a9a020..10eede7 100644 --- a/src/views/eam/item/applicationRecord/index.vue +++ b/src/views/eam/item/applicationRecord/index.vue @@ -1,13 +1,14 @@