Browse Source

修改导出功能,增加高级筛选

master_hella_20240701
TengXF 5 months ago
parent
commit
615a4a373d
  1. 4
      src/api/wms/agvLocationrelation/index.ts
  2. 10
      src/api/wms/barbasic/index.ts
  3. 10
      src/api/wms/barcode/index.ts
  4. 10
      src/api/wms/callmaterials/index.ts
  5. 4
      src/api/wms/customersettleRecordMain/index.ts
  6. 18
      src/api/wms/deliverPlanMain/index.ts
  7. 4
      src/api/wms/deliverRecordMain/index.ts
  8. 6
      src/api/wms/deliverRequestMain/index.ts
  9. 9
      src/api/wms/expectin/index.ts
  10. 9
      src/api/wms/expectout/index.ts
  11. 10
      src/api/wms/locationcapacity/index.ts
  12. 10
      src/api/wms/mesBarCode/index.ts
  13. 4
      src/api/wms/package/index.ts
  14. 10
      src/api/wms/packageunit/index.ts
  15. 9
      src/api/wms/processproductionRecordMain/index.ts
  16. 9
      src/api/wms/processproductionRequestMain/index.ts
  17. 10
      src/api/wms/productionreceiptRecordMain/index.ts
  18. 9
      src/api/wms/productionreturnRecordMain/index.ts
  19. 2
      src/api/wms/productputawayJobDetail/index.ts
  20. 14
      src/api/wms/productputawayRecordDetail/index.ts
  21. 6
      src/api/wms/productputawayRecordMain/index.ts
  22. 14
      src/api/wms/productputawayRequestMain/index.ts
  23. 8
      src/api/wms/productreceiptJobMain/index.ts
  24. 8
      src/api/wms/productreceiptRecordMain/index.ts
  25. 9
      src/api/wms/productredressRecordMain/index.ts
  26. 9
      src/api/wms/productredressRequestMain/index.ts
  27. 4
      src/api/wms/productrepairRecordMain/index.ts
  28. 8
      src/api/wms/productrepairRequestMain/index.ts
  29. 2
      src/api/wms/productscrapRequestMain/index.ts
  30. 7
      src/api/wms/qadproductionplan/index.ts
  31. 9
      src/api/wms/repleinshRecordMain/index.ts
  32. 10
      src/api/wms/saleMain/index.ts
  33. 10
      src/api/wms/saleShipmentMain/index.ts
  34. 10
      src/api/wms/saleShipmentMainRecord/index.ts
  35. 4
      src/api/wms/transaction/index.ts
  36. 4
      src/api/wms/transferlog/index.ts
  37. 6
      src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue
  38. 6
      src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue

4
src/api/wms/agvLocationrelation/index.ts

@ -47,7 +47,7 @@ export const exportAgvLocationrelation = async (params) => {
if (params.isSearch) { if (params.isSearch) {
delete params.isSearch delete params.isSearch
const data = {...params} const data = {...params}
return await request.post({ url: '/wms/agv-locationrelation/export-excel-senior', data }) return await request.downloadPost({ url: '/wms/agv-locationrelation/export-excel-senior', data })
} else { } else {
return await request.download({ url: `/wms/agv-locationrelation/export-excel`, params }) return await request.download({ url: `/wms/agv-locationrelation/export-excel`, params })
} }
@ -56,4 +56,4 @@ export const exportAgvLocationrelation = async (params) => {
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/wms/agv-locationrelation/get-import-template' }) return request.download({ url: '/wms/agv-locationrelation/get-import-template' })
} }

10
src/api/wms/barbasic/index.ts

@ -47,10 +47,16 @@ export const deleteBarbasic = async (id: number) => {
// 导出条码实体基类 Excel // 导出条码实体基类 Excel
export const exportBarbasic = async (params) => { export const exportBarbasic = async (params) => {
return await request.download({ url: `/wms/barbasic/export-excel`, params }) if (params.isSearch) {
delete params.isSearch
const data = {...params}
return await request.downloadPost({ url: '/wms/barbasic/export-excel-senior', data })
} else {
return await request.download({ url: `/wms/barbasic/export-excel`, params })
}
} }
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/wms/barbasic/get-import-template' }) return request.download({ url: '/wms/barbasic/get-import-template' })
} }

10
src/api/wms/barcode/index.ts

@ -50,10 +50,16 @@ export const deleteBarcode = async (id: number) => {
// 导出条码片段 Excel // 导出条码片段 Excel
export const exportBarcode = async (params) => { export const exportBarcode = async (params) => {
return await request.download({ url: `/label/barcode/export-excel`, params }) if (params.isSearch) {
delete params.isSearch
const data = {...params}
return await request.downloadPost({ url: '/label/barcode/export-excel-senior', data })
} else {
return await request.download({ url: `/label/barcode/export-excel`, params })
}
} }
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/label/barcode/get-import-template' }) return request.download({ url: '/label/barcode/get-import-template' })
} }

