From 2c519389d39acee23435678df7ba4b576c086895 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Sun, 7 Apr 2024 10:57:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E9=A2=86=E7=94=A8=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/unplannedissueRecordMain/index.ts | 25 +++++++++++++++++++ .../sparepartsrequisitionJobMain/index.vue | 2 +- .../sparepartsrequisitionRecordMain/index.vue | 4 +-- .../index.vue | 2 +- 4 files changed, 29 insertions(+), 4 deletions(-) diff --git a/src/api/wms/unplannedissueRecordMain/index.ts b/src/api/wms/unplannedissueRecordMain/index.ts index 41c4cac1b..772b38813 100644 --- a/src/api/wms/unplannedissueRecordMain/index.ts +++ b/src/api/wms/unplannedissueRecordMain/index.ts @@ -29,8 +29,33 @@ export const getUnplannedissueRecordMainPage = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} + const dataTypeCondition = { + 'column':'dataType', + 'action':'==', + 'value':'1' + } + data.filters.push(dataTypeCondition) return await request.post({ url: '/wms/unplannedissue-record-main/senior', data }) } else { + params.dataType='1' + return await request.get({ url: `/wms/unplannedissue-record-main/page`, params }) + } +} + +// 查询计划外出库记录主列表 +export const getUnplannedissueRecordMainPageSpare = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + const dataTypeCondition = { + 'column':'dataType', + 'action':'==', + 'value':'2' + } + data.filters.push(dataTypeCondition) + return await request.post({ url: '/wms/unplannedissue-record-main/senior', data }) + } else { + params.dataType='2' return await request.get({ url: `/wms/unplannedissue-record-main/page`, params }) } } diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue index 582c86a2e..3d5419c2d 100644 --- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue @@ -73,7 +73,7 @@ import * as UnplannedissueJobDetailApi from '@/api/wms/unplannedissueJobDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' // 计划外出库任务主 -defineOptions({ name: 'UnplannedissueJobMain' }) +defineOptions({ name: 'UnplannedissueJobMainSpare' }) const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue index d07d2ec17..215d8c4df 100644 --- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue @@ -68,7 +68,7 @@ import * as UnplannedissueRecordDetailApi from '@/api/wms/unplannedissueRecordDe import * as defaultButtons from '@/utils/disposition/defaultButtons' import { CACHE_KEY, useCache } from '@/hooks/web/useCache' // 计划外出库记录主 -defineOptions({ name: 'UnplannedissueRecordMain' }) +defineOptions({ name: 'UnplannedissueRecordMainSpare' }) const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 @@ -84,7 +84,7 @@ const updataTableColumns = (val) => { } const { tableObject, tableMethods } = useTable({ - getListApi: UnplannedissueRecordMainApi.getUnplannedissueRecordMainPage // 分页接口 + getListApi: UnplannedissueRecordMainApi.getUnplannedissueRecordMainPageSpare // 备件领用分页接口 }) // 获得表格的各种操作 diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue index 21e0599a3..6e9b150e5 100644 --- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue @@ -88,7 +88,7 @@ import * as UnplannedissueRequestDetailApi from '@/api/wms/unplannedissueRequest import * as defaultButtons from '@/utils/disposition/defaultButtons' // 计划外出库申请 -defineOptions({ name: 'UnplannedissueRequestMain' }) +defineOptions({ name: 'UnplannedissueRequestMainSpare' }) const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化