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);
}