From 067af762685339aa35f970e0ddb10c50bec69a04 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Mon, 2 Dec 2024 14:02:08 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E6=80=BB=E7=BB=8F=E7=90=86=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=BB=8F=E8=90=A5=E6=88=90=E6=9C=AC=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=9A=E5=8E=BB=E6=8E=89=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E4=B8=AD=20=E4=B8=8D=E5=90=AB=E7=A8=8E?= =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E6=88=90=E6=9C=AC=E3=80=81=E4=B8=8D=E5=90=AB?= =?UTF-8?q?=E7=A8=8E=E6=8E=A8=E5=B9=BF=E6=88=90=E6=9C=AC=E3=80=81=E4=B8=8D?= =?UTF-8?q?=E5=90=AB=E7=A8=8E=E4=B8=9A=E5=8A=A1=E6=88=90=E6=9C=AC=E3=80=81?= =?UTF-8?q?=E4=B8=8D=E5=90=AB=E7=A8=8E=E7=AE=A1=E7=90=86=E6=88=90=E6=9C=AC?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84=E6=96=B9=E6=B3=95=20=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=20=E4=BB=8E=20`salesEstimateDetailVo`=20=E4=B8=AD?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=85=B6=E4=BB=96=E6=88=90=E6=9C=AC=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=96=B9=E6=B3=95=E4=B8=AD=E7=9A=84=EF=BC=8C=E4=B8=8A?= =?UTF-8?q?=E8=BF=B0=E5=9B=9B=E4=B8=AA=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=B8=8A=E4=B8=80=E5=B9=B4=E5=BA=A6=E7=9A=84=E6=80=BB?= =?UTF-8?q?=E7=BB=8F=E8=90=A5=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=88=90=E6=9C=AC?= =?UTF-8?q?=E5=90=88=E8=AE=A1=EF=BC=9B=E8=AE=A1=E7=AE=97=E4=B8=8A=E4=B8=80?= =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E5=90=AB=E7=A8=8E=E6=80=BB=E7=BB=8F=E8=90=A5?= =?UTF-8?q?=E6=88=90=E6=9C=AC=EF=BC=8C=E5=A2=9E=E5=80=BC=E7=A8=8E=E7=8E=87?= =?UTF-8?q?=E4=B8=BA=2013%=EF=BC=9B=E8=AE=A1=E7=AE=97=20=E4=B8=8A=E4=B8=80?= =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E6=80=BB=E7=89=A9=E6=96=99=E5=90=AB=E7=A8=8E?= =?UTF-8?q?=E6=88=90=E6=9C=AC=E5=90=88=E8=AE=A1=EF=BC=8C=E5=A2=9E=E5=80=BC?= =?UTF-8?q?=E7=A8=8E=E7=8E=87=E4=B8=BA=2013%=EF=BC=9B=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E8=AF=A5=E6=96=99=E5=8F=B7=E7=9A=84=E4=B8=8D=E5=90=AB=E7=A8=8E?= =?UTF-8?q?=E7=BB=8F=E8=90=A5=E6=88=90=E6=9C=AC=20(RMB)=3D(=E8=AF=A5?= =?UTF-8?q?=E6=96=99=E5=8F=B7=E7=9A=84BOM=E7=89=A9=E6=96=99=E4=B8=8D?= =?UTF-8?q?=E5=90=AB=E7=A8=8E=E6=80=BB=E9=87=87=E8=B4=AD=E6=88=90=E6=9C=AC?= =?UTF-8?q?/=E4=B8=8A=E4=B8=80=E5=B9=B4=E5=BA=A6=E6=80=BB=E7=89=A9?= =?UTF-8?q?=E6=96=99=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=88=90=E6=9C=AC=E5=90=88?= =?UTF-8?q?=E8=AE=A1)*=E4=B8=8A=E4=B8=80=E5=B9=B4=E5=BA=A6=E7=9A=84?= =?UTF-8?q?=E6=80=BB=E7=BB=8F=E8=90=A5=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=88=90?= =?UTF-8?q?=E6=9C=AC=E5=90=88=E8=AE=A1=EF=BC=9B=E8=AE=A1=E7=AE=97=E8=AF=A5?= =?UTF-8?q?=E6=96=99=E5=8F=B7=E7=9A=84=E5=90=AB=E7=A8=8E=E7=BB=8F=E8=90=A5?= =?UTF-8?q?=E6=88=90=E6=9C=AC=20(RMB)=3D(=E8=AF=A5=E6=96=99=E5=8F=B7?= =?UTF-8?q?=E7=9A=84BOM=E7=89=A9=E6=96=99=E5=90=AB=E7=A8=8E=E6=80=BB?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=88=90=E6=9C=AC/=E4=B8=8A=E4=B8=80?= =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E6=80=BB=E7=89=A9=E6=96=99=E5=90=AB=E7=A8=8E?= =?UTF-8?q?=E6=88=90=E6=9C=AC=E5=90=88=E8=AE=A1)*=E4=B8=8A=E4=B8=80?= =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E7=9A=84=E6=80=BB=E7=BB=8F=E8=90=A5=E5=90=AB?= =?UTF-8?q?=E7=A8=8E=E6=88=90=E6=9C=AC=E5=90=88=E8=AE=A1=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20=E6=80=BB=E7=BB=8F=E8=90=A5=E6=88=90=E6=9C=AC->?= =?UTF-8?q?=E4=B8=8A=E4=B8=80=E5=B9=B4=E5=BA=A6=E6=80=BB=E7=BB=8F=E8=90=A5?= =?UTF-8?q?=E6=88=90=E6=9C=AC;=E6=80=BB=E7=89=A9=E6=96=99=E6=88=90?= =?UTF-8?q?=E6=9C=AC->=E4=B8=8A=E4=B8=80=E5=B9=B4=E5=BA=A6=E6=80=BB?= =?UTF-8?q?=E7=89=A9=E6=96=99=E6=88=90=E6=9C=AC;=20=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E7=9B=91=E5=90=AC=E5=8E=BB=E6=8E=89=E4=B9=8B=E5=89=8D=E5=9B=9B?= =?UTF-8?q?=E4=B8=AA=E6=88=90=E6=9C=AC=E7=9A=84=E7=9B=91=E5=90=AC=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E5=8A=A0=E4=B8=8AtotalOperatingCosts?= =?UTF-8?q?=E7=9B=91=E5=90=AC=E4=BA=8B=E4=BB=B6=20=E6=96=B0=E5=A2=9E=20cal?= =?UTF-8?q?culateOperatingCosts=E6=96=B9=E6=B3=95=EF=BC=8C=E9=80=9A?= =?UTF-8?q?=E8=BF=87=E8=BE=93=E5=85=A5=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=80=BB?= =?UTF-8?q?=E7=BB=8F=E8=90=A5=E6=88=90=E6=9C=AC(RMB)=EF=BC=8C=E5=92=8C?= =?UTF-8?q?=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=80=BB=E7=89=A9=E6=96=99=E6=88=90?= =?UTF-8?q?=E6=9C=AC(RMB)=E5=8A=A8=E6=80=81=E8=AE=A1=E7=AE=97=E4=B8=8D?= =?UTF-8?q?=E5=90=AB=E7=A8=8E=E7=BB=8F=E8=90=A5=E6=88=90=E6=9C=AC(RMB)?= =?UTF-8?q?=E3=80=81=E5=90=AB=E7=A8=8E=E7=BB=8F=E8=90=A5=E6=88=90=E6=9C=AC?= =?UTF-8?q?(RMB)=20=E9=94=80=E5=94=AE=E4=BC=B0=E4=BB=B7=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=A1=A8=E3=80=81=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E7=B1=BB=E5=92=8Cmapper.xml=E5=B1=82=E7=9A=84=E6=89=80?= =?UTF-8?q?=E6=9C=89=E6=96=B9=E6=B3=95=E6=96=B0=E5=A2=9E=20=E4=B8=8A?= =?UTF-8?q?=E4=B8=80=E5=B9=B4=E5=BA=A6=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=80=BB?= =?UTF-8?q?=E7=BB=8F=E8=90=A5=E6=88=90=E6=9C=AC=E5=AD=97=E6=AE=B5=20?= =?UTF-8?q?=E7=89=A9=E6=96=99=E8=AF=A6=E6=83=85=E5=AD=90=E8=A1=A8=E5=8C=85?= =?UTF-8?q?=E6=8B=ACform=E8=A1=A8=E5=8D=95=E7=9A=84=E6=95=B0=E6=8D=AE=20?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B8=8D=E5=90=AB=E7=A8=8E=E4=BA=BA=E5=B7=A5?= =?UTF-8?q?=E6=88=90=E6=9C=AC=E3=80=81=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=8E=A8?= =?UTF-8?q?=E5=B9=BF=E6=88=90=E6=9C=AC=E3=80=81=E4=B8=8D=E5=90=AB=E7=A8=8E?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E6=88=90=E6=9C=AC=E3=80=81=E4=B8=8D=E5=90=AB?= =?UTF-8?q?=E7=A8=8E=E7=AE=A1=E7=90=86=E6=88=90=E6=9C=AC=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=20=E4=B8=8A=E4=B8=80=E5=B9=B4=E5=BA=A6=E4=B8=8D?= =?UTF-8?q?=E5=90=AB=E7=A8=8E=E6=80=BB=E7=BB=8F=E8=90=A5=E6=88=90=E6=9C=AC?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=20=E4=BF=AE=E6=94=B9=20=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=94=80=E5=94=AE=E4=BC=B0=E4=BB=B7=E8=AF=A6=E6=83=85=E7=89=A9?= =?UTF-8?q?=E6=96=99=E4=BB=B7=E6=A0=BC=E5=88=97=E8=A1=A8=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=9A=E6=96=B0=E5=A2=9E=20=E7=BB=99=E4=B8=8A=E4=B8=80?= =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=80=BB=E7=BB=8F?= =?UTF-8?q?=E8=90=A5=E6=88=90=E6=9C=AC=E8=B5=8B=E5=80=BC=EF=BC=8C=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E4=B9=8B=E5=89=8D=E5=9B=9B=E4=B8=AA=E7=9A=84=E8=B5=8B?= =?UTF-8?q?=E5=80=BC=20=E4=BF=AE=E6=94=B9=20=E6=9F=A5=E8=AF=A2=E9=94=80?= =?UTF-8?q?=E5=94=AE=E4=BC=B0=E4=BB=B7Vo=E8=AF=A6=E6=83=85=E6=96=B9?= =?UTF-8?q?=E6=B3=95=EF=BC=9A=E6=96=B0=E5=A2=9E=20=E7=BB=99=E4=B8=8A?= =?UTF-8?q?=E4=B8=80=E5=B9=B4=E5=BA=A6=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=80=BB?= =?UTF-8?q?=E7=BB=8F=E8=90=A5=E6=88=90=E6=9C=AC=E8=B5=8B=E5=80=BC=EF=BC=8C?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B9=8B=E5=89=8D=E5=9B=9B=E4=B8=AA=E7=9A=84?= =?UTF-8?q?=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sales/domain/SalesEstimateDetail.java | 13 ++ .../VO/SalesEstimateDetailMaterialVo.java | 13 +- ...alesEstimateDetailMaterialServiceImpl.java | 5 +- .../impl/SalesEstimateServiceImpl.java | 6 +- .../sales/SalesEstimateDetailMapper.xml | 8 +- .../templates/sales/estimate/ceoAdd.html | 177 +++++++----------- 6 files changed, 94 insertions(+), 128 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/SalesEstimateDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/SalesEstimateDetail.java index 2544a160..b4b1b282 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/SalesEstimateDetail.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/SalesEstimateDetail.java @@ -135,6 +135,11 @@ public class SalesEstimateDetail extends BaseEntity /** 含税经营成本（RMB） */ private BigDecimal taxOperatingCosts; + + /** 上一年度不含税总经营成本(RMB) */ + private BigDecimal totalOperatingCosts; + + /** 销售估价详情物料子表集合 */ private List salesEstimateDetailMaterialList; @@ -427,6 +432,13 @@ public class SalesEstimateDetail extends BaseEntity return taxOperatingCosts; } + public BigDecimal getTotalOperatingCosts() { + return totalOperatingCosts; + } + + public void setTotalOperatingCosts(BigDecimal totalOperatingCosts) { + this.totalOperatingCosts = totalOperatingCosts; + } public List getSalesEstimateDetailMaterialList() { return salesEstimateDetailMaterialList; @@ -471,6 +483,7 @@ public class SalesEstimateDetail extends BaseEntity .append("noTaxMaterialCosts", getNoTaxMaterialCosts()) .append("noTaxOperatingCosts", getNoTaxOperatingCosts()) .append("taxOperatingCosts", getTaxOperatingCosts()) + .append("totalOperatingCosts", getTotalOperatingCosts()) .append("createBy", getCreateBy()) .append("createTime", getCreateTime()) .append("updateBy", getUpdateBy()) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/VO/SalesEstimateDetailMaterialVo.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/VO/SalesEstimateDetailMaterialVo.java index 0c6030f8..775dd7d3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/VO/SalesEstimateDetailMaterialVo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/sales/domain/VO/SalesEstimateDetailMaterialVo.java @@ -17,17 +17,8 @@ public class SalesEstimateDetailMaterialVo extends SalesEstimateDetailMaterial { /** 不含税开发成本（RMB） */ private BigDecimal noTaxDevelopCosts; - /** 不含税人工成本（RMB） */ - private BigDecimal noTaxLaborCosts; - - /** 不含税推广成本（RMB） */ - private BigDecimal noTaxPromotionalCosts; - - /** 不含税业务成本（RMB） */ - private BigDecimal noTaxBusinessCosts; - - /** 不含税管理成本（RMB） */ - private BigDecimal noTaxManagesCosts; + /** 上一年度不含税总经营成本(RMB) */ + private BigDecimal totalOperatingCosts; /** 不含税总物料成本（RMB） */ private BigDecimal noTaxMaterialCosts; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateDetailMaterialServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateDetailMaterialServiceImpl.java index 23b193bb..4452bc3a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateDetailMaterialServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateDetailMaterialServiceImpl.java @@ -92,16 +92,13 @@ public class SalesEstimateDetailMaterialServiceImpl implements ISalesEstimateDet private void setCosts(SalesEstimateDetailMaterialVo vo, SalesEstimateDetail salesEstimateDetail) { vo.setNoTaxMaterialCosts(salesEstimateDetail.getNoTaxMaterialCosts()); - vo.setNoTaxBusinessCosts(salesEstimateDetail.getNoTaxBusinessCosts()); vo.setNoTaxDevelopCosts(salesEstimateDetail.getNoTaxDevelopCosts()); - vo.setNoTaxLaborCosts(salesEstimateDetail.getNoTaxLaborCosts()); - vo.setNoTaxManagesCosts(salesEstimateDetail.getNoTaxManagesCosts()); vo.setNoTaxOperatingCosts(salesEstimateDetail.getNoTaxOperatingCosts()); vo.setTaxOperatingCosts(salesEstimateDetail.getTaxOperatingCosts()); - vo.setNoTaxPromotionalCosts(salesEstimateDetail.getNoTaxPromotionalCosts()); vo.setNoTaxServiceCosts(salesEstimateDetail.getNoTaxServiceCosts()); vo.setNoTaxShippingCosts(salesEstimateDetail.getNoTaxShippingCosts()); vo.setProfitRate(salesEstimateDetail.getProfitRate()); + vo.setTotalOperatingCosts(salesEstimateDetail.getTotalOperatingCosts()); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateServiceImpl.java index 26c15b03..764f3d23 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesEstimateServiceImpl.java @@ -213,10 +213,8 @@ public class SalesEstimateServiceImpl implements ISalesEstimateService salesEstimateDetailVo.setEProfitRate(salesEstimateTemplate.geteProfitRate()); salesEstimateDetailVo.setFProfitRate(salesEstimateTemplate.getfProfitRate()); - salesEstimateDetailVo.setNoTaxLaborCosts(salesEstimateTemplate.getNoTaxLaborCosts()); - salesEstimateDetailVo.setNoTaxBusinessCosts(salesEstimateTemplate.getNoTaxBusinessCosts()); - salesEstimateDetailVo.setNoTaxManagesCosts(salesEstimateTemplate.getNoTaxManagesCosts()); - salesEstimateDetailVo.setNoTaxPromotionalCosts(salesEstimateTemplate.getNoTaxPromotionalCosts()); + + salesEstimateDetailVo.setTotalOperatingCosts(salesEstimateTemplate.getTotalOperatingCosts()); salesEstimateDetailVo.setNoTaxMaterialCosts(salesEstimateTemplate.getNoTaxMaterialCosts()); return salesEstimateDetailVo; } diff --git a/ruoyi-admin/src/main/resources/mapper/sales/SalesEstimateDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/sales/SalesEstimateDetailMapper.xml index 02554362..e964afc5 100644 --- a/ruoyi-admin/src/main/resources/mapper/sales/SalesEstimateDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/sales/SalesEstimateDetailMapper.xml @@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -45,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select estimate_detail_id, sales_estimate_code, material_gear_position, usd_rate, profit_rate, material_no, material_name, material_type, material_photo_url, material_unit, material_brand, material_describe, material_process_method, material_num, no_tax_rmb, tax_rmb, all_no_tax_rmb, all_tax_rmb, tax_dollar, no_tax_dollar, all_tax_dollar, all_no_tax_dollar, no_tax_shipping_costs, no_tax_service_costs, no_tax_develop_costs, no_tax_labor_costs, no_tax_promotional_costs, no_tax_business_costs, no_tax_manages_costs, no_tax_material_costs, no_tax_operating_costs, tax_operating_costs, create_by, create_time, update_by, update_time, remark from sales_estimate_detail + select estimate_detail_id, sales_estimate_code, material_gear_position, usd_rate, profit_rate, material_no, material_name, material_type, material_photo_url, material_unit, material_brand, material_describe, material_process_method, material_num, no_tax_rmb, tax_rmb, all_no_tax_rmb, all_tax_rmb, tax_dollar, no_tax_dollar, all_tax_dollar, all_no_tax_dollar, no_tax_shipping_costs, no_tax_service_costs, no_tax_develop_costs, no_tax_labor_costs, no_tax_promotional_costs, no_tax_business_costs, no_tax_manages_costs, no_tax_material_costs, no_tax_operating_costs, tax_operating_costs, total_operating_costs, create_by, create_time, update_by, update_time, remark from sales_estimate_detail '; formHtml += ''; - formHtml += '

总经营成本

'; + formHtml += '

上一年度总经营成本

'; formHtml += '
'; - formHtml += ''; - formHtml += ''; + formHtml += ''; + formHtml += ''; formHtml += '
'; - formHtml += '
'; - formHtml += ''; - formHtml += ''; - formHtml += '
'; - formHtml += '
'; - formHtml += ''; - formHtml += ''; - formHtml += '
'; - formHtml += '
'; - formHtml += ''; - formHtml += ''; - formHtml += '
'; - formHtml += '

总物料成本

'; + formHtml += '

上一年度总物料成本

'; formHtml += '
'; formHtml += ''; formHtml += ''; @@ -669,17 +617,8 @@ // 根据 input 的 id 或 name 进行相应的计算 switch (inputId) { - case 'noTaxLaborCosts' + index: - calculateOperatingCosts(inputValue, 'noTaxLaborCosts'); - break; - case 'noTaxPromotionalCosts' + index: - calculateOperatingCosts(inputValue, 'noTaxPromotionalCosts'); - break; - case 'noTaxBusinessCosts' + index: - calculateOperatingCosts(inputValue, 'noTaxBusinessCosts'); - break; - case 'noTaxManagesCosts' + index: - calculateOperatingCosts(inputValue, 'noTaxManagesCosts'); + case 'totalOperatingCosts' + index: + calculateOperatingCosts(inputValue, 'totalOperatingCosts'); break; case 'noTaxMaterialCosts' + index: updateMaterialCosts(inputValue); @@ -692,21 +631,21 @@ }); function calculateOperatingCosts(value, costType) { - var noAllTaxOperatingCosts = 0; + // var totalOperatingCosts = 0; var allNoTaxPurchaseRmb = 0; var allTaxPurchaseRmb = 0; - // 获取所有相关的不含税成本 - ['noTaxLaborCosts', 'noTaxPromotionalCosts', 'noTaxBusinessCosts', 'noTaxManagesCosts'].forEach(function(cost) { - var currentCost = parseFloat($form.find('#' + cost + index).val()); - noAllTaxOperatingCosts += currentCost; - }); + // // 获取所有相关的不含税成本 + // ['noTaxLaborCosts', 'noTaxPromotionalCosts', 'noTaxBusinessCosts', 'noTaxManagesCosts'].forEach(function(cost) { + // var currentCost = parseFloat($form.find('#' + cost + index).val()); + // noAllTaxOperatingCosts += currentCost; + // }); - // 更新不含税总经营成本 - $form.find('#noAllTaxOperatingCosts' + index).val(noAllTaxOperatingCosts.toFixed(2)); + // 更新上一年度不含税总经营成本 + var totalOperatingCosts = parseFloat($form.find('#totalOperatingCosts' + index).val()); - // 计算含税总经营成本 - var allTaxOperatingCosts = noAllTaxOperatingCosts * 1.13; + // 计算上一年度含税总经营成本 + var allTaxOperatingCosts = totalOperatingCosts * 1.13; $form.find('#allTaxOperatingCosts' + index).val(allTaxOperatingCosts.toFixed(2)); // 遍历数据集计算不含税采购成本和含税采购成本 @@ -720,13 +659,16 @@ }); }); - // 该料号的不含税经营成本 - var noTaxMaterialCosts = parseFloat($form.find('#noTaxMaterialCosts' + index).val()); - var noTaxOperatingCosts = (allNoTaxPurchaseRmb / noTaxMaterialCosts) * noAllTaxOperatingCosts; + + var noTaxMaterialCosts = parseFloat($form.find('#noTaxMaterialCosts' + index).val());//不含税总物料成本 + var allTaxMaterialCosts = noTaxMaterialCosts * 1.13;//含税总物料成本 + + // 该料号的不含税经营成本(RMB)=(该料号的BOM物料不含税总采购成本/上一年度总物料不含税成本合计)*上一年度的总经营不含税成本合计 + var noTaxOperatingCosts = (allNoTaxPurchaseRmb / noTaxMaterialCosts) * totalOperatingCosts; $form.find('#noTaxOperatingCosts' + index).val(noTaxOperatingCosts.toFixed(2)); - // 该料号的含税经营成本 - var taxOperatingCosts = (allTaxPurchaseRmb / noTaxMaterialCosts) * allTaxOperatingCosts; + // 该料号含税经营成本(RMB)=(该料号的BOM物料含税总采购成本/上一年度总物料含税成本合计)*上一年度的总经营含税成本合计 + var taxOperatingCosts = (allTaxPurchaseRmb / allTaxMaterialCosts) * allTaxOperatingCosts; $form.find('#taxOperatingCosts' + index).val(taxOperatingCosts.toFixed(2)); } @@ -747,14 +689,33 @@ }); }); - // 更新不含税经营成本 - var noAllTaxOperatingCosts = parseFloat($form.find('#noAllTaxOperatingCosts' + index).val()); - var noTaxOperatingCosts = (noTaxPurchaseRmb / value) * noAllTaxOperatingCosts; + // // 更新不含税经营成本 + // var noAllTaxOperatingCosts = parseFloat($form.find('#noAllTaxOperatingCosts' + index).val()); + // var noTaxOperatingCosts = (noTaxPurchaseRmb / value) * noAllTaxOperatingCosts; + // $form.find('#noTaxOperatingCosts' + index).val(noTaxOperatingCosts.toFixed(2)); + // + // // 更新含税经营成本 + // var taxOperatingCosts = (taxPurchaseRmb / value) * noAllTaxOperatingCosts; + // $form.find('#taxOperatingCosts' + index).val(taxOperatingCosts.toFixed(2)); + + // 更新上一年度不含税总经营成本 + var totalOperatingCosts = parseFloat($form.find('#totalOperatingCosts' + index).val()); + + // 计算上一年度含税总经营成本 + var allTaxOperatingCosts = totalOperatingCosts * 1.13; + $form.find('#allTaxOperatingCosts' + index).val(allTaxOperatingCosts.toFixed(2)); + + // 该料号的不含税经营成本(RMB)=(该料号的BOM物料不含税总采购成本/上一年度总物料不含税成本合计)*上一年度的总经营不含税成本合计 + var noTaxMaterialCosts = parseFloat($form.find('#noTaxMaterialCosts' + index).val()); + var allTaxMaterialCosts = noTaxMaterialCosts * 1.13; + var noTaxOperatingCosts = (allNoTaxPurchaseRmb / noTaxMaterialCosts) * totalOperatingCosts; $form.find('#noTaxOperatingCosts' + index).val(noTaxOperatingCosts.toFixed(2)); - // 更新含税经营成本 - var taxOperatingCosts = (taxPurchaseRmb / value) * noAllTaxOperatingCosts; + // 该料号含税经营成本(RMB)=(该料号的BOM物料含税总采购成本/上一年度总物料含税成本合计)*上一年度的总经营含税成本合计 + var taxOperatingCosts = (allTaxPurchaseRmb / allTaxMaterialCosts) * allTaxOperatingCosts; $form.find('#taxOperatingCosts' + index).val(taxOperatingCosts.toFixed(2)); + + } } });