From 3d605513d63658e978c33d704efa29ceebbe16a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Fri, 13 Dec 2024 10:41:48 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E8=B4=A2=E5=8A=A1=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E5=BA=94=E4=BB=98=E8=B4=A6=E6=AC=BE=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=BA=94=E4=BB=98=E8=B4=A6=E6=AC=BE=E5=AE=9E=E4=BD=93=E7=B1=BB?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E7=A1=AE=E8=AE=A4=E6=89=93?= =?UTF-8?q?=E6=AC=BE=E5=90=8E=E6=9B=B4=E6=96=B0=E5=BA=94=E4=BB=98=E8=B4=A6?= =?UTF-8?q?=E6=AC=BEservice=E6=96=B9=E6=B3=95=EF=BC=8C=E8=A1=A5=E5=85=85?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E5=8E=BB?= =?UTF-8?q?=E9=99=A4=E5=BA=94=E6=94=B6=E3=80=81=E5=BA=94=E4=BB=98=E8=B4=A6?= =?UTF-8?q?=E6=AC=BE=E6=93=8D=E4=BD=9C=E6=A0=8F=E6=8C=89=E9=92=AE=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/FinancialAccountsPayable.java | 18 +++++++++--------- .../BaseExpenseConfirmAmountServiceImpl.java | 1 + .../templates/financial/payable/payable.html | 8 ++++++-- .../financial/receivables/receivables.html | 6 +++--- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/financial/domain/FinancialAccountsPayable.java b/ruoyi-admin/src/main/java/com/ruoyi/financial/domain/FinancialAccountsPayable.java index 4c9d3426..0dfedc39 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/financial/domain/FinancialAccountsPayable.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/financial/domain/FinancialAccountsPayable.java @@ -99,40 +99,40 @@ public class FinancialAccountsPayable extends BaseEntity private String paidVoucherCode; /** 付款金额 */ -// @Excel(name = "付款金额") + @Excel(name = "付款金额",sort = 21) private BigDecimal paidPrice; /** 付款时间 */ @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "付款时间", width = 30, sort = 17, dateFormat = "yyyy-MM-dd") + @Excel(name = "付款时间", width = 30, sort = 22, dateFormat = "yyyy-MM-dd") private Date paidTime; /** 创建人*/ - @Excel(name = "创建人", sort = 18) + @Excel(name = "创建人", sort = 17) private String createBy; /** 创建时间 */ - @Excel(name = "创建时间", sort = 19, dateFormat = "yyyy-MM-dd") + @Excel(name = "创建时间", sort = 18, dateFormat = "yyyy-MM-dd") private Date createTime; /** 更新人 */ - @Excel(name = "更新人", sort = 20) + @Excel(name = "更新人", sort = 19) private String updateBy; /** 更新时间 */ - @Excel(name = "更新时间", sort = 21, dateFormat = "yyyy-MM-dd") + @Excel(name = "更新时间", sort = 20, dateFormat = "yyyy-MM-dd") private Date updateTime; /** 付款明细 */ // @Excel(name = "付款明细") private String paidDetail; - /** 收款备注 */ -// @Excel(name = "收款备注") + /** 付款图片 */ + @Excel(name = "付款图片", sort = 23) private String paidPhotourl; /** 操作人 */ -// @Excel(name = "操作人") + @Excel(name = "操作人", sort = 24) private String operatorPeople; /** 结案原因 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseExpenseConfirmAmountServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseExpenseConfirmAmountServiceImpl.java index 48e41c98..187e9260 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseExpenseConfirmAmountServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseExpenseConfirmAmountServiceImpl.java @@ -271,6 +271,7 @@ public class BaseExpenseConfirmAmountServiceImpl implements IBaseExpenseConfirmA }else if(paidPrice.compareTo(shoudPay) < 0){ accountsPayable.setAccountsPayableStatus("1");//部分打款(需要手动结案) } + accountsPayable.setPaidTime(baseExpenseConfirmAmount.getExpenseDate()); accountsPayable.setOperatorPeople(ShiroUtils.getLoginName()); accountsPayable.setUpdateBy(ShiroUtils.getLoginName()); accountsPayable.setUpdateTime(DateUtils.getNowDate()); diff --git a/ruoyi-admin/src/main/resources/templates/financial/payable/payable.html b/ruoyi-admin/src/main/resources/templates/financial/payable/payable.html index ede39809..6bb58031 100644 --- a/ruoyi-admin/src/main/resources/templates/financial/payable/payable.html +++ b/ruoyi-admin/src/main/resources/templates/financial/payable/payable.html @@ -120,6 +120,10 @@ restoreUrl: prefix + "/restore/{id}", exportUrl: prefix + "/export", modalName: "财务应付账款", + fixedColumns: true, // 是否启用冻结列（左侧） + fixedNumber: 1, // 列冻结的个数（左侧） + rightFixedColumns: true, // 是否启用冻结列（右侧） + fixedRightNumber: 1, columns: [{ checkbox: true }, @@ -243,9 +247,9 @@ formatter: function(value, row, index) { var actions = []; if (row.accountsPayableStatus !== '2') { - actions.push('结案 '); + actions.push('结案 '); } - actions.push('详情 '); + actions.push('详情 '); var actionLinks = actions.join(''); return $.table.dropdownToggle(actionLinks); } diff --git a/ruoyi-admin/src/main/resources/templates/financial/receivables/receivables.html b/ruoyi-admin/src/main/resources/templates/financial/receivables/receivables.html index 2577fe22..c3f39770 100644 --- a/ruoyi-admin/src/main/resources/templates/financial/receivables/receivables.html +++ b/ruoyi-admin/src/main/resources/templates/financial/receivables/receivables.html @@ -195,11 +195,11 @@ //未结案 if (row.receivablesClosingStatus !== '2') { - actions.push('创建收款凭证 '); - actions.push('结案 '); + actions.push('创建收款凭证 '); + actions.push('结案 '); } - actions.push('详情 '); + actions.push('详情 '); var actionLinks = actions.join(''); return $.table.dropdownToggle(actionLinks); }