10
src/api/wms/callmaterials/index.ts

@ -44,10 +44,16 @@ export const deleteCallmaterials = async (id: number) => {
// 导出叫料标签 Excel // 导出叫料标签 Excel
export const exportCallmaterials = async (params) => { export const exportCallmaterials = async (params) => {
return await request.download({ url: `/wms/callmaterials/export-excel`, params }) if (params.isSearch) {
delete params.isSearch
const data = {...params}
return await request.downloadPost({ url: '/wms/callmaterials/export-excel-senior', data })
} else {
return await request.download({ url: `/wms/callmaterials/export-excel`, params })
}
} }
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/wms/callmaterials/get-import-template' }) return request.download({ url: '/wms/callmaterials/get-import-template' })
} }

4
src/api/wms/customersettleRecordMain/index.ts

@ -61,7 +61,7 @@ export const exportCustomersettleRecordMain = async (params) => {
if (params.isSearch) { if (params.isSearch) {
delete params.isSearch delete params.isSearch
const data = {...params} const data = {...params}
return await request.post({ url: '/wms/customersettle-record-main/export-excel-senior', data }) return await request.downloadPost({ url: '/wms/customersettle-record-main/export-excel-senior', data })
} else { } else {
return await request.download({ url: `/wms/customersettle-record-main/export-excel`, params }) return await request.download({ url: `/wms/customersettle-record-main/export-excel`, params })
} }
@ -70,4 +70,4 @@ export const exportCustomersettleRecordMain = async (params) => {
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/wms/customersettle-record-main/get-import-template' }) return request.download({ url: '/wms/customersettle-record-main/get-import-template' })
} }

18
src/api/wms/deliverPlanMain/index.ts

