diff --git a/src/api/wms/business/inputBlur.ts b/src/api/wms/business/inputBlur.ts index a32ee78b6..47e660eb3 100644 --- a/src/api/wms/business/inputBlur.ts +++ b/src/api/wms/business/inputBlur.ts @@ -573,6 +573,9 @@ export const getListByBottonInput = async (headerItem, val, row, routeName, form } } await tableFormSchemaObj.verificationPage(params.value).then(async (res) => { + if(!Array.isArray(res)&&res.list&&Array.isArray(res.list)){ + res = res.list + } list.value = res ? res : [] if (arr1.length != res.length) { const arr2 = res.map((item) => item[headerItem.tableForm.searchField]) diff --git a/src/api/wms/purchasereturnRequestMain/index.ts b/src/api/wms/purchasereturnRequestMain/index.ts index e97a97c7f..8af2811a3 100644 --- a/src/api/wms/purchasereturnRequestMain/index.ts +++ b/src/api/wms/purchasereturnRequestMain/index.ts @@ -126,6 +126,11 @@ export const importTemplateNew = () => { return request.download({ url: '/wms/purchasereturn-request-main/get-import-template-new' }) } +// 下载用户导入模板(新) +export const importTemplateMorderType = () => { + return request.download({ url: '/wms/purchasereturn-request-main/get-import-template-mordertype' }) +} + // 关闭采购退货申请主 Excel export const closePurchasereturnRequestMain = async (id) => { return await request.put({ url: `/wms/purchasereturn-request-main/close?id=` + id }) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts index 0a046158e..1280de07a 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts @@ -913,12 +913,12 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive { getList() - importTemplateData.templateUrl = await PurchasereturnRequestMainApi.importTemplateNew() + importTemplateData.templateUrl = await PurchasereturnRequestMainApi.importTemplateMorderType() }) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMOrderTypeMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMOrderTypeMain.data.ts index 89eaeed19..fb8af115e 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMOrderTypeMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/purchasereturnRequestMOrderTypeMain.data.ts @@ -307,7 +307,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive