diff --git a/src/api/wms/productputawayRecordMain/index.ts b/src/api/wms/productputawayRecordMain/index.ts index f411cfb30..f9a39d09e 100644 --- a/src/api/wms/productputawayRecordMain/index.ts +++ b/src/api/wms/productputawayRecordMain/index.ts @@ -74,12 +74,12 @@ export const deleteProductputawayRecordMain = async (id: number) => { // 导出制品上架记录主 Excel export const exportProductputawayRecordMain = async (params) => { - params.type = 'assemble' + if (params.isSearch) { const cmd = { 'column':'type', 'action':'==', - 'value':'assemble' + 'value':params.type } params.filters.push(cmd) delete params.isSearch diff --git a/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue index 7065658c1..996cdbcc8 100644 --- a/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue +++ b/src/views/wms/productionManage/productputaway/productputawayRecordMain/index.vue @@ -158,6 +158,7 @@ const handleExport = async () => { // 发起导出 loadStart() const excelTitle = ref(route.meta.title) + tableObject.params.type = 'predict' const data = await ProductputawayRecordMainApi.exportProductputawayRecordMain(tableObject.params) download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue index 65067e86d..dd499227d 100644 --- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue +++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/index.vue @@ -158,6 +158,7 @@ const handleExport = async () => { // 发起导出 loadStart() const excelTitle = ref(route.meta.title) + tableObject.params.type = 'assemble' const data = await ProductputawayRecordMainApi.exportProductputawayRecordMain(tableObject.params) download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch {