[fix]

财务管理 应付账款
修改应付账款实体类，修改导出字段；
修改确认打款后更新应付账款service方法，补充字段；
修改去除应收、应付账款操作栏按钮样式；

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;
 
     /** 结案原因 */

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

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('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="confirmAndClose(\'' + row.accountsPayableId + '\')"><i class="fa fa-edit"></i>结案</a> ');
+                            actions.push('<a onclick="confirmAndClose(\'' + row.accountsPayableId + '\')"><i class="fa fa-edit"></i>结案</a> ');
                         }
-                        actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="detail(\'' + row.accountsPayableId + '\')"><i class="fa fa-edit"></i>详情</a> ');
+                        actions.push('<a onclick="detail(\'' + row.accountsPayableId + '\')"><i class="fa fa-edit"></i>详情</a> ');
                         var actionLinks = actions.join('');
                         return $.table.dropdownToggle(actionLinks);
                     }

ruoyi-admin/src/main/resources/templates/financial/receivables/receivables.html

@@ -195,11 +195,11 @@
 
                         //未结案
                         if (row.receivablesClosingStatus !== '2') {
-                            actions.push('<a class="btn btn-success btn-xs ' + addReceivablesVoucherFlag + '" href="javascript:void(0)" onclick="addReceivablesVoucher(\'' + row.financialReceivablesId + '\')"><i class="fa fa-edit"></i>创建收款凭证</a> ');
-                            actions.push('<a class="btn btn-success btn-xs ' + closingFlag + '" href="javascript:void(0)" onclick="confirmAndClose(\'' + row.financialReceivablesId + '\')"><i class="fa fa-edit"></i>结案</a> ');
+                            actions.push('<a class="' + addReceivablesVoucherFlag + '" href="javascript:void(0)" onclick="addReceivablesVoucher(\'' + row.financialReceivablesId + '\')"><i class="fa fa-edit"></i>创建收款凭证</a> ');
+                            actions.push('<a class="' + closingFlag + '" href="javascript:void(0)" onclick="confirmAndClose(\'' + row.financialReceivablesId + '\')"><i class="fa fa-edit"></i>结案</a> ');
                         }
 
-                        actions.push('<a class="btn btn-success btn-xs ' + receivablesVoucherDetailFlag + '" href="javascript:void(0)" onclick="receivablesVoucherDetail(\'' + row.financialReceivablesId + '\')"><i class="fa fa-edit"></i>详情</a> ');
+                        actions.push('<a class="' + receivablesVoucherDetailFlag + '" href="javascript:void(0)" onclick="receivablesVoucherDetail(\'' + row.financialReceivablesId + '\')"><i class="fa fa-edit"></i>详情</a> ');
                         var actionLinks = actions.join('');
                         return $.table.dropdownToggle(actionLinks);
                     }