diff --git a/src/api/wms/agvLocationrelation/index.ts b/src/api/wms/agvLocationrelation/index.ts index 5422aac82..3bc7533f9 100644 --- a/src/api/wms/agvLocationrelation/index.ts +++ b/src/api/wms/agvLocationrelation/index.ts @@ -47,7 +47,7 @@ export const exportAgvLocationrelation = async (params) => { if (params.isSearch) { delete params.isSearch 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 { return await request.download({ url: `/wms/agv-locationrelation/export-excel`, params }) } @@ -56,4 +56,4 @@ export const exportAgvLocationrelation = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/agv-locationrelation/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/barbasic/index.ts b/src/api/wms/barbasic/index.ts index e5a23798d..0f7e161fd 100644 --- a/src/api/wms/barbasic/index.ts +++ b/src/api/wms/barbasic/index.ts @@ -47,10 +47,16 @@ export const deleteBarbasic = async (id: number) => { // 导出条码实体基类 Excel 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 = () => { return request.download({ url: '/wms/barbasic/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/barcode/index.ts b/src/api/wms/barcode/index.ts index 80739036c..38d00d6d6 100644 --- a/src/api/wms/barcode/index.ts +++ b/src/api/wms/barcode/index.ts @@ -50,10 +50,16 @@ export const deleteBarcode = async (id: number) => { // 导出条码片段 Excel 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 = () => { return request.download({ url: '/label/barcode/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/callmaterials/index.ts b/src/api/wms/callmaterials/index.ts index 88f0f0cf6..198efd9cc 100644 --- a/src/api/wms/callmaterials/index.ts +++ b/src/api/wms/callmaterials/index.ts @@ -44,10 +44,16 @@ export const deleteCallmaterials = async (id: number) => { // 导出叫料标签 Excel 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 = () => { return request.download({ url: '/wms/callmaterials/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/customersettleRecordMain/index.ts b/src/api/wms/customersettleRecordMain/index.ts index daaa33fce..ac7a40483 100644 --- a/src/api/wms/customersettleRecordMain/index.ts +++ b/src/api/wms/customersettleRecordMain/index.ts @@ -61,7 +61,7 @@ export const exportCustomersettleRecordMain = async (params) => { if (params.isSearch) { delete params.isSearch 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 { return await request.download({ url: `/wms/customersettle-record-main/export-excel`, params }) } @@ -70,4 +70,4 @@ export const exportCustomersettleRecordMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/customersettle-record-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/deliverPlanMain/index.ts b/src/api/wms/deliverPlanMain/index.ts index 83363172a..47e96247a 100644 --- a/src/api/wms/deliverPlanMain/index.ts +++ b/src/api/wms/deliverPlanMain/index.ts @@ -51,9 +51,15 @@ export const deleteDeliverPlanMain = async (id: number) => { export const exportDeliverPlanMain = async (params) => { params.businessType = 'Deliver' if (params.isSearch) { + // const cmd = { + // 'column':'businessType', + // 'action':'==', + // 'value':'Deliver' + // } + // params.filters.push(cmd) delete params.isSearch 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 { 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) => { params.businessType = 'ZZBJDeliver' if (params.isSearch) { + // const cmd = { + // 'column':'businessType', + // 'action':'==', + // 'value':'ZZBJDeliver' + // } + // params.filters.push(cmd) delete params.isSearch 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 { return await request.download({ url: `/wms/deliver-plan-main/export-excel`, params }) } @@ -109,4 +121,4 @@ export const publish = (id) => { // 重置 export const resetting = (id) => { return request.put({ url: '/wms/deliver-plan-main/resetting?id=' + id }) -} \ No newline at end of file +} diff --git a/src/api/wms/deliverRecordMain/index.ts b/src/api/wms/deliverRecordMain/index.ts index 405efa539..c7c01cb3f 100644 --- a/src/api/wms/deliverRecordMain/index.ts +++ b/src/api/wms/deliverRecordMain/index.ts @@ -70,7 +70,7 @@ export const exportDeliverRecordMain = async (params) => { if (params.isSearch) { delete params.isSearch 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 { return await request.download({ url: `/wms/deliver-record-main/export-excel`, params }) } @@ -79,4 +79,4 @@ export const exportDeliverRecordMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/deliver-record-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/deliverRequestMain/index.ts b/src/api/wms/deliverRequestMain/index.ts index 714df74e3..621e9122d 100644 --- a/src/api/wms/deliverRequestMain/index.ts +++ b/src/api/wms/deliverRequestMain/index.ts @@ -69,7 +69,7 @@ export const exportDeliverRequestMain = async (params) => { if (params.isSearch) { delete params.isSearch 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 { return await request.download({ url: `/wms/deliver-request-main/export-excel`, params }) } @@ -81,7 +81,7 @@ export const exportZZBJDeliverRequestMain = async (params) => { if (params.isSearch) { delete params.isSearch 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 { return await request.download({ url: `/wms/deliver-request-main/export-excel`, params }) } @@ -119,4 +119,4 @@ export const agree = (id) => { // 处理 export const handle = (id) => { return request.put({ url: '/wms/deliver-request-main/handle?id=' + id }) -} \ No newline at end of file +} diff --git a/src/api/wms/expectin/index.ts b/src/api/wms/expectin/index.ts index 2c4d72908..895ea616b 100644 --- a/src/api/wms/expectin/index.ts +++ b/src/api/wms/expectin/index.ts @@ -46,10 +46,15 @@ export const deleteExpectin = async (id: number) => { // 导出预计入库存 Excel 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 = () => { return request.download({ url: '/wms/expectin/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/expectout/index.ts b/src/api/wms/expectout/index.ts index 0ebab0b96..87868ace8 100644 --- a/src/api/wms/expectout/index.ts +++ b/src/api/wms/expectout/index.ts @@ -47,10 +47,15 @@ export const deleteExpectout = async (id: number) => { // 导出预计出库存 Excel 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 = () => { return request.download({ url: '/wms/expectout/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/issueJobMain/index.ts b/src/api/wms/issueJobMain/index.ts index d47210412..0cd21a3f7 100644 --- a/src/api/wms/issueJobMain/index.ts +++ b/src/api/wms/issueJobMain/index.ts @@ -99,7 +99,7 @@ export const abandonIssueMain = async (id) => { // 关闭发料任务 export const closeIssueMain = async (id) => { - return await request.get({ url: `/wms/issue-job-main/close?id=` + id }) + return await request.put({ url: `/wms/issue-job-main/close?id=` + id }) } // 执行发料任务 diff --git a/src/api/wms/locationcapacity/index.ts b/src/api/wms/locationcapacity/index.ts index 40df8ca47..38d7039cb 100644 --- a/src/api/wms/locationcapacity/index.ts +++ b/src/api/wms/locationcapacity/index.ts @@ -42,10 +42,16 @@ export const deleteLocationcapacity = async (id: number) => { // 导出库位容量 Excel 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 = () => { return request.download({ url: '/wms/locationcapacity/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/mesBarCode/index.ts b/src/api/wms/mesBarCode/index.ts index ba37485d6..4d1e9b9c5 100644 --- a/src/api/wms/mesBarCode/index.ts +++ b/src/api/wms/mesBarCode/index.ts @@ -56,10 +56,16 @@ export const deleteMesBarCode = async (id: number) => { // 导出生产条码清单 Excel 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 = () => { return request.download({ url: '/wms/mes-bar-code/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/package/index.ts b/src/api/wms/package/index.ts index 11531274d..571a67ab9 100644 --- a/src/api/wms/package/index.ts +++ b/src/api/wms/package/index.ts @@ -79,7 +79,7 @@ export const deletePackage = async (id: number) => { export const exportPackage = async (params) => { if (params.isSearch) { 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 { 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) => { return await request.post({ url: `/wms/balance/batchPrintLabel` ,data}) -} \ No newline at end of file +} diff --git a/src/api/wms/packageunit/index.ts b/src/api/wms/packageunit/index.ts index ae9b04f92..940fabef9 100644 --- a/src/api/wms/packageunit/index.ts +++ b/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 }) } -// 新增物品包装规格信息 +// 新增物品包装规格信息 export const createPackageunit = async (data: PackageunitVO) => { return await request.post({ url: `/wms/packageunit/create`, data }) } -// 修改物品包装规格信息 +// 修改物品包装规格信息 export const updatePackageunit = async (data: PackageunitVO) => { return await request.put({ url: `/wms/packageunit/update`, data }) } -// 删除物品包装规格信息 +// 删除物品包装规格信息 export const deletePackageunit = async (id: number) => { return await request.delete({ url: `/wms/packageunit/delete?id=` + id }) } @@ -59,7 +59,7 @@ export const exportPackageunit = async (params) => { if (params.isSearch) { delete params.isSearch 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 { return await request.download({ url: `/wms/packageunit/export-excel`, params }) } @@ -68,4 +68,4 @@ export const exportPackageunit = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/packageunit/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/processproductionRecordMain/index.ts b/src/api/wms/processproductionRecordMain/index.ts index f2d6002ac..7470d2a58 100644 --- a/src/api/wms/processproductionRecordMain/index.ts +++ b/src/api/wms/processproductionRecordMain/index.ts @@ -48,10 +48,15 @@ export const deleteProcessproductionRecordMain = async (id: number) => { // 导出工序报产记录主 Excel 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 = () => { return request.download({ url: '/wms/processproduction-record-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/processproductionRequestMain/index.ts b/src/api/wms/processproductionRequestMain/index.ts index 4075041cb..8783aebdb 100644 --- a/src/api/wms/processproductionRequestMain/index.ts +++ b/src/api/wms/processproductionRequestMain/index.ts @@ -48,7 +48,12 @@ export const deleteProcessproductionRequestMain = async (id: number) => { // 导出工序报产申请主 Excel 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) => { return await request.put({ url: `/wms/processproduction-request-main/handle?id=` + id }) -} \ No newline at end of file +} diff --git a/src/api/wms/productionreceiptRecordMain/index.ts b/src/api/wms/productionreceiptRecordMain/index.ts index cd2002af1..c17a65c2b 100644 --- a/src/api/wms/productionreceiptRecordMain/index.ts +++ b/src/api/wms/productionreceiptRecordMain/index.ts @@ -61,10 +61,16 @@ export const deleteProductionreceiptRecordMain = async (id: number) => { // 导出生产收料记录主 Excel 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 = () => { return request.download({ url: '/wms/productionreceipt-record-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/productionreturnRecordMain/index.ts b/src/api/wms/productionreturnRecordMain/index.ts index 328415e2c..9908d416e 100644 --- a/src/api/wms/productionreturnRecordMain/index.ts +++ b/src/api/wms/productionreturnRecordMain/index.ts @@ -60,10 +60,15 @@ export const deleteProductionreturnRecordMain = async (id: number) => { // 导出生产退料记录主 Excel 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 = () => { return request.download({ url: '/wms/productionreturn-record-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/productputawayJobDetail/index.ts b/src/api/wms/productputawayJobDetail/index.ts index b6008e1c0..70cb9fcb9 100644 --- a/src/api/wms/productputawayJobDetail/index.ts +++ b/src/api/wms/productputawayJobDetail/index.ts @@ -76,4 +76,4 @@ export const exportProductputawayJobDetail = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/productputaway-job-detail/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/productputawayRecordDetail/index.ts b/src/api/wms/productputawayRecordDetail/index.ts index 008a7aa60..4464c5c7e 100644 --- a/src/api/wms/productputawayRecordDetail/index.ts +++ b/src/api/wms/productputawayRecordDetail/index.ts @@ -38,6 +38,12 @@ export interface ProductputawayRecordDetailVO { export const getProductputawayRecordDetailPage = async (params) => { params.type = 'predict' if (params.isSearch) { + const cmd = { + 'column':'type', + 'action':'==', + 'value':'predict' + } + params.filters.push(cmd) delete params.isSearch const data = {...params} 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) => {   params.type = 'assemble' if (params.isSearch) { + const cmd = { + 'column':'type', + 'action':'==', + 'value':'assemble' + } + params.filters.push(cmd) delete params.isSearch const data = {...params} return await request.post({ url: '/wms/productputaway-record-detail/senior', data }) @@ -85,4 +97,4 @@ export const exportProductputawayRecordDetail = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/productputaway-record-detail/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/productputawayRecordMain/index.ts b/src/api/wms/productputawayRecordMain/index.ts index 716646115..897de3153 100644 --- a/src/api/wms/productputawayRecordMain/index.ts +++ b/src/api/wms/productputawayRecordMain/index.ts @@ -78,7 +78,7 @@ export const exportProductputawayRecordMain = async (params) => { if (params.isSearch) { delete params.isSearch 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 { return await request.download({ url: `/wms/productputaway-record-main/export-excel`, params }) } @@ -90,7 +90,7 @@ export const exportProductputawayRecordMainAssemble = async (params) => { if (params.isSearch) { delete params.isSearch 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 { return await request.download({ url: `/wms/productputaway-record-main/export-excel`, params }) } @@ -99,4 +99,4 @@ export const exportProductputawayRecordMainAssemble = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/productputaway-record-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/productputawayRequestMain/index.ts b/src/api/wms/productputawayRequestMain/index.ts index 6696beea6..78b21d945 100644 --- a/src/api/wms/productputawayRequestMain/index.ts +++ b/src/api/wms/productputawayRequestMain/index.ts @@ -74,6 +74,12 @@ export const deleteProductputawayRequestMain = async (id: number) => { export const exportProductputawayRequestMain = async (params) => { params.type = 'predict' if (params.isSearch) { + const cmd = { + 'column':'type', + 'action':'==', + 'value':'predict' + } + params.filters.push(cmd) const data = {...params} return await request.downloadPost({ url: `/wms/productputaway-request-main/export-excel-senior`, data }) } else { @@ -85,6 +91,12 @@ export const exportProductputawayRequestMain = async (params) => { export const exportProductputawayRequestMainAssemble = async (params) => { params.type = 'assemble' if (params.isSearch) { + const cmd = { + 'column':'type', + 'action':'==', + 'value':'assemble' + } + params.filters.push(cmd) const data = {...params} return await request.downloadPost({ url: `/wms/productputaway-request-main/export-excel-senior`, data }) } else { @@ -126,4 +138,4 @@ export const agree = (id) => { // 处理 export const handle = (id) => { return request.put({ url: '/wms/productputaway-request-main/handle?id=' + id }) -} \ No newline at end of file +} diff --git a/src/api/wms/productreceiptJobMain/index.ts b/src/api/wms/productreceiptJobMain/index.ts index 8f06b62f8..3464939cc 100644 --- a/src/api/wms/productreceiptJobMain/index.ts +++ b/src/api/wms/productreceiptJobMain/index.ts @@ -103,6 +103,12 @@ export const deleteProductreceiptJobMain = async (id: number) => { export const exportProductreceiptJobMain = async (params) => { params.type = 'predict' if (params.isSearch) { + const cmd = { + 'column':'type', + 'action':'==', + 'value':'predict' + } + params.filters.push(cmd) const data = {...params} return await request.downloadPost({ url: `/wms/productreceipt-job-main/export-excel-senior`, data }) } else { @@ -145,4 +151,4 @@ export const closeProductreceiptMain = async (id) => { // 执行发料任务 export const executeProductreceiptMain = async (data) => { return await request.put({ url: `/wms/productreceipt-job-main/execute`, data}) -} \ No newline at end of file +} diff --git a/src/api/wms/productreceiptRecordMain/index.ts b/src/api/wms/productreceiptRecordMain/index.ts index 102bef055..074f47423 100644 --- a/src/api/wms/productreceiptRecordMain/index.ts +++ b/src/api/wms/productreceiptRecordMain/index.ts @@ -87,6 +87,12 @@ export const deleteProductreceiptRecordMain = async (id: number) => { export const exportProductreceiptRecordMain = async (params) => { params.type = 'predict' if (params.isSearch) { + const cmd = { + 'column':'type', + 'action':'==', + 'value':'predict' + } + params.filters.push(cmd) delete params.isSearch const data = {...params} 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) => { return await request.post({ url: `/wms/productreceipt-record-main/createInspectRequest?number=`+number }) -} \ No newline at end of file +} diff --git a/src/api/wms/productredressRecordMain/index.ts b/src/api/wms/productredressRecordMain/index.ts index e935de9c9..076155908 100644 --- a/src/api/wms/productredressRecordMain/index.ts +++ b/src/api/wms/productredressRecordMain/index.ts @@ -61,10 +61,15 @@ export const deleteProductredressRecordMain = async (id: number) => { // 导出制品回收记录主 Excel 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 = () => { return request.download({ url: '/wms/productredress-record-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/productredressRequestMain/index.ts b/src/api/wms/productredressRequestMain/index.ts index 933a72def..d5402d7e2 100644 --- a/src/api/wms/productredressRequestMain/index.ts +++ b/src/api/wms/productredressRequestMain/index.ts @@ -60,7 +60,12 @@ export const deleteProductredressRequestMain = async (id: number) => { // 导出制品回收申请主 Excel 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) => { return request.put({ url: '/wms/productredress-request-main/handle?id=' + id }) -} \ No newline at end of file +} diff --git a/src/api/wms/productrepairRecordMain/index.ts b/src/api/wms/productrepairRecordMain/index.ts index 3469be295..ecdfc4754 100644 --- a/src/api/wms/productrepairRecordMain/index.ts +++ b/src/api/wms/productrepairRecordMain/index.ts @@ -61,7 +61,7 @@ export const exportProductrepairRecordMain = async (params) => { if (params.isSearch) { delete params.isSearch 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 { return await request.download({ url: `/wms/productrepair-record-main/export-excel`, params }) } @@ -70,4 +70,4 @@ export const exportProductrepairRecordMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/productrepair-record-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/productrepairRequestMain/index.ts b/src/api/wms/productrepairRequestMain/index.ts index 0a5fb8315..87ff80cd3 100644 --- a/src/api/wms/productrepairRequestMain/index.ts +++ b/src/api/wms/productrepairRequestMain/index.ts @@ -57,7 +57,13 @@ export const deleteProductrepairRequestMain = async (id: number) => { // 导出制品返修申请主 Excel 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 }) + } } // 下载用户导入模板 diff --git a/src/api/wms/productscrapRequestMain/index.ts b/src/api/wms/productscrapRequestMain/index.ts index dfed6c9f7..6d49382bf 100644 --- a/src/api/wms/productscrapRequestMain/index.ts +++ b/src/api/wms/productscrapRequestMain/index.ts @@ -57,7 +57,7 @@ export const exportProductscrapRequestMain = async (params) => { if (params.isSearch) { delete params.isSearch 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 { return await request.download({ url: `/wms/productscrap-request-main/export-excel`, params }) } diff --git a/src/api/wms/qadproductionplan/index.ts b/src/api/wms/qadproductionplan/index.ts index 5eda9dfeb..a54e226ae 100644 --- a/src/api/wms/qadproductionplan/index.ts +++ b/src/api/wms/qadproductionplan/index.ts @@ -60,7 +60,12 @@ export const deleteQadProductionPlanMain = async (id: number) => { // 导出QAD生产计划主 Excel 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 }) + } } // 下载用户导入模板 diff --git a/src/api/wms/repleinshRecordMain/index.ts b/src/api/wms/repleinshRecordMain/index.ts index 654f84618..f9b00a155 100644 --- a/src/api/wms/repleinshRecordMain/index.ts +++ b/src/api/wms/repleinshRecordMain/index.ts @@ -59,10 +59,15 @@ export const deleteRepleinshRecordMain = async (id: number) => { // 导出补料记录主 Excel 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 = () => { return request.download({ url: '/wms/repleinsh-record-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/saleMain/index.ts b/src/api/wms/saleMain/index.ts index 75b3ca168..0fd80a7b2 100644 --- a/src/api/wms/saleMain/index.ts +++ b/src/api/wms/saleMain/index.ts @@ -54,10 +54,16 @@ export const deleteSaleMain = async (id: number) => { // 导出销售订单主 Excel 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 = () => { return request.download({ url: '/wms/sale-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/saleShipmentMain/index.ts b/src/api/wms/saleShipmentMain/index.ts index 9527f614e..a3e3c94eb 100644 --- a/src/api/wms/saleShipmentMain/index.ts +++ b/src/api/wms/saleShipmentMain/index.ts @@ -55,7 +55,13 @@ export const deleteSaleShipmentMain = async (id: number) => { // 导出结算出库申请主 Excel 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) => { return await request.put({ url: `/wms/sale-shipment-main-request/handle?id=` + id }) -} \ No newline at end of file +} diff --git a/src/api/wms/saleShipmentMainRecord/index.ts b/src/api/wms/saleShipmentMainRecord/index.ts index be9717d72..d21937a41 100644 --- a/src/api/wms/saleShipmentMainRecord/index.ts +++ b/src/api/wms/saleShipmentMainRecord/index.ts @@ -47,10 +47,16 @@ export const deleteSaleShipmentMainRecord = async (id: number) => { // 导出结算出库记录主 Excel 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 = () => { return request.download({ url: '/wms/sale-shipment-main-record/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/transaction/index.ts b/src/api/wms/transaction/index.ts index 98b4a8aea..1581755c6 100644 --- a/src/api/wms/transaction/index.ts +++ b/src/api/wms/transaction/index.ts @@ -65,7 +65,7 @@ export const exportTransaction = async (params) => { if (params.isSearch) { delete params.isSearch 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 { return await request.download({ url: `/wms/transaction/export-excel`, params }) } @@ -74,4 +74,4 @@ export const exportTransaction = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/transaction/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/transferlog/index.ts b/src/api/wms/transferlog/index.ts index f24fc1e3b..8d13c84e9 100644 --- a/src/api/wms/transferlog/index.ts +++ b/src/api/wms/transferlog/index.ts @@ -74,7 +74,7 @@ export const exportTransferlog = async (params) => { if (params.isSearch) { delete params.isSearch 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 { return await request.download({ url: `/wms/transferlog/export-excel`, params }) } @@ -83,4 +83,4 @@ export const exportTransferlog = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/transferlog/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue index ba06a3cce..64bd16734 100644 --- a/src/components/Table/src/Table.vue +++ b/src/components/Table/src/Table.vue @@ -136,11 +136,9 @@ export default defineComponent({ const toggleAllSelection = (isAll)=>{ if(isAll){ //全选 - if(elTableRef.value?.getSelectionRows().length{ - elTableRef.value!.toggleRowSelection(row,true) - }) - } + unref(getProps).data.forEach(row=>{ + elTableRef.value!.toggleRowSelection(row,true) + }) } } diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue index f298ae8ec..c658bdbba 100644 --- a/src/components/TableForm/src/TableForm.vue +++ b/src/components/TableForm/src/TableForm.vue @@ -4,7 +4,7 @@ - + + +
@@ -453,6 +463,11 @@ const tableSelectionChange = (val) => { } const handleSelectionDelete = ()=>{ emit('tableSelectionDelete', deleteTableData.value) + nextTick(()=>{ + deleteTableData.value.forEach(row=>{ + TableBaseComponents_Ref.value!.toggleRowSelection(row,false) + }) + }) } // 列表排序 const tableSortChange = (column, prop, order) => { @@ -497,6 +512,9 @@ const validateForm = () => { // 删除数据 const handleDeleteTable = (row, index) => { emit('handleDeleteTable', row, index) + nextTick(()=>{ + TableBaseComponents_Ref.value!.toggleRowSelection(row,false) + }) } // 添加数据 const handleAddTable = () => { @@ -521,6 +539,16 @@ const buttonOperationClick = (row, label, index)=> { emit("buttonOperationClick", row, label, index); } +const currentPage =ref(1) +const pageSize = ref(10) +const showTableData = ()=>{ + console.log('props.tableData',props.tableData) + if(props.tableData.length>100){ + return props.tableData.slice((currentPage.value-1)*pageSize.value,currentPage.value*pageSize.value) + }else{ + return props.tableData + } +} // setup 语法糖 抛出方法 defineExpose({ TableBaseComponents_Ref, diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index 38e9f17af..4cedb45c2 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -817,7 +817,7 @@ export default { 供应商名称:'Supplier Name', 税额:'Tax', 税后金额:'After-tax Amount', - 折扣金额:'Discount Amount', + 调整价差:'Discount Amount', 调整税额:'Adjusted Tax', 总差额:'Under Coverage', 金税票号:'Gold tax ticket number', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 2883bf661..fbb2fd3a7 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -817,7 +817,7 @@ export default { 供应商名称:'供应商名称', 税额:'税额', 税后金额:'税后金额', - 折扣金额:'折扣金额', + 调整价差:'调整价差', 调整税额:'调整税额', 总差额:'总差额', 金税票号:'金税票号', diff --git a/src/views/eam/equipmentRepairRecordMain/index.vue b/src/views/eam/equipmentRepairRecordMain/index.vue index a6b7eab22..d9b2fe9bc 100644 --- a/src/views/eam/equipmentRepairRecordMain/index.vue +++ b/src/views/eam/equipmentRepairRecordMain/index.vue @@ -242,7 +242,9 @@ const repairExperienceFormsSuccess = async (formType, data) => { const data1 = { repairNumber: data.number, name: data.name, - content: data.content + content: data.content, + masterId: data.id, + ooderType: 'REPAIR', } console.log(data1) try { diff --git a/src/views/eam/equipmentTransferRecord/index.vue b/src/views/eam/equipmentTransferRecord/index.vue index 1a44b6f4c..e1b220f06 100644 --- a/src/views/eam/equipmentTransferRecord/index.vue +++ b/src/views/eam/equipmentTransferRecord/index.vue @@ -89,7 +89,6 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { const setV = {} setV[formField] = val[0][searchField] if(formField == 'equipmentCode'){ - debugger setV['beforeStorageLocation'] = val[0]['storageLocation'] setV['beforeWorkshopCode'] = val[0]['workshopCode'] setV['beforeLineCode'] = val[0]['lineCode'] diff --git a/src/views/eam/repairExperience/index.vue b/src/views/eam/repairExperience/index.vue index b6e1882b9..b393435de 100644 --- a/src/views/eam/repairExperience/index.vue +++ b/src/views/eam/repairExperience/index.vue @@ -27,9 +27,9 @@ v-model:currentPage="tableObject.currentPage" v-model:sort="tableObject.sort" > -