From 7e172e752d88bcfb060b33bbd82be925282d189b Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Sat, 11 May 2024 08:23:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0WMS=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/purchaseDetail/index.ts | 12 ++++++++++++ .../purchasereceiptRequestMain.data.ts | 5 +---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/api/wms/purchaseDetail/index.ts b/src/api/wms/purchaseDetail/index.ts index f85c46731..c7237810b 100644 --- a/src/api/wms/purchaseDetail/index.ts +++ b/src/api/wms/purchaseDetail/index.ts @@ -43,6 +43,18 @@ export const getPurchaseDetailPage = async (params) => { } } + +// 查询采购订单子列表 +export const getPurchaseDetailPageWMS = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/purchase-detail/seniorWMS', data }) + } else { + return await request.get({ url: `/wms/purchase-detail/pageWMS`, params }) + } +} + // 校验子表数据 export const getPurchaseDetailPageCheckData = async (params) => { return await request.get({ url: `/wms/purchase-detail/pageCheckData`, params }) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index c3aca280e..9394a547d 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -5,15 +5,12 @@ import * as SupplierApi from '@/api/wms/supplier' import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data' import * as PurchaseMainApi from '@/api/wms/purchaseMain' import * as PurchaseDetailApi from '@/api/wms/purchaseDetail' -import * as PurchasePlanMainApi from '@/api/wms/purchasePlanMain' import * as LocationApi from '@/api/wms/location' import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' -import { PurchasePlanMain } from '../../supplierdeliver/purchasePlanMain/purchasePlanMain.data' import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data' import * as ItemPackageApi from '@/api/wms/itempackage/index' import { PurchaseDetail, PurchaseMain } from '../../supplierdeliver/purchaseMain/purchaseMain.data' import { useUserStore } from '@/store/modules/user' -import { TableColumn } from '@/types/table' const { t } = useI18n() // 国际化 @@ -70,7 +67,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( isConcatDetailSchemas:true,//是否是主子表合并 默认false searchDetailSchemas:PurchaseDetail.allSchemas, searchAllSchemas: PurchaseMain.allSchemas, // 查询弹窗所需类 - searchPage: PurchaseDetailApi.getPurchaseDetailPage, // 查询弹窗所需分页方法 + searchPage: PurchaseDetailApi.getPurchaseDetailPageWMS, // 查询弹窗所需分页方法 searchCondition: [{ key:'status', value:'2',