From f00b3ceb7bf3480495fe517ccab4b6b4c445553c Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Wed, 28 May 2025 15:02:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?YT-2663:=E8=A6=81=E8=B4=A7=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2=EF=BC=8C=E8=83=8C?= =?UTF-8?q?=E7=95=AA=E7=9A=84=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=A5=BD=E4=BD=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/purchasePlanMain/index.vue | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index dbe66b090..717f0a235 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -84,7 +84,7 @@ - + @@ -901,6 +901,7 @@ const handleSelectionPublish = async ()=>{ } const changeTableDataSearch = ()=>{ + debugger let filterList = tableData.value if(tableDataSearch.value['itemCode']){ filterList = tableData.value.filter(item => { @@ -909,7 +910,12 @@ const handleSelectionPublish = async ()=>{ } if(tableDataSearch.value['backNumber']){ filterList = filterList.filter(item => { - return item['backNumber'].includes(tableDataSearch.value['backNumber']) + //return item['backNumber'].includes(tableDataSearch.value['backNumber']) + // 如果 backNumber 为空（null/undefined/''），直接过滤掉 + if (!item['backNumber']) return false; + + // 否则检查是否包含搜索值 + return item['backNumber'].includes(tableDataSearch.value['backNumber']); }) } showTableData.value = filterList From 0db1c7e80a56f22d30bf80de4bf69fced1bba898 Mon Sep 17 00:00:00 2001 From: wangxianlei <542787045@qq.com> Date: Wed, 28 May 2025 16:53:38 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0JasperReport?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/supplierdeliverRequestMain/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index de729046c..ab359c2ea 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -180,8 +180,8 @@ From a3e353eecfee207c945761c3b71dda83f2d012aa Mon Sep 17 00:00:00 2001 From: zhang_li Date: Tue, 3 Jun 2025 14:18:03 +0800 Subject: [PATCH 3/4] =?UTF-8?q?YT-2683=E5=BC=80=E5=8F=91=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E3=80=81=E6=B5=8B=E8=AF=95=E4=BA=BA=E5=91=98=E5=8D=8F=E5=8A=A9?= =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E5=AE=9E=E6=96=BD=E4=BA=BA=E5=91=98=E3=80=81?= =?UTF-8?q?QAD=E6=B5=8B=E8=AF=95=E8=A6=81=E8=B4=A7=E9=A2=84=E6=B5=8B?= =?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/demandforecastingDetail/index.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/api/wms/demandforecastingDetail/index.ts b/src/api/wms/demandforecastingDetail/index.ts index f8c2cfbe6..62f23c7e8 100644 --- a/src/api/wms/demandforecastingDetail/index.ts +++ b/src/api/wms/demandforecastingDetail/index.ts @@ -18,7 +18,8 @@ export interface DemandforecastingDetailVO { } // 要货预测-列表和头部请求参数 -const getPageParams = (params)=>{ +const getPageParams = (par) => { + const params = { ...par } // 到货日期 if(params.dueDate&¶ms.dueDate.length>0){ if(isString(params.dueDate[0])){ From c3c1eb6085203d0db4f0cd7a3ceec5e771a121db Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Tue, 3 Jun 2025 14:20:17 +0800 Subject: [PATCH 4/4] =?UTF-8?q?YT-2683=EF=BC=9A=E8=A6=81=E8=B4=A7=E9=A2=84?= =?UTF-8?q?=E6=B5=8B=E5=90=8C=E6=AD=A5=E5=90=8E=E4=B9=A6=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/demandforecastingMain/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue index 60dc0a79b..46d5e0553 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue @@ -412,6 +412,7 @@ const updateDemandforecaste = async ()=>{ let res = await DemandforecastingMainApi.updateDemandforecaste(submitData) console.log('更新结果',res) message.success(t('更新成功')) + getList() } finally{ tableObject.loading = false }