From 19fcbffa594b0e7f4d96384285e2286425685cf6 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Wed, 23 Oct 2024 15:34:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/edittablehead/index.vue | 2 +- src/views/distribution/inventory/BookingNote.vue | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/edittablehead/index.vue b/src/components/edittablehead/index.vue index ae47edca..26aaa0f4 100644 --- a/src/components/edittablehead/index.vue +++ b/src/components/edittablehead/index.vue @@ -220,7 +220,7 @@ const initSortable = () => { // functions.setStorage($route.fullPath + props.columnListName, arr); postSaveTableSeting({ - tableKey: $route.fullPath + props.columnListName, + tableKey: $route.path + props.columnListName, tableSetCongig: JSON.stringify(arr), }); // emit('update:modelValue', arr); diff --git a/src/views/distribution/inventory/BookingNote.vue b/src/views/distribution/inventory/BookingNote.vue index a70e5ff9..08be1813 100644 --- a/src/views/distribution/inventory/BookingNote.vue +++ b/src/views/distribution/inventory/BookingNote.vue @@ -1755,7 +1755,6 @@ const handleEdit = () => { name: '改单', id: $route.query.id, type: 'edit', - backPath: '/waybill/WaybillOrderList', orderStatus: Number(details.query.waybillType) === 1 ? 'haveData' : 'notHaveData', }, }); @@ -1769,7 +1768,6 @@ const handleEdit = () => { name: '改单', id: $route.query.id, type: 'edit', - backPath: '/waybill/WaybillOrderList', }, }); } From 4ad949c8ad2558f5ecbeb30d41ad6ffd54c948e7 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Wed, 23 Oct 2024 17:36:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=90=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArteryPrintTemplate.vue | 357 ++++++++++++------ src/views/waybill/WaybillOrderList.vue | 28 +- 2 files changed, 266 insertions(+), 119 deletions(-) diff --git a/src/components/ArteryPrintTemplate/ArteryPrintTemplate.vue b/src/components/ArteryPrintTemplate/ArteryPrintTemplate.vue index d3990bf4..6d8b9659 100644 --- a/src/components/ArteryPrintTemplate/ArteryPrintTemplate.vue +++ b/src/components/ArteryPrintTemplate/ArteryPrintTemplate.vue @@ -1,127 +1,248 @@ diff --git a/src/views/waybill/WaybillOrderList.vue b/src/views/waybill/WaybillOrderList.vue index 3ad2999a..334d7d08 100644 --- a/src/views/waybill/WaybillOrderList.vue +++ b/src/views/waybill/WaybillOrderList.vue @@ -13,7 +13,11 @@ --> - + { submitData.documentMakingTimeEndStr = details.query.documentMakingTime[1]; } + if (getObjType(submitData.waybillNoList) === 'string' && submitData.waybillNoList) { + submitData.waybillNoList = submitData.waybillNoList.replaceAll('，', ',').split(','); + } else delete submitData.waybillNoList; + delete submitData.createTime; delete submitData.documentMakingTime; @@ -917,6 +925,24 @@ const handleExport = () => { const submitData = { ...details.query }; + // 创建时间 + if (getObjType(details.query.createTime) === 'array' && details.query.createTime.length > 0) { + submitData.createTimeStartStr = details.query.createTime[0]; + submitData.createTimeEndStr = details.query.createTime[1]; + } + + // 创建时间 + if ( + getObjType(details.query.documentMakingTime) === 'array' && + details.query.documentMakingTime.length > 0 + ) { + submitData.documentMakingTimeStartStr = details.query.documentMakingTime[0]; + submitData.documentMakingTimeEndStr = details.query.documentMakingTime[1]; + } + + delete submitData.createTime; + delete submitData.documentMakingTime; + const res = await postExport(submitData); console.log('res :>> ', res);