From c9740d684e46aa4ef2145d0b2508364c3262599d Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Mon, 23 Sep 2024 16:34:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=20=E7=AD=9B=E9=80=89=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E9=87=8D=E7=BD=AE=EF=BC=8C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=9A=84=E4=B8=8D=E5=85=A8=E6=98=AF=E7=A6=BB=E6=95=A3=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E4=BA=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue b/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue index aaecd6b16..a3c980593 100644 --- a/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue +++ b/src/views/wms/supplierManage/purchaseDiscreteOrder/purchaseDiscreteOrderMain/index.vue @@ -352,6 +352,7 @@ ...model, statuss: model.status.join(',')?model.status.join(','):'' } + model1.isLS = 1 delete model1.status setSearchParams(model1) } From 243522ab5c56091feccdb54f31043838c2dd8065 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Mon, 23 Sep 2024 16:46:42 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99?= =?UTF-8?q?=E7=94=B3=E8=AF=B7--=E6=89=B9=E9=87=8F=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/business/inputBlur.ts | 3 ++ .../productionreturnRequestMain.data.ts | 36 ++++++++++++------- 2 files changed, 26 insertions(+), 13 deletions(-) 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/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 Date: Mon, 23 Sep 2024 17:17:08 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-5834=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/purchasereturnRequestMain/index.ts | 5 +++++ .../purchasereturnRequestMOrderTypeMain/index.vue | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) 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/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue index 8d1adf296..c058e8296 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMOrderTypeMain/index.vue @@ -144,7 +144,7 @@ { getList() - importTemplateData.templateUrl = await PurchasereturnRequestMainApi.importTemplateNew() + importTemplateData.templateUrl = await PurchasereturnRequestMainApi.importTemplateMorderType() }) From b94d7ed5323df4c57991d314a47fad7d744b660c Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 23 Sep 2024 17:20:09 +0800 Subject: [PATCH 4/4] =?UTF-8?q?M=E5=9E=8B=E9=80=80=E8=B4=A7=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRequestMOrderTypeMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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