From 9db75dc84dd85d4b421728551707617153ca255a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Thu, 9 Jan 2025 17:05:53 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=9F=BA=E7=A1=80=E8=B5=84=E6=96=99=20?= =?UTF-8?q?=E6=8A=A5=E9=94=80=E5=8D=95=20=E4=BF=AE=E6=94=B9=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=8A=A5=E9=94=80=E5=8D=95=E9=A1=B5=E9=9D=A2=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E5=AE=9A=E4=B9=89=EF=BC=8C=E5=8E=BB=E9=99=A4=E8=A1=8C?= =?UTF-8?q?=E5=86=85=E7=BC=96=E8=BE=91=E6=A0=B7=E5=BC=8F=EF=BC=9B=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E9=94=80=E5=8D=95=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E7=B1=BB=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=8A=A5=E9=94=80=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E5=AD=97=E6=AE=B5=EF=BC=9B=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8A=A5=E9=94=80=E5=8D=95mapper=E5=AF=B9=E5=BA=94=E6=96=B9?= =?UTF-8?q?=E6=B3=95=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=EF=BC=9B?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E7=A1=AE=E8=AE=A4=E6=89=93=E6=AC=BE?= =?UTF-8?q?=E8=B7=B3=E8=BD=ACcontroller=E6=96=B9=E6=B3=95=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8A=A5=E9=94=80=E9=87=91=E9=A2=9D=E8=B5=8B?= =?UTF-8?q?=E5=80=BC=E8=AF=AD=E5=8F=A5=EF=BC=9B=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8A=A5=E9=94=80=E5=8D=95service=E6=96=B9?= =?UTF-8?q?=E6=B3=95=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=8A=A5=E9=94=80=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E5=90=88=E8=AE=A1=E8=B5=8B=E5=80=BC=EF=BC=9B=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B=E5=90=AF=E5=8A=A8=E7=BB=93?= =?UTF-8?q?=E6=9D=9Fservice=E6=96=B9=E6=B3=95=EF=BC=8C=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81=E4=B8=BA?= =?UTF-8?q?=E5=BE=85=E6=89=93=E6=AC=BE=EF=BC=9B=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=89=93=E6=AC=BE=E6=9B=B4=E6=96=B0=E5=85=B3?= =?UTF-8?q?=E8=81=94=E8=AE=A2=E5=8D=95=E5=AD=90=E8=A1=A8=E6=89=93=E6=AC=BE?= =?UTF-8?q?=E7=8A=B6=E6=80=81service=E6=96=B9=E6=B3=95=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=9B=B4=E6=96=B0=E5=A7=94=E5=A4=96=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=89=93=E6=AC=BE=E7=8A=B6=E6=80=81service=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=9B=B4=E6=96=B0=E5=BA=94=E4=BB=98?= =?UTF-8?q?=E8=B4=A6=E6=AC=BE=E8=AE=B0=E5=BD=95=E4=BB=98=E6=AC=BE=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BF=A1=E6=81=AFservice=E6=96=B9=E6=B3=95=EF=BC=9B?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E7=A1=AE=E8=AE=A4=E6=89=93=E6=AC=BE?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=89=93=E6=AC=BE=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E8=87=AA=E5=8A=A8=E8=8E=B7=E5=8F=96=E5=8F=AA?= =?UTF-8?q?=E8=AF=BB=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseExpenseAccountController.java | 1 + .../system/domain/BaseExpenseAccount.java | 14 ++- .../impl/BaseExpenseAccountServiceImpl.java | 10 +- .../BaseExpenseConfirmAmountServiceImpl.java | 99 +++++++++---------- .../system/BaseExpenseAccountMapper.xml | 9 +- .../templates/system/baseExpense/add.html | 10 +- .../system/baseExpense/confirmPayment.html | 7 +- 7 files changed, 82 insertions(+), 68 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseExpenseAccountController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseExpenseAccountController.java index eb6a6b89..7bc2b1c5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseExpenseAccountController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/BaseExpenseAccountController.java @@ -435,6 +435,7 @@ public class BaseExpenseAccountController extends BaseController baseExpenseConfirmAmount.setExpenseCode(baseExpenseAccount.getExpenseCode()); baseExpenseConfirmAmount.setExpenseMethod(baseExpenseAccount.getExpenseMethod()); baseExpenseConfirmAmount.setFullName(baseExpenseAccount.getFullName()); + baseExpenseConfirmAmount.setAmount(baseExpenseAccount.getExpenseAmount()); mmap.put("baseExpenseAccount", baseExpenseConfirmAmount); return prefix + "/confirmPayment"; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseExpenseAccount.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseExpenseAccount.java index 5a6dda91..07155894 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseExpenseAccount.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseExpenseAccount.java @@ -6,6 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -30,7 +31,7 @@ public class BaseExpenseAccount extends BaseEntity @Excel(name = "总经理审核状态") private String managerAuditStatus; - /** 财务审核状态 */ + /** 财务审核状态（0待审核，1审核通过，2审核拒绝，3待打款，4已打款） */ @Excel(name = "财务审核状态") private String financeAuditStatus; @@ -106,7 +107,8 @@ public class BaseExpenseAccount extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date applyTime; - + /** 报销金额 */ + private BigDecimal expenseAmount; private List expenseAccountChildList; @@ -328,6 +330,14 @@ public class BaseExpenseAccount extends BaseEntity return useStatus; } + public BigDecimal getExpenseAmount() { + return expenseAmount; + } + + public void setExpenseAmount(BigDecimal expenseAmount) { + this.expenseAmount = expenseAmount; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseExpenseAccountServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseExpenseAccountServiceImpl.java index 862446e1..79bc749e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseExpenseAccountServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/BaseExpenseAccountServiceImpl.java @@ -1,5 +1,6 @@ package com.ruoyi.system.service.impl; +import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; @@ -201,6 +202,7 @@ public class BaseExpenseAccountServiceImpl implements IBaseExpenseAccountService baseExpenseAccount.setCreateTime(DateUtils.getNowDate()); baseExpenseAccount.setDelFlag("0"); baseExpenseAccount.setExpenseCode(redisCache.generateBillNo("BX")); + BigDecimal expenseAmount = BigDecimal.ZERO; List baseExpenseAccountChildList = baseExpenseAccount.getExpenseAccountChildList(); if (!CollectionUtils.isEmpty(baseExpenseAccountChildList)) { for (BaseExpenseAccountChild baseExpenseAccountChild :baseExpenseAccountChildList) { @@ -209,8 +211,10 @@ public class BaseExpenseAccountServiceImpl implements IBaseExpenseAccountService //获取父表的单号 baseExpenseAccountChild.setExpenseCode(baseExpenseAccount.getExpenseCode()); baseExpenseAccountChildService.insertBaseExpenseAccountChild(baseExpenseAccountChild); + expenseAmount = expenseAmount.add(baseExpenseAccountChild.getAmounts()); } } + baseExpenseAccount.setExpenseAmount(expenseAmount); return baseExpenseAccountMapper.insertBaseExpenseAccount(baseExpenseAccount); } @@ -408,7 +412,7 @@ public class BaseExpenseAccountServiceImpl implements IBaseExpenseAccountService //设置总经理审核状态 baseExpenseAccount.setManagerAuditStatus("1"); //设置财务审核状态 - baseExpenseAccount.setFinanceAuditStatus("1"); + baseExpenseAccount.setFinanceAuditStatus("3");//待打款 } baseExpenseAccountMapper.updateBaseExpenseAccount(baseExpenseAccount); @@ -500,7 +504,7 @@ public class BaseExpenseAccountServiceImpl implements IBaseExpenseAccountService variables.put("zgExist",true); variables.put("jlExist",false); } - if(roleKeys.contains("admin")||roleKeys.contains("ywjlRole")||roleKeys.contains("yfzjRole") + if(roleKeys.contains("ywjlRole")||roleKeys.contains("yfzjRole") ||roleKeys.contains("fzjlRole")||roleKeys.contains("pzjlRole") ||roleKeys.contains("shjlRole") ||roleKeys.contains("cwzgRole") ||roleKeys.contains("zozjRole")){ @@ -511,7 +515,7 @@ public class BaseExpenseAccountServiceImpl implements IBaseExpenseAccountService //财务审核转到总经理 variables.put("authority",2); } - if(roleKeys.contains("zjlRole")){ + if(roleKeys.contains("admin")||roleKeys.contains("zjlRole")){ //总经理直接通过 variables.put("authority",3); } 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 187e9260..ee277839 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 @@ -1,10 +1,7 @@ package com.ruoyi.system.service.impl; import java.math.BigDecimal; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; import com.ruoyi.common.exception.BusinessException; @@ -152,7 +149,8 @@ public class BaseExpenseConfirmAmountServiceImpl implements IBaseExpenseConfirmA for (BaseExpenseAccountChild child: expenseChildren) { if(child.getPurchaseCode()!=null&&!child.getPurchaseCode().isEmpty()){ // 更新应付账款打款相关信息 - int rows = updateFinancialPayableInfo(child.getPurchaseCode(),supplierCode,baseExpenseConfirmAmount); + FinancialAccountsPayable payable = updateFinancialPayableInfo(child.getPurchaseCode(),child,supplierCode,baseExpenseConfirmAmount); + int rows = accountsPayableMapper.updateFinancialAccountsPayable(payable); if(rows<= 0){ throw new BusinessException("更新应付账款记录失败！"); } @@ -161,10 +159,9 @@ public class BaseExpenseConfirmAmountServiceImpl implements IBaseExpenseConfirmA if(purchaseOrder == null){ throw new BusinessException("关联采购订单"+purchaseOrderCode+"不存在！"); } - BigDecimal paidPrice = child.getAmounts(); - if(paidPrice.compareTo(purchaseOrder.getRmbSum()) == 0){ + if(payable.getAccountsPayableStatus().equals("2")){ purchaseOrder.setPaymentStatus("4");//已结案 - }else if(paidPrice.compareTo(purchaseOrder.getRmbSum()) < 0){ + }else { purchaseOrder.setPaymentStatus("1");//部分打款(需要手动结案) } purchaseOrder.setUpdateBy(ShiroUtils.getLoginName()); @@ -177,7 +174,8 @@ public class BaseExpenseConfirmAmountServiceImpl implements IBaseExpenseConfirmA } else if(child.getOutsourceCode()!=null&&!child.getOutsourceCode().isEmpty()){ // 更新应付账款打款相关信息 - int rows = updateFinancialPayableInfo(child.getOutsourceCode(),supplierCode,baseExpenseConfirmAmount); + FinancialAccountsPayable payable = updateFinancialPayableInfo(child.getOutsourceCode(), child,supplierCode,baseExpenseConfirmAmount); + int rows = accountsPayableMapper.updateFinancialAccountsPayable(payable); if(rows<= 0){ throw new BusinessException("更新应付账款记录失败！"); } @@ -186,13 +184,23 @@ public class BaseExpenseConfirmAmountServiceImpl implements IBaseExpenseConfirmA tempOutDetail.setOutsourceOrderNo(child.getOutsourceCode()); tempOutDetail.setSupplierCode(supplierCode); List outOrderDetails = outOrderDetailMapper.selectOutsourceOrderDetailList(tempOutDetail); + if(StringUtils.isEmpty(outOrderDetails)){ + throw new BusinessException("未找到关联委外订单详情信息！"); + } + if(CollectionUtils.isNotEmpty(outOrderDetails)){ for (OutsourceOrderDetail detail: outOrderDetails) { - detail.setRemitStatus("2"); - detail.setClosedStatus("0"); + if(payable.getAccountsPayableStatus().equals("1")){//部分付款 + detail.setRemitStatus("1"); + detail.setClosedStatus("1"); + }else{//全部打款 + detail.setRemitStatus("2"); + detail.setClosedStatus("2"); + } outOrderDetailMapper.updateOutsourceOrderDetail(detail); updateResult ++; } + if(updateResult <= 0){ throw new BusinessException("委外订单详情记录更新失败！"); } @@ -210,37 +218,23 @@ public class BaseExpenseConfirmAmountServiceImpl implements IBaseExpenseConfirmA // 更新委外订单打款状态 public int updateOutsourceOrderPayableStatus(String outsourceOrderCode){ OutsourceOrder outsourceOrder = outsourceOrderMapper.selectOutsourceOrderByNo(outsourceOrderCode); - OutsourceOrderDetail temp = new OutsourceOrderDetail(); - temp.setOutsourceOrderNo(outsourceOrderCode); - List outsourceOrderDetails = outOrderDetailMapper.selectOutsourceOrderDetailList(temp); - if(CollectionUtils.isEmpty(outsourceOrderDetails)){ - throw new BusinessException("委外订单详情记录为空！"); + FinancialAccountsPayable temp = new FinancialAccountsPayable(); + temp.setRelevanceCode(outsourceOrderCode); + List payableList = accountsPayableMapper.selectFinancialAccountsPayableList(temp); + if(CollectionUtils.isEmpty(payableList)){ + throw new BusinessException("未找到应付账款记录！"); } - String isAllPaid = "3"; - // 获取所有 paymentStatus 的集合 - Set statuses = outsourceOrderDetails.stream() - .map(OutsourceOrderDetail::getRemitStatus) - .collect(Collectors.toSet()); - - // 判断状态 - if (statuses.size() == 1) { - String singleStatus = statuses.iterator().next(); - if (singleStatus.equals("0")) { - isAllPaid = "0"; - } else if (singleStatus.equals("2")) { - isAllPaid = "1"; + boolean allClosed = true; + //根据应付账款打款信息更新订单状态 + for (FinancialAccountsPayable payable: payableList) { + if(!payable.getAccountsPayableStatus().equals("2")){ + allClosed = false; } - } else if (statuses.size() == 2 && statuses.contains("0") && statuses.contains("2")) { - isAllPaid = "2"; } - if(isAllPaid.equals("1")){ -// 订单内供应商全部打款 - outsourceOrder.setClosedStatus("2"); - }else if(isAllPaid.equals("0")){ -// 订单内供应商全未打款 - outsourceOrder.setClosedStatus("0"); - }else if(isAllPaid.equals("2")){ - outsourceOrder.setClosedStatus("1"); + if(allClosed){ + outsourceOrder.setClosedStatus("4");//已结案 + }else{ + outsourceOrder.setClosedStatus("1");//部分打款 } OutsourceOrderVO outsourceOrderVO = new OutsourceOrderVO(); outsourceOrderVO.setOutsourceOrderId(outsourceOrder.getOutsourceOrderId()); @@ -248,35 +242,38 @@ public class BaseExpenseConfirmAmountServiceImpl implements IBaseExpenseConfirmA return outsourceOrderMapper.updateOutsourceOrder(outsourceOrderVO); } // 更新应付账款记录付款相关信息 - public int updateFinancialPayableInfo(String relatedCode, String supplierCode, BaseExpenseConfirmAmount baseExpenseConfirmAmount){ + public FinancialAccountsPayable updateFinancialPayableInfo(String relatedCode,BaseExpenseAccountChild child, String supplierCode, BaseExpenseConfirmAmount baseExpenseConfirmAmount){ FinancialAccountsPayable temp = new FinancialAccountsPayable(); temp.setRelevanceCode(relatedCode); temp.setSupplierCode(supplierCode); - List payableList = accountsPayableMapper.selectFinancialAccountsPayableList(temp); - if(CollectionUtils.isEmpty(payableList)){ + FinancialAccountsPayable accountsPayable = accountsPayableMapper.selectFinancialAccountsPayableByCode(temp); + if(accountsPayable == null){ throw new BusinessException("未找到应付账款记录！"); } - FinancialAccountsPayable accountsPayable = payableList.get(0); - BigDecimal paidPrice = baseExpenseConfirmAmount.getAmount(); + BigDecimal paidPrice = child.getAmounts(); int insertResult = insertFinancialPayableRecord(accountsPayable.getAccountsPayableCode(),relatedCode,baseExpenseConfirmAmount); if(insertResult <= 0){ throw new BusinessException("插入应付账款付款记录失败！"); } - accountsPayable.setPaidPrice(paidPrice); - accountsPayable.setActualPaidPrice(paidPrice); + /*更新实付金额*/ + BigDecimal actualPaidPrice = Optional.ofNullable(accountsPayable.getActualPaidPrice()).orElse(BigDecimal.ZERO); + actualPaidPrice = actualPaidPrice.add(paidPrice); + accountsPayable.setPaidPrice(actualPaidPrice); + accountsPayable.setActualPaidPrice(actualPaidPrice); + /*更新未付金额*/ BigDecimal shoudPay = accountsPayable.getPriceIncludesTax(); accountsPayable.setUnpaidPrice(shoudPay.subtract(paidPrice)); - if(paidPrice.compareTo(shoudPay) == 0 ){ + /*更新付款结案状态*/ + if(actualPaidPrice.compareTo(shoudPay) >= 0 ){ accountsPayable.setAccountsPayableStatus("2");//已结案 - }else if(paidPrice.compareTo(shoudPay) < 0){ + }else if(actualPaidPrice.compareTo(shoudPay) < 0){ accountsPayable.setAccountsPayableStatus("1");//部分打款(需要手动结案) } accountsPayable.setPaidTime(baseExpenseConfirmAmount.getExpenseDate()); accountsPayable.setOperatorPeople(ShiroUtils.getLoginName()); accountsPayable.setUpdateBy(ShiroUtils.getLoginName()); accountsPayable.setUpdateTime(DateUtils.getNowDate()); - int rows = accountsPayableMapper.updateFinancialAccountsPayable(accountsPayable); - return rows; + return accountsPayable; } // 新建应付账款付款记录 public int insertFinancialPayableRecord(String accountsPayableCode, String relatedCode, BaseExpenseConfirmAmount baseExpenseConfirmAmount){ @@ -285,7 +282,7 @@ public class BaseExpenseConfirmAmountServiceImpl implements IBaseExpenseConfirmA payableRecords.setRelevanceCode(relatedCode); payableRecords.setPaidPrice(baseExpenseConfirmAmount.getAmount()); payableRecords.setPaidTime(baseExpenseConfirmAmount.getExpenseDate()); - payableRecords.setOperatorPeople(baseExpenseConfirmAmount.getFullName()); + payableRecords.setOperatorPeople(ShiroUtils.getLoginName()); payableRecords.setCreateBy(ShiroUtils.getLoginName()); payableRecords.setCreateTime(DateUtils.getNowDate()); int rows = payableRecordsMapper.insertFinancialPayableRecords(payableRecords); diff --git a/ruoyi-admin/src/main/resources/mapper/system/BaseExpenseAccountMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/BaseExpenseAccountMapper.xml index 0a2279a6..087ca067 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/BaseExpenseAccountMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/BaseExpenseAccountMapper.xml @@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" supplier_code, corporate_payee, corporate_receiving_account, public_account_banks, apply_user, create_by, create_time, update_by, update_time, remark, use_status,del_flag, instance_id, instance_type, submit_instance_id, cancel_instance_id, restore_instance_id, - apply_title, apply_user, apply_time + apply_title, apply_user, apply_time, expense_amount from base_expense_account @@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" b.supplier_code, b.corporate_payee, b.corporate_receiving_account, b.public_account_banks, b.apply_user, b.create_by, b.create_time, b.update_by, b.update_time, b.remark, b.use_status, b.del_flag, b.instance_id, b.instance_type, p.dict_value as instance_type_name, b.submit_instance_id, b.cancel_instance_id, b.restore_instance_id, - b.apply_title, b.apply_user, b.apply_time + b.apply_title, b.apply_user, b.apply_time, b.expense_amount from base_expense_account as b left join ( select dict_value, dict_label from sys_dict_data where dict_type = 'processType' @@ -138,6 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" apply_user, apply_time, del_flag, + expense_amount, #{auditStatus}, @@ -166,6 +167,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{applyUser}, #{applyTime}, #{delFlag}, + #{expenseAmount}, @@ -198,6 +200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" apply_user = #{applyUser}, apply_time = #{applyTime}, del_flag = #{delFlag}, + expense_amount = #{expenseAmount}, where expense_id = #{expenseId} diff --git a/ruoyi-admin/src/main/resources/templates/system/baseExpense/add.html b/ruoyi-admin/src/main/resources/templates/system/baseExpense/add.html index 1fc53a16..71901c14 100644 --- a/ruoyi-admin/src/main/resources/templates/system/baseExpense/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/baseExpense/add.html @@ -130,9 +130,9 @@ {title: '成本小类',field:'costSmallType', formatter:function(value, row, index){return getCostSmallType(value,row,index)} }, - {title: '用途',field: 'purpose', editable:{type:'text', mode:'inline',}}, + {title: '用途',field: 'purpose', editable:{type:'text', }}, {title: '金额',field: 'amounts', - editable:{type:'text', mode:'inline', + editable:{type:'text', validate: function(value, row){ //金额可以为最多两位小数点 var reg = /^[0-9]+([.]{1}[0-9]{1,2})?$/; @@ -152,9 +152,9 @@ } }, {title: '报销时间',field: 'expenseTime', visible: false, editable: {type: 'date',title: '报销时间', placement: 'left',}}, - {title: '出差单号',field: 'evectionCode',editable:{type:'text', mode:'inline',}}, - {title: '采购单号',field: 'purchaseCode',editable:{type:'text', mode:'inline',}}, - {title: '委外单号',field: 'outsourceCode',editable:{type:'text', mode:'inline',}}, + {title: '出差单号',field: 'evectionCode',editable:{type:'text', }}, + {title: '采购单号',field: 'purchaseCode',editable:{type:'text', }}, + {title: '委外单号',field: 'outsourceCode',editable:{type:'text', }}, { title: '操作', align: 'center', diff --git a/ruoyi-admin/src/main/resources/templates/system/baseExpense/confirmPayment.html b/ruoyi-admin/src/main/resources/templates/system/baseExpense/confirmPayment.html index 8c14167e..a212165f 100644 --- a/ruoyi-admin/src/main/resources/templates/system/baseExpense/confirmPayment.html +++ b/ruoyi-admin/src/main/resources/templates/system/baseExpense/confirmPayment.html @@ -25,9 +25,8 @@
-
@@ -35,7 +34,7 @@
- +