@ -51,9 +51,15 @@ export const deleteDeliverPlanMain = async (id: number) => {
export const exportDeliverPlanMain = async (params) => { export const exportDeliverPlanMain = async (params) => {
params.businessType = 'Deliver' params.businessType = 'Deliver'
if (params.isSearch) { if (params.isSearch) {
// const cmd = {
// 'column':'businessType',
// 'action':'==',
// 'value':'Deliver'
// }
// params.filters.push(cmd)
delete params.isSearch delete params.isSearch
const data = {...params} const data = {...params}
return await request.post({ url: '/wms/deliver-plan-main/export-excel-senior', data }) return await request.downloadPost({ url: '/wms/deliver-plan-main/export-excel-senior', data })
} else { } else {
return await request.download({ url: `/wms/deliver-plan-main/export-excel`, params }) return await request.download({ url: `/wms/deliver-plan-main/export-excel`, params })
} }
@ -63,9 +69,15 @@ export const exportDeliverPlanMain = async (params) => {
export const exportZZBJDeliverPlanMain = async (params) => { export const exportZZBJDeliverPlanMain = async (params) => {
params.businessType = 'ZZBJDeliver' params.businessType = 'ZZBJDeliver'
if (params.isSearch) { if (params.isSearch) {
// const cmd = {
// 'column':'businessType',
// 'action':'==',
// 'value':'ZZBJDeliver'
// }
// params.filters.push(cmd)
delete params.isSearch delete params.isSearch
const data = {...params} const data = {...params}
return await request.post({ url: '/wms/deliver-plan-main/export-excel-senior', data }) return await request.downloadPost({ url: '/wms/deliver-plan-main/export-excel-senior', data })
} else { } else {
return await request.download({ url: `/wms/deliver-plan-main/export-excel`, params }) return await request.download({ url: `/wms/deliver-plan-main/export-excel`, params })
} }
@ -109,4 +121,4 @@ export const publish = (id) => {
// 重置 // 重置
export const resetting = (id) => { export const resetting = (id) => {
return request.put({ url: '/wms/deliver-plan-main/resetting?id=' + id }) return request.put({ url: '/wms/deliver-plan-main/resetting?id=' + id })
} }

4
src/api/wms/deliverRecordMain/index.ts

@ -70,7 +70,7 @@ export const exportDeliverRecordMain = async (params) => {
if (params.isSearch) { if (params.isSearch) {
delete params.isSearch delete params.isSearch
const data = {...params} const data = {...params}
return await request.post({ url: '/wms/deliver-record-main/export-excel-senior', data }) return await request.downloadPost({ url: '/wms/deliver-record-main/export-excel-senior', data })
} else { } else {
return await request.download({ url: `/wms/deliver-record-main/export-excel`, params }) return await request.download({ url: `/wms/deliver-record-main/export-excel`, params })
} }
@ -79,4 +79,4 @@ export const exportDeliverRecordMain = async (params) => {
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/wms/deliver-record-main/get-import-template' }) return request.download({ url: '/wms/deliver-record-main/get-import-template' })
} }

6
src/api/wms/deliverRequestMain/index.ts

@ -69,7 +69,7 @@ export const exportDeliverRequestMain = async (params) => {
if (params.isSearch) { if (params.isSearch) {
delete params.isSearch delete params.isSearch
const data = {...params} const data = {...params}
return await request.post({ url: '/wms/deliver-request-main/export-excel-senior', data }) return await request.downloadPost({ url: '/wms/deliver-request-main/export-excel-senior', data })
} else { } else {
return await request.download({ url: `/wms/deliver-request-main/export-excel`, params }) return await request.download({ url: `/wms/deliver-request-main/export-excel`, params })
} }
@ -81,7 +81,7 @@ export const exportZZBJDeliverRequestMain = async (params) => {
if (params.isSearch) { if (params.isSearch) {
delete params.isSearch delete params.isSearch
const data = {...params} const data = {...params}
return await request.post({ url: '/wms/deliver-request-main/export-excel-senior', data }) return await request.downloadPost({ url: '/wms/deliver-request-main/export-excel-senior', data })
} else { } else {
return await request.download({ url: `/wms/deliver-request-main/export-excel`, params }) return await request.download({ url: `/wms/deliver-request-main/export-excel`, params })
} }
@ -119,4 +119,4 @@ export const agree = (id) => {
// 处理 // 处理
export const handle = (id) => { export const handle = (id) => {
return request.put({ url: '/wms/deliver-request-main/handle?id=' + id }) return request.put({ url: '/wms/deliver-request-main/handle?id=' + id })
} }

9
src/api/wms/expectin/index.ts

@ -46,10 +46,15 @@ export const deleteExpectin = async (id: number) => {
// 导出预计入库存 Excel // 导出预计入库存 Excel
export const exportExpectin = async (params) => { export const exportExpectin = async (params) => {
return await request.download({ url: `/wms/expectin/export-excel`, params }) if (params.isSearch) {
const data = {...params}
return await request.downloadPost({ url: `/wms/expectin/export-excel-senior`, data })
} else {
return await request.download({ url: `/wms/expectin/export-excel`, params })
}
} }
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/wms/expectin/get-import-template' }) return request.download({ url: '/wms/expectin/get-import-template' })
} }

9
src/api/wms/expectout/index.ts

@ -47,10 +47,15 @@ export const deleteExpectout = async (id: number) => {
// 导出预计出库存 Excel // 导出预计出库存 Excel
export const exportExpectout = async (params) => { export const exportExpectout = async (params) => {
return await request.download({ url: `/wms/expectout/export-excel`, params }) if (params.isSearch) {
const data = {...params}
return await request.downloadPost({ url: `/wms/expectout/export-excel-senior`, data })
} else {
return await request.download({ url: `/wms/expectout/export-excel`, params })
}
} }
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/wms/expectout/get-import-template' }) return request.download({ url: '/wms/expectout/get-import-template' })
} }

10
src/api/wms/locationcapacity/index.ts

@ -42,10 +42,16 @@ export const deleteLocationcapacity = async (id: number) => {
// 导出库位容量 Excel // 导出库位容量 Excel
export const exportLocationcapacity = async (params) => { export const exportLocationcapacity = async (params) => {
return await request.download({ url: `/wms/locationcapacity/export-excel`, params }) if (params.isSearch) {
delete params.isSearch
const data = {...params}
return await request.downloadPost({ url: '/wms/locationcapacity/export-excel-senior', data })
} else {
return await request.download({ url: `/wms/locationcapacity/export-excel`, params })
}
} }
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/wms/locationcapacity/get-import-template' }) return request.download({ url: '/wms/locationcapacity/get-import-template' })
} }

10
src/api/wms/mesBarCode/index.ts

@ -56,10 +56,16 @@ export const deleteMesBarCode = async (id: number) => {
// 导出生产条码清单 Excel // 导出生产条码清单 Excel
export const exportMesBarCode = async (params) => { export const exportMesBarCode = async (params) => {
return await request.download({ url: `/wms/mes-bar-code/export-excel`, params }) if (params.isSearch) {
delete params.isSearch
const data = {...params}
return await request.downloadPost({ url: '/wms/mes-bar-code/export-excel-senior', data })
} else {
return await request.download({ url: `/wms/mes-bar-code/export-excel`, params })
}
} }
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/wms/mes-bar-code/get-import-template' }) return request.download({ url: '/wms/mes-bar-code/get-import-template' })
} }

4
src/api/wms/package/index.ts

@ -79,7 +79,7 @@ export const deletePackage = async (id: number) => {
export const exportPackage = async (params) => { export const exportPackage = async (params) => {
if (params.isSearch) { if (params.isSearch) {
const data = {...params} const data = {...params}
return await request.download({ url: `/wms/package/export-excel-senior`, data }) return await request.downloadPost({ url: `/wms/package/export-excel-senior`, data })
} else { } else {
return await request.download({ url: `/wms/package/export-excel`, params }) return await request.download({ url: `/wms/package/export-excel`, params })
} }
@ -120,4 +120,4 @@ export const getBalanceToPackage = async (packingNumber: String) => {
// 根据库存余额获取包装信息进行打印标签--批量打印 // 根据库存余额获取包装信息进行打印标签--批量打印
export const getBalanceToPackageSelection = async (data: any) => { export const getBalanceToPackageSelection = async (data: any) => {
return await request.post({ url: `/wms/balance/batchPrintLabel` ,data}) return await request.post({ url: `/wms/balance/batchPrintLabel` ,data})
} }

10
src/api/wms/packageunit/index.ts

@ -39,17 +39,17 @@ export const getPackageunit = async (id: number) => {
return await request.get({ url: `/wms/packageunit/get?id=` + id }) return await request.get({ url: `/wms/packageunit/get?id=` + id })
} }
// 新增物品包装规格信息 // 新增物品包装规格信息
export const createPackageunit = async (data: PackageunitVO) => { export const createPackageunit = async (data: PackageunitVO) => {
return await request.post({ url: `/wms/packageunit/create`, data }) return await request.post({ url: `/wms/packageunit/create`, data })
} }
// 修改物品包装规格信息 // 修改物品包装规格信息
export const updatePackageunit = async (data: PackageunitVO) => { export const updatePackageunit = async (data: PackageunitVO) => {
return await request.put({ url: `/wms/packageunit/update`, data }) return await request.put({ url: `/wms/packageunit/update`, data })
} }
// 删除物品包装规格信息 // 删除物品包装规格信息
export const deletePackageunit = async (id: number) => { export const deletePackageunit = async (id: number) => {
return await request.delete({ url: `/wms/packageunit/delete?id=` + id }) return await request.delete({ url: `/wms/packageunit/delete?id=` + id })
} }
@ -59,7 +59,7 @@ export const exportPackageunit = async (params) => {
if (params.isSearch) { if (params.isSearch) {
delete params.isSearch delete params.isSearch
const data = {...params} const data = {...params}
return await request.post({ url: '/wms/packageunit/export-excel-senior', data }) return await request.downloadPost({ url: '/wms/packageunit/export-excel-senior', data })
} else { } else {
return await request.download({ url: `/wms/packageunit/export-excel`, params }) return await request.download({ url: `/wms/packageunit/export-excel`, params })
} }
@ -68,4 +68,4 @@ export const exportPackageunit = async (params) => {
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/wms/packageunit/get-import-template' }) return request.download({ url: '/wms/packageunit/get-import-template' })
} }

9
src/api/wms/processproductionRecordMain/index.ts

@ -48,10 +48,15 @@ export const deleteProcessproductionRecordMain = async (id: number) => {
// 导出工序报产记录主 Excel // 导出工序报产记录主 Excel
export const exportProcessproductionRecordMain = async (params) => { export const exportProcessproductionRecordMain = async (params) => {
return await request.download({ url: `/wms/processproduction-record-main/export-excel`, params }) if (params.isSearch) {
const data = {...params}
return await request.downloadPost({ url: `/wms/processproduction-record-main/export-excel-senior`, data })
} else {
return await request.download({ url: `/wms/processproduction-record-main/export-excel`, params })
}
} }
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/wms/processproduction-record-main/get-import-template' }) return request.download({ url: '/wms/processproduction-record-main/get-import-template' })
} }

9
src/api/wms/processproductionRequestMain/index.ts

@ -48,7 +48,12 @@ export const deleteProcessproductionRequestMain = async (id: number) => {
// 导出工序报产申请主 Excel // 导出工序报产申请主 Excel
export const exportProcessproductionRequestMain = async (params) => { export const exportProcessproductionRequestMain = async (params) => {
return await request.download({ url: `/wms/processproduction-request-main/export-excel`, params }) if (params.isSearch) {
const data = {...params}
return await request.downloadPost({ url: `/wms/processproduction-request-main/export-excel-senior`, data })
} else {
return await request.download({ url: `/wms/processproduction-request-main/export-excel`, params })
}
} }
// 下载用户导入模板 // 下载用户导入模板
@ -84,4 +89,4 @@ export const agreeProcessproductionRequestMain = async (id) => {
// 处理 // 处理
export const handleProcessproductionRequestMain = async (id) => { export const handleProcessproductionRequestMain = async (id) => {
return await request.put({ url: `/wms/processproduction-request-main/handle?id=` + id }) return await request.put({ url: `/wms/processproduction-request-main/handle?id=` + id })
} }

10
src/api/wms/productionreceiptRecordMain/index.ts

@ -61,10 +61,16 @@ export const deleteProductionreceiptRecordMain = async (id: number) => {
// 导出生产收料记录主 Excel // 导出生产收料记录主 Excel
export const exportProductionreceiptRecordMain = async (params) => { export const exportProductionreceiptRecordMain = async (params) => {
return await request.download({ url: `/wms/productionreceipt-record-main/export-excel`, params }) if (params.isSearch){
const data = {...params}
return await request.downloadPost({ url: `/wms/productionreceipt-record-main/export-excel-senior`, data })
}else {
return await request.download({ url: `/wms/productionreceipt-record-main/export-excel`, params })
}
} }
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/wms/productionreceipt-record-main/get-import-template' }) return request.download({ url: '/wms/productionreceipt-record-main/get-import-template' })
} }

9
src/api/wms/productionreturnRecordMain/index.ts

@ -60,10 +60,15 @@ export const deleteProductionreturnRecordMain = async (id: number) => {
// 导出生产退料记录主 Excel // 导出生产退料记录主 Excel
export const exportProductionreturnRecordMain = async (params) => { export const exportProductionreturnRecordMain = async (params) => {
return await request.download({ url: `/wms/productionreturn-record-main/export-excel`, params }) if (params.isSearch){
const data = {...params}
return await request.downloadPost({ url: `/wms/productionreturn-record-main/export-excel-senior`, data })
}else {
return await request.download({ url: `/wms/productionreturn-record-main/export-excel`, params })
}
} }
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/wms/productionreturn-record-main/get-import-template' }) return request.download({ url: '/wms/productionreturn-record-main/get-import-template' })
} }

2
src/api/wms/productputawayJobDetail/index.ts

@ -76,4 +76,4 @@ export const exportProductputawayJobDetail = async (params) => {
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/wms/productputaway-job-detail/get-import-template' }) return request.download({ url: '/wms/productputaway-job-detail/get-import-template' })
} }

14
src/api/wms/productputawayRecordDetail/index.ts

@ -38,6 +38,12 @@ export interface ProductputawayRecordDetailVO {
export const getProductputawayRecordDetailPage = async (params) => { export const getProductputawayRecordDetailPage = async (params) => {
params.type = 'predict' params.type = 'predict'
if (params.isSearch) { if (params.isSearch) {
const cmd = {
'column':'type',
'action':'==',
'value':'predict'
}
params.filters.push(cmd)
delete params.isSearch delete params.isSearch
const data = {...params} const data = {...params}
return await request.post({ url: '/wms/productputaway-record-detail/senior', data }) return await request.post({ url: '/wms/productputaway-record-detail/senior', data })
@ -50,6 +56,12 @@ export const getProductputawayRecordDetailPage = async (params) => {
export const getProductputawayRecordDetailPageAssemble = async (params) => { export const getProductputawayRecordDetailPageAssemble = async (params) => {
  params.type = 'assemble'   params.type = 'assemble'
if (params.isSearch) { if (params.isSearch) {
const cmd = {
'column':'type',
'action':'==',
'value':'assemble'
}
params.filters.push(cmd)
delete params.isSearch delete params.isSearch
const data = {...params} const data = {...params}
return await request.post({ url: '/wms/productputaway-record-detail/senior', data }) return await request.post({ url: '/wms/productputaway-record-detail/senior', data })
@ -85,4 +97,4 @@ export const exportProductputawayRecordDetail = async (params) => {
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/wms/productputaway-record-detail/get-import-template' }) return request.download({ url: '/wms/productputaway-record-detail/get-import-template' })
} }

6
src/api/wms/productputawayRecordMain/index.ts

@ -78,7 +78,7 @@ export const exportProductputawayRecordMain = async (params) => {
if (params.isSearch) { if (params.isSearch) {
delete params.isSearch delete params.isSearch
const data = {...params} const data = {...params}
return await request.post({ url: '/wms/productputaway-record-main/export-excel-senior', data }) return await request.downloadPost({ url: '/wms/productputaway-record-main/export-excel-senior', data })
} else { } else {
return await request.download({ url: `/wms/productputaway-record-main/export-excel`, params }) return await request.download({ url: `/wms/productputaway-record-main/export-excel`, params })
} }
@ -90,7 +90,7 @@ export const exportProductputawayRecordMainAssemble = async (params) => {
if (params.isSearch) { if (params.isSearch) {
delete params.isSearch delete params.isSearch
const data = {...params} const data = {...params}
return await request.post({ url: '/wms/productputaway-record-main/export-excel-senior', data }) return await request.downloadPost({ url: '/wms/productputaway-record-main/export-excel-senior', data })
} else { } else {
return await request.download({ url: `/wms/productputaway-record-main/export-excel`, params }) return await request.download({ url: `/wms/productputaway-record-main/export-excel`, params })
} }
@ -99,4 +99,4 @@ export const exportProductputawayRecordMainAssemble = async (params) => {
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/wms/productputaway-record-main/get-import-template' }) return request.download({ url: '/wms/productputaway-record-main/get-import-template' })
} }

14
src/api/wms/productputawayRequestMain/index.ts

@ -74,6 +74,12 @@ export const deleteProductputawayRequestMain = async (id: number) => {
export const exportProductputawayRequestMain = async (params) => { export const exportProductputawayRequestMain = async (params) => {
params.type = 'predict' params.type = 'predict'
if (params.isSearch) { if (params.isSearch) {
const cmd = {
'column':'type',
'action':'==',
'value':'predict'
}
params.filters.push(cmd)
const data = {...params} const data = {...params}
return await request.downloadPost({ url: `/wms/productputaway-request-main/export-excel-senior`, data }) return await request.downloadPost({ url: `/wms/productputaway-request-main/export-excel-senior`, data })
} else { } else {
@ -85,6 +91,12 @@ export const exportProductputawayRequestMain = async (params) => {
export const exportProductputawayRequestMainAssemble = async (params) => { export const exportProductputawayRequestMainAssemble = async (params) => {
params.type = 'assemble' params.type = 'assemble'
if (params.isSearch) { if (params.isSearch) {
const cmd = {
'column':'type',
'action':'==',
'value':'assemble'
}
params.filters.push(cmd)
const data = {...params} const data = {...params}
return await request.downloadPost({ url: `/wms/productputaway-request-main/export-excel-senior`, data }) return await request.downloadPost({ url: `/wms/productputaway-request-main/export-excel-senior`, data })
} else { } else {
@ -126,4 +138,4 @@ export const agree = (id) => {
// 处理 // 处理
export const handle = (id) => { export const handle = (id) => {
return request.put({ url: '/wms/productputaway-request-main/handle?id=' + id }) return request.put({ url: '/wms/productputaway-request-main/handle?id=' + id })
} }

8
src/api/wms/productreceiptJobMain/index.ts

@ -103,6 +103,12 @@ export const deleteProductreceiptJobMain = async (id: number) => {
export const exportProductreceiptJobMain = async (params) => { export const exportProductreceiptJobMain = async (params) => {
params.type = 'predict' params.type = 'predict'
if (params.isSearch) { if (params.isSearch) {
const cmd = {
'column':'type',
'action':'==',
'value':'predict'
}
params.filters.push(cmd)
const data = {...params} const data = {...params}
return await request.downloadPost({ url: `/wms/productreceipt-job-main/export-excel-senior`, data }) return await request.downloadPost({ url: `/wms/productreceipt-job-main/export-excel-senior`, data })
} else { } else {
@ -145,4 +151,4 @@ export const closeProductreceiptMain = async (id) => {
// 执行发料任务 // 执行发料任务
export const executeProductreceiptMain = async (data) => { export const executeProductreceiptMain = async (data) => {
return await request.put({ url: `/wms/productreceipt-job-main/execute`, data}) return await request.put({ url: `/wms/productreceipt-job-main/execute`, data})
} }

8
src/api/wms/productreceiptRecordMain/index.ts

@ -87,6 +87,12 @@ export const deleteProductreceiptRecordMain = async (id: number) => {
export const exportProductreceiptRecordMain = async (params) => { export const exportProductreceiptRecordMain = async (params) => {
params.type = 'predict' params.type = 'predict'
if (params.isSearch) { if (params.isSearch) {
const cmd = {
'column':'type',
'action':'==',
'value':'predict'
}
params.filters.push(cmd)
delete params.isSearch delete params.isSearch
const data = {...params} const data = {...params}
return await request.post({ url: '/wms/productreceipt-record-main/export-excel-senior', data }) return await request.post({ url: '/wms/productreceipt-record-main/export-excel-senior', data })
@ -119,4 +125,4 @@ export const createPutawayRequest = async (number:string) => {
// 创建检验申请 // 创建检验申请
export const createInspectRequest = async (number:string) => { export const createInspectRequest = async (number:string) => {
return await request.post({ url: `/wms/productreceipt-record-main/createInspectRequest?number=`+number }) return await request.post({ url: `/wms/productreceipt-record-main/createInspectRequest?number=`+number })
} }

9
src/api/wms/productredressRecordMain/index.ts

@ -61,10 +61,15 @@ export const deleteProductredressRecordMain = async (id: number) => {
// 导出制品回收记录主 Excel // 导出制品回收记录主 Excel
export const exportProductredressRecordMain = async (params) => { export const exportProductredressRecordMain = async (params) => {
return await request.download({ url: `/wms/productredress-record-main/export-excel`, params }) if (params.isSearch){
const data = {...params}
return await request.downloadPost({ url: `/wms/productredress-record-main/export-excel-senior`, data })
}else {
return await request.download({ url: `/wms/productredress-record-main/export-excel`, params })
}
} }
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/wms/productredress-record-main/get-import-template' }) return request.download({ url: '/wms/productredress-record-main/get-import-template' })
} }

9
src/api/wms/productredressRequestMain/index.ts

@ -60,7 +60,12 @@ export const deleteProductredressRequestMain = async (id: number) => {
// 导出制品回收申请主 Excel // 导出制品回收申请主 Excel
export const exportProductredressRequestMain = async (params) => { export const exportProductredressRequestMain = async (params) => {
return await request.download({ url: `/wms/productredress-request-main/export-excel`, params }) if (params.isSearch){
const data = {...params}
return await request.downloadPost({ url: `/wms/productredress-request-main/export-excel-senior`, data })
}else {
return await request.download({ url: `/wms/productredress-request-main/export-excel`, params })
}
} }
// 下载用户导入模板 // 下载用户导入模板
@ -97,4 +102,4 @@ export const agree = (id) => {
// 处理 // 处理
export const handle = (id) => { export const handle = (id) => {
return request.put({ url: '/wms/productredress-request-main/handle?id=' + id }) return request.put({ url: '/wms/productredress-request-main/handle?id=' + id })
} }

4
src/api/wms/productrepairRecordMain/index.ts

@ -61,7 +61,7 @@ export const exportProductrepairRecordMain = async (params) => {
if (params.isSearch) { if (params.isSearch) {
delete params.isSearch delete params.isSearch
const data = {...params} const data = {...params}
return await request.post({ url: '/wms/productrepair-record-main/export-excel-senior', data }) return await request.downloadPost({ url: '/wms/productrepair-record-main/export-excel-senior', data })
} else { } else {
return await request.download({ url: `/wms/productrepair-record-main/export-excel`, params }) return await request.download({ url: `/wms/productrepair-record-main/export-excel`, params })
} }
@ -70,4 +70,4 @@ export const exportProductrepairRecordMain = async (params) => {
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/wms/productrepair-record-main/get-import-template' }) return request.download({ url: '/wms/productrepair-record-main/get-import-template' })
} }

8
src/api/wms/productrepairRequestMain/index.ts

@ -57,7 +57,13 @@ export const deleteProductrepairRequestMain = async (id: number) => {
// 导出制品返修申请主 Excel // 导出制品返修申请主 Excel
export const exportProductrepairRequestMain = async (params) => { export const exportProductrepairRequestMain = async (params) => {
return await request.download({ url: `/wms/productrepair-request-main/export-excel`, params }) if (params.isSearch) {
delete params.isSearch
const data = {...params}
return await request.downloadPost({ url: '/wms/productrepair-request-main/export-excel-senior', data })
} else {
return await request.download({ url: `/wms/productrepair-request-main/export-excel`, params })
}
} }
// 下载用户导入模板 // 下载用户导入模板

2
src/api/wms/productscrapRequestMain/index.ts

@ -57,7 +57,7 @@ export const exportProductscrapRequestMain = async (params) => {
if (params.isSearch) { if (params.isSearch) {
delete params.isSearch delete params.isSearch
const data = {...params} const data = {...params}
return await request.post({ url: '/wms/productscrap-request-main/export-excel-senior', data }) return await request.downloadPost({ url: '/wms/productscrap-request-main/export-excel-senior', data })
} else { } else {
return await request.download({ url: `/wms/productscrap-request-main/export-excel`, params }) return await request.download({ url: `/wms/productscrap-request-main/export-excel`, params })
} }

7
src/api/wms/qadproductionplan/index.ts

@ -60,7 +60,12 @@ export const deleteQadProductionPlanMain = async (id: number) => {
// 导出QAD生产计划主 Excel // 导出QAD生产计划主 Excel
export const exportQadProductionPlanMain = async (params) => { export const exportQadProductionPlanMain = async (params) => {
return await request.download({ url: `/wms/qad-production-plan-main/export-excel`, params }) if (params.isSearch){
const data = {...params}
return await request.downloadPost({ url: `/wms/qad-production-plan-main/export-excel-senior`, data })
}else {
return await request.download({ url: `/wms/qad-production-plan-main/export-excel`, params })
}
} }
// 下载用户导入模板 // 下载用户导入模板

9
src/api/wms/repleinshRecordMain/index.ts

@ -59,10 +59,15 @@ export const deleteRepleinshRecordMain = async (id: number) => {
// 导出补料记录主 Excel // 导出补料记录主 Excel
export const exportRepleinshRecordMain = async (params) => { export const exportRepleinshRecordMain = async (params) => {
return await request.download({ url: `/wms/repleinsh-record-main/export-excel`, params }) if (params.isSearch){
const data = {...params}
return await request.downloadPost({ url: `/wms/repleinsh-record-main/export-excel-senior`, data })
}else {
return await request.download({ url: `/wms/repleinsh-record-main/export-excel`, params })
}
} }
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/wms/repleinsh-record-main/get-import-template' }) return request.download({ url: '/wms/repleinsh-record-main/get-import-template' })
} }

10
src/api/wms/saleMain/index.ts

@ -54,10 +54,16 @@ export const deleteSaleMain = async (id: number) => {
// 导出销售订单主 Excel // 导出销售订单主 Excel
export const exportSaleMain = async (params) => { export const exportSaleMain = async (params) => {
return await request.download({ url: `/wms/sale-main/export-excel`, params }) if (params.isSearch) {
delete params.isSearch
const data = {...params}
return await request.downloadPost({ url: '/wms/sale-main/export-excel-senior', data })
} else {
return await request.download({ url: `/wms/sale-main/export-excel`, params })
}
} }
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/wms/sale-main/get-import-template' }) return request.download({ url: '/wms/sale-main/get-import-template' })
} }

10
src/api/wms/saleShipmentMain/index.ts

@ -55,7 +55,13 @@ export const deleteSaleShipmentMain = async (id: number) => {
// 导出结算出库申请主 Excel // 导出结算出库申请主 Excel
export const exportSaleShipmentMain = async (params) => { export const exportSaleShipmentMain = async (params) => {
return await request.download({ url: `/wms/sale-shipment-main-request/export-excel`, params }) if (params.isSearch) {
delete params.isSearch
const data = {...params}
return await request.downloadPost({ url: '/wms/sale-shipment-main-request/export-excel-senior', data })
} else {
return await request.download({ url: `/wms/sale-shipment-main-request/export-excel`, params })
}
} }
// 下载用户导入模板 // 下载用户导入模板
@ -91,4 +97,4 @@ export const agree = async (id) => {
// 处理-结算出库申请 // 处理-结算出库申请
export const handle = async (id) => { export const handle = async (id) => {
return await request.put({ url: `/wms/sale-shipment-main-request/handle?id=` + id }) return await request.put({ url: `/wms/sale-shipment-main-request/handle?id=` + id })
} }

10
src/api/wms/saleShipmentMainRecord/index.ts

@ -47,10 +47,16 @@ export const deleteSaleShipmentMainRecord = async (id: number) => {
// 导出结算出库记录主 Excel // 导出结算出库记录主 Excel
export const exportSaleShipmentMainRecord = async (params) => { export const exportSaleShipmentMainRecord = async (params) => {
return await request.download({ url: `/wms/sale-shipment-main-record/export-excel`, params }) if (params.isSearch) {
delete params.isSearch
const data = {...params}
return await request.downloadPost({ url: '/wms/sale-shipment-main-record/export-excel-senior', data })
} else {
return await request.download({ url: `/wms/sale-shipment-main-record/export-excel`, params })
}
} }
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/wms/sale-shipment-main-record/get-import-template' }) return request.download({ url: '/wms/sale-shipment-main-record/get-import-template' })
} }

4
src/api/wms/transaction/index.ts

@ -65,7 +65,7 @@ export const exportTransaction = async (params) => {
if (params.isSearch) { if (params.isSearch) {
delete params.isSearch delete params.isSearch
const data = {...params} const data = {...params}
return await request.post({ url: '/wms/transaction/export-excel-senior', data }) return await request.downloadPost({ url: '/wms/transaction/export-excel-senior', data })
} else { } else {
return await request.download({ url: `/wms/transaction/export-excel`, params }) return await request.download({ url: `/wms/transaction/export-excel`, params })
} }
@ -74,4 +74,4 @@ export const exportTransaction = async (params) => {
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/wms/transaction/get-import-template' }) return request.download({ url: '/wms/transaction/get-import-template' })
} }

4
src/api/wms/transferlog/index.ts

@ -74,7 +74,7 @@ export const exportTransferlog = async (params) => {
if (params.isSearch) { if (params.isSearch) {
delete params.isSearch delete params.isSearch
const data = {...params} const data = {...params}
return await request.post({ url: '/wms/transferlog/export-excel-senior', data }) return await request.downloadPost({ url: '/wms/transferlog/export-excel-senior', data })
} else { } else {
return await request.download({ url: `/wms/transferlog/export-excel`, params }) return await request.download({ url: `/wms/transferlog/export-excel`, params })
} }
@ -83,4 +83,4 @@ export const exportTransferlog = async (params) => {
// 下载用户导入模板 // 下载用户导入模板
export const importTemplate = () => { export const importTemplate = () => {
return request.download({ url: '/wms/transferlog/get-import-template' }) return request.download({ url: '/wms/transferlog/get-import-template' })
} }

6
src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue

@ -357,6 +357,12 @@ const handleExport = async () => {
// //
const searchFormClick = (searchData) => { const searchFormClick = (searchData) => {
const cmd = {
'column':'type',
'action':'==',
'value':'predict'
}
searchData.filters.push(cmd)
tableObject.params = { tableObject.params = {
isSearch: true, isSearch: true,
filters: searchData.filters filters: searchData.filters

6
src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue

@ -292,6 +292,12 @@ const handleExport = async () => {
// //
const searchFormClick = (searchData) => { const searchFormClick = (searchData) => {
const cmd = {
'column':'type',
'action':'==',
'value':'predict'
}
searchData.filters.push(cmd)
tableObject.params = { tableObject.params = {
isSearch: true, isSearch: true,
filters: searchData.filters filters: searchData.filters

Loading…
Cancel
Save