diff --git a/src/api/wms/purchasereceiptRecordDetail/index.ts b/src/api/wms/purchasereceiptRecordDetail/index.ts index 2b97df643..b326094dc 100644 --- a/src/api/wms/purchasereceiptRecordDetail/index.ts +++ b/src/api/wms/purchasereceiptRecordDetail/index.ts @@ -90,4 +90,14 @@ export const exportPurchasereceiptRecordDetail = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/purchasereceipt-record-detail/get-import-template' }) +} +// 缺货明细 +export const getScarceGoodsDetailPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/purchaseshortage-detail/senior', data }) + } else { + return await request.get({ url: `/wms/purchaseshortage-detail/page`, params }) + } } \ No newline at end of file diff --git a/src/api/wms/purchasereceiptRequestDetail/index.ts b/src/api/wms/purchasereceiptRequestDetail/index.ts index ab8f7d936..20f40f658 100644 --- a/src/api/wms/purchasereceiptRequestDetail/index.ts +++ b/src/api/wms/purchasereceiptRequestDetail/index.ts @@ -65,16 +65,7 @@ export const deletePurchasereceiptRequestDetail = async (id: number) => { return await request.delete({ url: `/wms/purchasereceipt-request-detail/delete?id=` + id }) } -// 缺货明细 -export const getScarceGoodsDetailPage = async (params) => { - if (params.isSearch) { - delete params.isSearch - const data = {...params} - return await request.post({ url: '/wms/purchaseshortage-detail/senior', data }) - } else { - return await request.get({ url: `/wms/purchaseshortage-detail/page`, params }) - } -} + // 导出采购收货申请子 Excel export const exportPurchasereceiptRequestDetail = async (params) => { diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue index add12c4f8..3e941c55b 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue @@ -54,9 +54,11 @@ ref="detailRef" :isBasic="false" :allSchemas="PurchasereceiptRecordMain.allSchemas" - :detailAllSchemas="PurchasereceiptRecordDetail.allSchemas" + :detailAllSchemas="detailAllSchemas" :detailAllSchemasRules="PurchasereceiptRecordDetailRules" - :apiPage="PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage" + :apiPage="apiPage" + :tabs="PurchasereceiptRequestTabsList" + @changeTabs="changeTabs" /> @@ -66,10 +68,13 @@ import { PurchasereceiptRecordMain,PurchasereceiptRecordMainRules,Purchasereceip import * as PurchasereceiptRecordMainApi from '@/api/wms/purchasereceiptRecordMain' import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' +import { PurchasereceiptRequestTabsList } from '@/utils/disposition/tabsList' // 采购收货记录主 defineOptions({ name: 'PurchasereceiptRecordMain' }) +const apiPage = ref(PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage) + const message = useMessage() // 消息弹窗 const { t } = useI18n() // 国际化 @@ -77,6 +82,7 @@ const route = useRoute() // 路由信息 const routeName = ref() routeName.value = route.name const tableColumns = ref(PurchasereceiptRecordMain.allSchemas.tableColumns) +const detailAllSchemas = ref(PurchasereceiptRecordDetail.allSchemas) // 字段设置 更新主列表字段 const updataTableColumns = (val) => { @@ -154,6 +160,17 @@ const searchFormClick = (searchData) => { } getList() // 刷新当前列表 } +// tabs 切换事件 +const changeTabs = (data) =>{ + if(data.prop == 'receiptDetail'){ + console.log(data) + apiPage.value = PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage + detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas + }else if(data.prop == 'scarceGoodsDetail'){ + apiPage.value = PurchasereceiptRecordDetailApi.getScarceGoodsDetailPage + detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas + } +} /** 初始化 **/ onMounted(async () => { diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index 114061bd4..f4707ada7 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -68,9 +68,7 @@ :apiPage="apiPage" :apiDelete="PurchasereceiptRequestDetailApi.deletePurchasereceiptRequestDetail" :Echo="Echo" - :tabs="PurchasereceiptRequestTabsList" @searchTableSuccessDetail="searchTableSuccessDetail" - @changeTabs="changeTabs" /> @@ -83,7 +81,6 @@ import { PurchasereceiptRequestMain,PurchasereceiptRequestMainRules,Purchaserece import * as PurchasereceiptRequestMainApi from '@/api/wms/purchasereceiptRequestMain' import * as PurchasereceiptRequestDetailApi from '@/api/wms/purchasereceiptRequestDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' -import { PurchasereceiptRequestTabsList } from '@/utils/disposition/tabsList' // 采购收货申请 defineOptions({ name: 'PurchasereceiptRequestMain' }) @@ -368,15 +365,15 @@ const searchFormClick = (searchData) => { } // tabs 切换事件 -const changeTabs = (data) =>{ - if(data.prop == 'receiptDetail'){ - apiPage.value = PurchasereceiptRequestDetailApi.getPurchasereceiptRequestDetailPage - detailAllSchemas.value = PurchasereceiptRequestDetail.allSchemas - }else if(data.prop == 'scarceGoodsDetail'){ - apiPage.value = PurchasereceiptRequestDetailApi.getScarceGoodsDetailPage - detailAllSchemas.value = PurchasereceiptRequestDetail.allSchemas - } -} +// const changeTabs = (data) =>{ +// if(data.prop == 'receiptDetail'){ +// apiPage.value = PurchasereceiptRequestDetailApi.getPurchasereceiptRequestDetailPage +// detailAllSchemas.value = PurchasereceiptRequestDetail.allSchemas +// }else if(data.prop == 'scarceGoodsDetail'){ +// apiPage.value = PurchasereceiptRequestDetailApi.getScarceGoodsDetailPage +// detailAllSchemas.value = PurchasereceiptRequestDetail.allSchemas +// } +// } /** 初始化 **/ onMounted(async () => {