From 2ebd64ab412bf56a53d7395442838d850a9ec2a9 Mon Sep 17 00:00:00 2001 From: "UNISINSIGHT\\rdpnr_jiangpeng" Date: Thu, 9 Apr 2026 18:08:42 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=BA=94=E4=BB=98=E5=8D=95?= =?UTF-8?q?=E3=80=81=E5=BA=94=E6=94=B6=E5=8D=95=E5=88=97=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/finance/payable/index.vue | 19 +++++++++++++------ .../src/views/finance/receivable/index.vue | 8 +++++++- .../com/ruoyi/sip/domain/OmsPayableBill.java | 1 + .../ruoyi/sip/domain/OmsReceivableBill.java | 3 ++- .../mapper/finance/OmsPayableBillMapper.xml | 7 +++++-- .../mapper/sip/OmsReceivableBillMapper.xml | 9 +++++++-- 6 files changed, 35 insertions(+), 12 deletions(-) diff --git a/oms_web/oms_vue/src/views/finance/payable/index.vue b/oms_web/oms_vue/src/views/finance/payable/index.vue index 75830ad2..eb5ebb19 100644 --- a/oms_web/oms_vue/src/views/finance/payable/index.vue +++ b/oms_web/oms_vue/src/views/finance/payable/index.vue @@ -124,7 +124,7 @@ - + @@ -307,15 +307,22 @@ export default { /** 查询采购应付单列表 */ getList() { this.loading = true; + const queryParams = { ...this.queryParams }; + const payableBillCodeList = (queryParams.payableBillCode || '') + .split(/[，,]/) + .map(item => item.trim()) + .filter(item => item); + queryParams.payableBillCodeList = payableBillCodeList; + queryParams.payableBillCode = payableBillCodeList.length === 1 ? payableBillCodeList[0] : null; if (null != this.dateRange && '' != this.dateRange) { - this.queryParams.createTimeStart = this.dateRange[0]; - this.queryParams.createTimeEnd = this.dateRange[1]; + queryParams.createTimeStart = this.dateRange[0]; + queryParams.createTimeEnd = this.dateRange[1]; } if (null != this.estimatedPaymentDateRange && '' != this.estimatedPaymentDateRange) { - this.queryParams.estimatedPaymentTimeStart = this.estimatedPaymentDateRange[0]; - this.queryParams.estimatedPaymentTimeEnd = this.estimatedPaymentDateRange[1]; + queryParams.estimatedPaymentTimeStart = this.estimatedPaymentDateRange[0]; + queryParams.estimatedPaymentTimeEnd = this.estimatedPaymentDateRange[1]; } - listPayable(this.queryParams).then(response => { + listPayable(queryParams).then(response => { this.payableList = response.rows; this.total = response.total; this.loading = false; diff --git a/oms_web/oms_vue/src/views/finance/receivable/index.vue b/oms_web/oms_vue/src/views/finance/receivable/index.vue index 9c4a1ec5..75ac84cf 100644 --- a/oms_web/oms_vue/src/views/finance/receivable/index.vue +++ b/oms_web/oms_vue/src/views/finance/receivable/index.vue @@ -20,7 +20,7 @@ @@ -229,6 +229,12 @@ export default { getList() { this.loading = true; let query = { ...this.queryParams }; + const receivableBillCodeList = (query.receivableBillCode || '') + .split(/[，,]/) + .map(item => item.trim()) + .filter(item => item); + query.receivableBillCodeList = receivableBillCodeList; + query.receivableBillCode = receivableBillCodeList.length === 1 ? receivableBillCodeList[0] : null; query = this.addDateRange(query, this.estimatedReceiptDateRange, 'PlanReceiptDate'); listReceivable(query).then(response => { diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPayableBill.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPayableBill.java index 22dd8733..20c2fad4 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPayableBill.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPayableBill.java @@ -29,6 +29,7 @@ public class OmsPayableBill extends BaseEntity /** 应付单编号 */ @Excel(name = "应付单编号") private String payableBillCode; + private List payableBillCodeList; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @Excel(name = "生成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date createTime; diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsReceivableBill.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsReceivableBill.java index 710e1eb9..286ee6e5 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsReceivableBill.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsReceivableBill.java @@ -29,6 +29,7 @@ public class OmsReceivableBill extends BaseEntity /** 应收单编号 */ @Excel(name = "应收单编号") private String receivableBillCode; + private List receivableBillCodeList; /** 最新收款计划ID */ private Long lastReceiptPlanId; @@ -98,4 +99,4 @@ public class OmsReceivableBill extends BaseEntity -} \ No newline at end of file +} diff --git a/ruoyi-sip/src/main/resources/mapper/finance/OmsPayableBillMapper.xml b/ruoyi-sip/src/main/resources/mapper/finance/OmsPayableBillMapper.xml index f11c9ff7..75022eee 100644 --- a/ruoyi-sip/src/main/resources/mapper/finance/OmsPayableBillMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/finance/OmsPayableBillMapper.xml @@ -101,7 +101,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - \ No newline at end of file + diff --git a/ruoyi-sip/src/main/resources/mapper/sip/OmsReceivableBillMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/OmsReceivableBillMapper.xml index 64ef43d1..1a84ece4 100644 --- a/ruoyi-sip/src/main/resources/mapper/sip/OmsReceivableBillMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/sip/OmsReceivableBillMapper.xml @@ -52,7 +52,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"