From 8a31b638fc83125af0781f6ecf0a05f6f90e0e9d Mon Sep 17 00:00:00 2001 From: chenfang Date: Wed, 22 May 2024 17:31:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=88=B6=E5=A4=87=E4=BB=B6=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/customeritem/index.ts | 11 ++ src/api/wms/deliverPlanMain/index.ts | 13 ++ src/api/wms/deliverRequestMain/index.ts | 13 ++ .../deliver/deliverJobMain/index.vue | 29 ++++- .../deliver/deliverRecordMain/index.vue | 28 ++++- .../deliverRequestMain.data.ts | 22 +--- .../deliver/deliverRequestMain/index.vue | 113 +++++++++--------- .../deliverPlanMain/deliverPlanMain.data.ts | 22 +--- .../deliverplan/deliverPlanMain/index.vue | 60 ++++++++-- 9 files changed, 199 insertions(+), 112 deletions(-) diff --git a/src/api/wms/customeritem/index.ts b/src/api/wms/customeritem/index.ts index d4b636c5b..c4c27e8a7 100644 --- a/src/api/wms/customeritem/index.ts +++ b/src/api/wms/customeritem/index.ts @@ -61,4 +61,15 @@ export const exportCustomeritem = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/customeritem/get-import-template' }) +} + +// 获得业务类型筛选出的物料分页 +export const getPageBusinessTypeToItemCode = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return request.post({ url: '/wms/customeritem/pageBusinessTypeToLocationSenior', data }) + } else { + return await request.get({ url: `/wms/customeritem/pageBusinessTypeToItemCode`, params }) + } } \ No newline at end of file diff --git a/src/api/wms/deliverPlanMain/index.ts b/src/api/wms/deliverPlanMain/index.ts index 46277041e..83363172a 100644 --- a/src/api/wms/deliverPlanMain/index.ts +++ b/src/api/wms/deliverPlanMain/index.ts @@ -49,6 +49,19 @@ export const deleteDeliverPlanMain = async (id: number) => { // 导出发货计划主 Excel export const exportDeliverPlanMain = async (params) => { + params.businessType = 'Deliver' + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/deliver-plan-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/deliver-plan-main/export-excel`, params }) + } +} + +// 导出发货计划主 Excela +export const exportZZBJDeliverPlanMain = async (params) => { + params.businessType = 'ZZBJDeliver' if (params.isSearch) { delete params.isSearch const data = {...params} diff --git a/src/api/wms/deliverRequestMain/index.ts b/src/api/wms/deliverRequestMain/index.ts index 03f544ed9..714df74e3 100644 --- a/src/api/wms/deliverRequestMain/index.ts +++ b/src/api/wms/deliverRequestMain/index.ts @@ -65,6 +65,19 @@ export const deleteDeliverRequestMain = async (id: number) => { // 导出发货申请主 Excel export const exportDeliverRequestMain = async (params) => { + params.businessType = 'Deliver' + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/deliver-request-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/deliver-request-main/export-excel`, params }) + } +} + +// 导出发货申请主 Excel +export const exportZZBJDeliverRequestMain = async (params) => { + params.businessType = 'ZZBJDeliver' if (params.isSearch) { delete params.isSearch const data = {...params} diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue index 304c98e19..40fa6a1ba 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue @@ -82,8 +82,33 @@ const { t } = useI18n() // 国际化 const route = useRoute() // 路由信息 const routeName = ref() routeName.value = route.name +const businessType = ref() +const importFileName = ref() +console.log(99 , routeName.value) const tableColumns = ref([...DeliverJobMain.allSchemas.tableColumns,...DeliverJobDetail.allSchemas.tableMainColumns]) +const { tableObject, tableMethods } = useTable({ + getListApi: DeliverJobDetailApi.getDeliverJobDetailPage // 分页接口 +}) + +// 判断 路由名称 进行条件过滤 +/** + * OktoholdRequestMain 合格转隔离 + */ + if ( routeName.value == 'DeliverJobMain') { + tableObject.params = { + businessType: 'Deliver' + } + businessType.value = 'Deliver' + importFileName.value = '成品发货任务' +} else if ( routeName.value == 'ZZBJDeliverJobMain') { + tableObject.params = { + businessType: 'ZZBJDeliver' + } + businessType.value = 'ZZBJDeliver' + importFileName.value = '自制备件发货任务' +} + // 字段设置 更新主列表字段 const updataTableColumns = (val) => { tableColumns.value = val @@ -128,10 +153,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom'] const Echo = [] -const { tableObject, tableMethods } = useTable({ - getListApi: DeliverJobDetailApi.getDeliverJobDetailPage // 分页接口 -}) - // 获得表格的各种操作 const { getList, setSearchParams } = tableMethods diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue index ef6bf3ea3..5af1128a4 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue @@ -78,16 +78,38 @@ const { t } = useI18n() // 国际化 const route = useRoute() // 路由信息 const routeName = ref() routeName.value = route.name +const businessType = ref() +const importFileName = ref() +console.log(99 , routeName.value) const tableColumns = ref([...DeliverRecordMain.allSchemas.tableColumns,...DeliverRecordDetail.allSchemas.tableMainColumns]) +const { tableObject, tableMethods } = useTable({ + getListApi: DeliverRecordDetailApi.getDeliverRecordDetailPage // 分页接口 +}) + +// 判断 路由名称 进行条件过滤 +/** + * OktoholdRequestMain 合格转隔离 + */ + if ( routeName.value == 'DeliverRecordMain') { + tableObject.params = { + businessType: 'Deliver' + } + businessType.value = 'Deliver' + importFileName.value = '成品发货记录' +} else if ( routeName.value == 'ZZBJDeliverRecordMain') { + tableObject.params = { + businessType: 'ZZBJDeliver' + } + businessType.value = 'ZZBJDeliver' + importFileName.value = '自制备件发货记录' +} + // 字段设置 更新主列表字段 const updataTableColumns = (val) => { tableColumns.value = val } -const { tableObject, tableMethods } = useTable({ - getListApi: DeliverRecordDetailApi.getDeliverRecordDetailPage // 分页接口 -}) // 获得表格的各种操作 const { getList, setSearchParams } = tableMethods diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index 54715ea57..7e4d7b243 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -698,16 +698,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ searchField: 'itemCode', searchTitle: '客户物料基础信息', searchAllSchemas: Customeritem.allSchemas, - searchPage: CustomerItemApi.getCustomeritemPage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - },{ - key: 'customerCode', - value: 'customerCode', - isMainValue: true - }] + searchPage: CustomerItemApi.getPageBusinessTypeToItemCode, }, form: { componentProps: { @@ -716,16 +707,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ searchField: 'itemCode', searchTitle: '客户物料基础信息', searchAllSchemas: Customeritem.allSchemas, - searchPage: CustomerItemApi.getCustomeritemPage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - },{ - key: 'customerCode', - value: 'customerCode', - isMainValue: true - }] + searchPage: CustomerItemApi.getPageBusinessTypeToItemCode, } } }, diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index ddf3d1998..7562032b5 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -84,7 +84,7 @@ + @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :extend= "businessType"/>