diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/controller/SalesEstimateController.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/controller/SalesEstimateController.java
index 6f17d25e..1146e450 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/sales/controller/SalesEstimateController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/sales/controller/SalesEstimateController.java
@@ -170,7 +170,6 @@ public class SalesEstimateController extends BaseController
 
 
 
-
     /**
      * 加载新增销售估价-工程 子表物料选择弹窗
      */
@@ -197,10 +196,8 @@ public class SalesEstimateController extends BaseController
 
 
 
-
-
     /**
-     * 新增Bom销售估价-采购
+     * 新增采购成本 销售估价-采购
      */
     @GetMapping("/purchaseAdd/{salesEstimateId}")
     public String purchaseAdd(@PathVariable("salesEstimateId") Long salesEstimateId, ModelMap map)
@@ -227,6 +224,33 @@ public class SalesEstimateController extends BaseController
     }
 
 
+    /**
+     * 新增经营成本 销售估价-总经理
+     */
+    @GetMapping("/ceoAdd/{salesEstimateId}")
+    public String ceoAdd(@PathVariable("salesEstimateId") Long salesEstimateId, ModelMap map)
+    {
+        SalesEstimate salesEstimate = salesEstimateService.selectSalesEstimateById(salesEstimateId);
+        map.put("salesEstimate", salesEstimate);
+        SalesEstimateDetailVo salesEstimateDetailVo = salesEstimateService.getSalesEstimateDetailVo();
+        map.put("salesEstimateDetailVo",salesEstimateDetailVo);
+        return prefix + "/ceoAdd";
+    }
+
+
+
+    /**
+     * 修改保存销售估价-总经理
+     */
+    @RequiresPermissions("sales:estimate:ceoAdd")
+    @Log(title = "销售估价", businessType = BusinessType.UPDATE)
+    @PostMapping("/ceoAdd")
+    @ResponseBody
+    public AjaxResult ceoAddSave(@RequestBody SalesEstimate salesEstimate)
+    {
+        return toAjax(salesEstimateService.ceoAddSalesEstimate(salesEstimate));
+    }
+
 
     /**
      * 加载新增销售估价 物料选择弹窗
@@ -238,7 +262,6 @@ public class SalesEstimateController extends BaseController
     }
 
 
-
     /**
      * 新增销售估价 物料选择
      */
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 b3786444..0c6030f8 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
@@ -37,4 +37,26 @@ public class SalesEstimateDetailMaterialVo extends SalesEstimateDetailMaterial {
 
     /** 含税经营成本（RMB） */
     private BigDecimal taxOperatingCosts;
+
+    /** 利润率 */
+    private BigDecimal profitRate;
+
+    /** A挡利润率 */
+    private BigDecimal aProfitRate;
+
+    /** B挡利润率 */
+    private BigDecimal bProfitRate;
+
+    /** C挡利润率 */
+    private BigDecimal cProfitRate;
+
+    /** D挡利润率 */
+    private BigDecimal dProfitRate;
+
+    /** E挡利润率 */
+    private BigDecimal eProfitRate;
+
+    /** F挡利润率 */
+    private BigDecimal fProfitRate;
+
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/ISalesEstimateService.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/ISalesEstimateService.java
index 51c46d8e..ff6ae112 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/ISalesEstimateService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/ISalesEstimateService.java
@@ -93,4 +93,11 @@ public interface ISalesEstimateService
      * @return
      */
     int purchaseAddSalesEstimate(SalesEstimate salesEstimate);
+
+    /**
+     * 总经理添加销售估价
+     * @param salesEstimate
+     * @return
+     */
+    int ceoAddSalesEstimate(SalesEstimate salesEstimate);
 }
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 0d377576..506cd440 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
@@ -95,9 +95,12 @@ public class SalesEstimateDetailMaterialServiceImpl implements ISalesEstimateDet
         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());
+
     }
 
     /**
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 cfc59d34..63257e2b 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
@@ -1,5 +1,7 @@
 package com.ruoyi.sales.service.impl;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.Date;
 import java.util.List;
 
@@ -272,4 +274,229 @@ public class SalesEstimateServiceImpl implements ISalesEstimateService
 
         return salesEstimateMapper.updateSalesEstimate(salesEstimate);
     }
+
+    /**
+     * 总经理添加销售估价
+     *
+     * @param salesEstimate 销售估价
+     * @return 结果
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public int ceoAddSalesEstimate(SalesEstimate salesEstimate) {
+        String loginName = ShiroUtils.getLoginName(); // 获取当前登录用户的名称
+        salesEstimate.setUpdateBy(loginName); // 设置更新人的信息
+        salesEstimate.setUpdateTime(new Date()); // 设置更新时间
+        salesEstimate.setEstimateStatus("3"); // 设置销售估价的状态
+
+        BigDecimal usdRate = salesEstimate.getUsdRate(); // 获取美元汇率
+        List<SalesEstimateDetail> salesEstimateDetailList = salesEstimate.getSalesEstimateDetailList(); // 获取销售估价详情列表
+
+        for (SalesEstimateDetail salesEstimateDetail : salesEstimateDetailList) { // 遍历销售估价详情列表
+            BigDecimal noTaxLaborCosts = salesEstimateDetail.getNoTaxLaborCosts(); // 获取不含税的人工成本
+            BigDecimal noTaxPromotionalCosts = salesEstimateDetail.getNoTaxPromotionalCosts(); // 获取不含税的推广成本
+            BigDecimal noTaxBusinessCosts = salesEstimateDetail.getNoTaxBusinessCosts(); // 获取不含税的业务成本
+            BigDecimal noTaxManagesCosts = salesEstimateDetail.getNoTaxManagesCosts(); // 获取不含税的管理成本
+            BigDecimal noTaxMaterialCosts = salesEstimateDetail.getNoTaxMaterialCosts(); // 获取不含税的物料成本
+            BigDecimal profitRate = salesEstimateDetail.getProfitRate().divide(BigDecimal.valueOf(100)); // 获取利润率并转换为小数形式
+            Long materialNum = salesEstimateDetail.getMaterialNum(); // 获取物料数量
+
+            // 计算不含税总经营成本
+            BigDecimal noAllTaxOperatingCosts = calculateNoTaxOperatingCosts(
+                    noTaxLaborCosts, noTaxPromotionalCosts, noTaxBusinessCosts, noTaxManagesCosts);
+
+            // 计算含税总经营成本
+            BigDecimal allTaxOperatingCosts = calculateTaxOperatingCosts(noAllTaxOperatingCosts);
+
+            // 计算总含税物料成本
+            BigDecimal taxMaterialCosts = calculateTaxMaterialCosts(noTaxMaterialCosts);
+
+            List<SalesEstimateDetailMaterial> estimateDetailMaterialList = salesEstimate.getEstimateDetailMaterialList(); // 获取物料详情列表
+            // 计算物料总不含税采购成本
+            BigDecimal totalNoTaxPurchaseRmb = calculateTotalNoTaxPurchaseRmb(estimateDetailMaterialList);
+            // 计算物料总含税采购成本
+            BigDecimal totalTaxPurchaseRmb = calculateTotalTaxPurchaseRmb(estimateDetailMaterialList);
+
+            // 计算不含税经营成本(RMB)，并保留两位小数
+            BigDecimal noTaxOperatingCost = calculateNoTaxOperatingCost(totalNoTaxPurchaseRmb, noTaxMaterialCosts, noAllTaxOperatingCosts)
+                    .setScale(2, RoundingMode.HALF_UP);
+            // 计算含税经营成本(RMB)，并保留两位小数
+            BigDecimal taxOperatingCost = calculateTaxOperatingCost(totalTaxPurchaseRmb, taxMaterialCosts, allTaxOperatingCosts)
+                    .setScale(2, RoundingMode.HALF_UP);
+
+            // 计算不含税料号估价成本，并保留两位小数
+            BigDecimal noTaxEstimateCost = calculateNoTaxEstimateCost(totalNoTaxPurchaseRmb, noAllTaxOperatingCosts, noTaxMaterialCosts)
+                    .setScale(2, RoundingMode.HALF_UP);
+            // 计算含税料号估价成本，并保留两位小数
+            BigDecimal taxEstimateCost = calculateTaxEstimateCost(totalTaxPurchaseRmb, allTaxOperatingCosts, taxMaterialCosts)
+                    .setScale(2, RoundingMode.HALF_UP);
+
+            // 计算不含税单价(RMB)，并保留两位小数
+            BigDecimal noTaxUnitPriceRmb = calculateNoTaxUnitPriceRmb(noTaxEstimateCost, profitRate)
+                    .setScale(2, RoundingMode.HALF_UP);
+            // 计算含税单价(RMB)，并保留两位小数
+            BigDecimal taxUnitPriceRmb = calculateTaxUnitPriceRmb(taxEstimateCost, profitRate)
+                    .setScale(2, RoundingMode.HALF_UP);
+
+            // 计算不含税总价(RMB)，并保留两位小数
+            BigDecimal allNoTaxRmb = calculateAllNoTaxRmb(noTaxUnitPriceRmb, materialNum)
+                    .setScale(2, RoundingMode.HALF_UP);
+            // 计算含税总价(RMB)，并保留两位小数
+            BigDecimal allTaxRmb = calculateAllTaxRmb(taxUnitPriceRmb, materialNum)
+                    .setScale(2, RoundingMode.HALF_UP);
+
+            // 计算不含税单价(美元)，并保留两位小数
+            BigDecimal noTaxUnitPriceDollar = calculateNoTaxUnitPriceDollar(noTaxUnitPriceRmb, usdRate)
+                    .setScale(2, RoundingMode.HALF_UP);
+            // 计算含税单价(美元)，并保留两位小数
+            BigDecimal taxUnitPriceDollar = calculateTaxUnitPriceDollar(taxUnitPriceRmb, usdRate)
+                    .setScale(2, RoundingMode.HALF_UP);
+
+            // 计算不含税总价(美元)，并保留两位小数
+            BigDecimal allNoTaxDollar = calculateAllNoTaxDollar(noTaxUnitPriceDollar, materialNum)
+                    .setScale(2, RoundingMode.HALF_UP);
+            // 计算含税总价(美元)，并保留两位小数
+            BigDecimal allTaxDollar = calculateAllTaxDollar(taxUnitPriceDollar, materialNum)
+                    .setScale(2, RoundingMode.HALF_UP);
+
+            // 更新 SalesEstimateDetail 对象中的值
+            updateSalesEstimateDetail(salesEstimateDetail,
+                    noTaxOperatingCost, taxOperatingCost,
+                    noTaxUnitPriceRmb, taxUnitPriceRmb,
+                    allNoTaxRmb, allTaxRmb,
+                    noTaxUnitPriceDollar, taxUnitPriceDollar,
+                    allNoTaxDollar, allTaxDollar);
+
+            // 更新销售估价详情数据
+            int updateSalesEstimateDetailResult = salesEstimateDetailMapper.updateSalesEstimateDetail(salesEstimateDetail);
+            if (updateSalesEstimateDetailResult <= 0) {
+                throw new BusinessException("更新销售估价详情数据失败");
+            }
+        }
+
+        // 更新销售估价数据
+        return salesEstimateMapper.updateSalesEstimate(salesEstimate);
+    }
+
+    // 计算不含税总经营成本
+    private BigDecimal calculateNoTaxOperatingCosts(BigDecimal noTaxLaborCosts, BigDecimal noTaxPromotionalCosts, BigDecimal noTaxBusinessCosts, BigDecimal noTaxManagesCosts) {
+        return noTaxLaborCosts.add(noTaxPromotionalCosts).add(noTaxBusinessCosts).add(noTaxManagesCosts);
+    }
+
+    // 计算含税总经营成本
+    private BigDecimal calculateTaxOperatingCosts(BigDecimal noAllTaxOperatingCosts) {
+        return noAllTaxOperatingCosts.multiply(BigDecimal.valueOf(1.13));
+    }
+
+    // 计算总含税物料成本
+    private BigDecimal calculateTaxMaterialCosts(BigDecimal noTaxMaterialCosts) {
+        return noTaxMaterialCosts.multiply(BigDecimal.valueOf(1.13));
+    }
+
+    // 计算物料总不含税采购成本
+    private BigDecimal calculateTotalNoTaxPurchaseRmb(List<SalesEstimateDetailMaterial> estimateDetailMaterialList) {
+        BigDecimal totalNoTaxPurchaseRmb = BigDecimal.ZERO;
+        for (SalesEstimateDetailMaterial detailMaterial : estimateDetailMaterialList) {
+            BigDecimal noTaxPurchaseRmb = detailMaterial.getNoTaxPurchaseRmb(); // 获取不含税采购单价
+            Long useNum = detailMaterial.getUseNum(); // 获取用量
+            totalNoTaxPurchaseRmb = totalNoTaxPurchaseRmb.add(noTaxPurchaseRmb.multiply(new BigDecimal(useNum))); // 计算总不含税采购成本
+        }
+        return totalNoTaxPurchaseRmb;
+    }
+
+    // 计算物料总含税采购成本
+    private BigDecimal calculateTotalTaxPurchaseRmb(List<SalesEstimateDetailMaterial> estimateDetailMaterialList) {
+        BigDecimal totalTaxPurchaseRmb = BigDecimal.ZERO;
+        for (SalesEstimateDetailMaterial detailMaterial : estimateDetailMaterialList) {
+            BigDecimal taxPurchaseRmb = detailMaterial.getTaxPurchaseRmb(); // 获取含税采购单价
+            Long useNum = detailMaterial.getUseNum(); // 获取用量
+            totalTaxPurchaseRmb = totalTaxPurchaseRmb.add(taxPurchaseRmb.multiply(new BigDecimal(useNum))); // 计算总含税采购成本
+        }
+        return totalTaxPurchaseRmb;
+    }
+
+    // 计算不含税经营成本(RMB)
+    private BigDecimal calculateNoTaxOperatingCost(BigDecimal totalNoTaxPurchaseRmb, BigDecimal noTaxMaterialCosts, BigDecimal noAllTaxOperatingCosts) {
+        return totalNoTaxPurchaseRmb.divide(noTaxMaterialCosts, 2, RoundingMode.HALF_UP)
+                .multiply(noAllTaxOperatingCosts);
+    }
+
+    // 计算含税经营成本(RMB)
+    private BigDecimal calculateTaxOperatingCost(BigDecimal totalTaxPurchaseRmb, BigDecimal taxMaterialCosts, BigDecimal allTaxOperatingCosts) {
+        return totalTaxPurchaseRmb.divide(taxMaterialCosts, 2, RoundingMode.HALF_UP)
+                .multiply(allTaxOperatingCosts);
+    }
+
+    // 计算不含税料号估价成本
+    private BigDecimal calculateNoTaxEstimateCost(BigDecimal totalNoTaxPurchaseRmb, BigDecimal noAllTaxOperatingCosts, BigDecimal noTaxMaterialCosts) {
+        return totalNoTaxPurchaseRmb.add(noAllTaxOperatingCosts)
+                .add(totalNoTaxPurchaseRmb.divide(noTaxMaterialCosts, 2, RoundingMode.HALF_UP)
+                        .multiply(noAllTaxOperatingCosts));
+    }
+
+    // 计算含税料号估价成本
+    private BigDecimal calculateTaxEstimateCost(BigDecimal totalTaxPurchaseRmb, BigDecimal allTaxOperatingCosts, BigDecimal taxMaterialCosts) {
+        return totalTaxPurchaseRmb.add(allTaxOperatingCosts)
+                .add(totalTaxPurchaseRmb.divide(taxMaterialCosts, 2, RoundingMode.HALF_UP)
+                        .multiply(allTaxOperatingCosts));
+    }
+
+    // 计算不含税单价(RMB)
+    private BigDecimal calculateNoTaxUnitPriceRmb(BigDecimal noTaxEstimateCost, BigDecimal profitRate) {
+        return noTaxEstimateCost.divide(BigDecimal.ONE.subtract(profitRate), 2, RoundingMode.HALF_UP);
+    }
+
+    // 计算含税单价(RMB)
+    private BigDecimal calculateTaxUnitPriceRmb(BigDecimal taxEstimateCost, BigDecimal profitRate) {
+        return taxEstimateCost.divide(BigDecimal.ONE.subtract(profitRate), 2, RoundingMode.HALF_UP);
+    }
+
+    // 计算不含税总价(RMB)
+    private BigDecimal calculateAllNoTaxRmb(BigDecimal noTaxUnitPriceRmb, Long materialNum) {
+        return noTaxUnitPriceRmb.multiply(new BigDecimal(materialNum));
+    }
+
+    // 计算含税总价(RMB)
+    private BigDecimal calculateAllTaxRmb(BigDecimal taxUnitPriceRmb, Long materialNum) {
+        return taxUnitPriceRmb.multiply(new BigDecimal(materialNum));
+    }
+
+    // 计算不含税单价(美元)
+    private BigDecimal calculateNoTaxUnitPriceDollar(BigDecimal noTaxUnitPriceRmb, BigDecimal usdRate) {
+        return noTaxUnitPriceRmb.divide(usdRate, 2, RoundingMode.HALF_UP);
+    }
+
+    // 计算含税单价(美元)
+    private BigDecimal calculateTaxUnitPriceDollar(BigDecimal taxUnitPriceRmb, BigDecimal usdRate) {
+        return taxUnitPriceRmb.divide(usdRate, 2, RoundingMode.HALF_UP);
+    }
+
+    // 计算不含税总价(美元)
+    private BigDecimal calculateAllNoTaxDollar(BigDecimal noTaxUnitPriceDollar, Long materialNum) {
+        return noTaxUnitPriceDollar.multiply(new BigDecimal(materialNum));
+    }
+
+    // 计算含税总价(美元)
+    private BigDecimal calculateAllTaxDollar(BigDecimal taxUnitPriceDollar, Long materialNum) {
+        return taxUnitPriceDollar.multiply(new BigDecimal(materialNum));
+    }
+
+    // 更新 SalesEstimateDetail 对象中的值
+    private void updateSalesEstimateDetail(SalesEstimateDetail salesEstimateDetail,
+                                           BigDecimal noTaxOperatingCost, BigDecimal taxOperatingCost,
+                                           BigDecimal noTaxUnitPriceRmb, BigDecimal taxUnitPriceRmb,
+                                           BigDecimal allNoTaxRmb, BigDecimal allTaxRmb,
+                                           BigDecimal noTaxUnitPriceDollar, BigDecimal taxUnitPriceDollar,
+                                           BigDecimal allNoTaxDollar, BigDecimal allTaxDollar) {
+        salesEstimateDetail.setNoTaxOperatingCosts(noTaxOperatingCost);
+        salesEstimateDetail.setTaxOperatingCosts(taxOperatingCost);
+        salesEstimateDetail.setNoTaxRmb(noTaxUnitPriceRmb);
+        salesEstimateDetail.setTaxRmb(taxUnitPriceRmb);
+        salesEstimateDetail.setAllNoTaxRmb(allNoTaxRmb);
+        salesEstimateDetail.setAllTaxRmb(allTaxRmb);
+        salesEstimateDetail.setNoTaxDollar(noTaxUnitPriceDollar);
+        salesEstimateDetail.setTaxDollar(taxUnitPriceDollar);
+        salesEstimateDetail.setAllNoTaxDollar(allNoTaxDollar);
+        salesEstimateDetail.setAllTaxDollar(allTaxDollar);
+    }
 }
diff --git a/ruoyi-admin/src/main/resources/templates/sales/estimate/ceoAdd.html b/ruoyi-admin/src/main/resources/templates/sales/estimate/ceoAdd.html
new file mode 100644
index 00000000..77dbf266
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/sales/estimate/ceoAdd.html
@@ -0,0 +1,884 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('总经理新增销售估价')" />
+    <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-estimate-add" th:object="${salesEstimate}">
+        <input name="salesEstimateId" th:field="*{salesEstimateId}" type="hidden">
+        <div class="form-group">
+            <label class="col-sm-4 control-label">业务员：</label>
+            <div class="col-sm-8">
+                <input name="businessMembers" id="businessMembers" th:field="*{businessMembers}" class="form-control" type="text" readonly>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-4 control-label">定价日期：</label>
+            <div class="col-sm-8">
+                <div class="input-group date">
+                    <input name="pricingDate" th:value="${#dates.format(salesEstimate.pricingDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                </div>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-4 control-label">客户ID：</label>
+            <div class="col-sm-8">
+                <input name="enterpriseCode" th:field="*{enterpriseCode}" class="form-control" type="text" readonly>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-4 control-label">客户名称：</label>
+            <div class="col-sm-8">
+                <input name="enterpriseName" th:field="*{enterpriseName}" class="form-control" type="text" readonly>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label class="col-sm-4 control-label is-required">估价币种：</label>
+            <div class="col-sm-8">
+                <select name="commonCurrency" id="commonCurrency_add" class="form-control m-b" th:with="type=${@dict.getType('sys_common_currency')}" disabled>
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" required></option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-4 control-label is-required">美元汇率：</label>
+            <div class="col-sm-8">
+                <div class="input-group">
+                    <input name="usdRate" th:field="*{usdRate}" id="usdRate_add" class="form-control" type="text" required readonly>
+                    <span class="input-group-addon">%</span>
+                </div>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label class="col-sm-4 control-label">备注信息：</label>
+            <div class="col-sm-8">
+                <input name="remark" th:field="*{remark}" class="form-control" type="text">
+            </div>
+        </div>
+
+        <div class="container">
+            <h4 class="form-header h4">计算</h4>
+            <div class="col-xs-12 form-row">
+                <label class=" col-sm-2">物料合计：</label><input class="col-sm-4" th:field="*{materialSum}" name="materialSum" id="materialSum_add" type="number" readonly/>
+                <label class=" col-sm-2">数量合计：</label><input class="col-sm-4" th:field="*{enterpriseSum}" name="enterpriseSum" id="enterpriseSum_add" type="number" readonly/>
+            </div>
+            <div class="col-xs-12 form-row">
+                <label class="col-sm-2"> 不含税单价(RMB):</label><input placeholder="RMB" class="col-sm-4" name="noTaxRmb" id="noTaxRmb_add" type="number" readonly/>
+                <label class="col-sm-2"> 不含税总价(RMB):</label><input placeholder="RMB" class="col-sm-4" name="allNoTaxRmb" id="allNoTaxRmb_add" type="number" readonly/>
+            </div>
+            <div class="col-xs-12 form-row">
+                <label class="col-sm-2"> 含税单价(RMB):</label><input placeholder="RMB" class="col-sm-4" name="taxRmb" id="taxRmb_add" type="number" readonly/>
+                <label class="col-sm-2"> 含税总价(RMB):</label><input placeholder="RMB" class="col-sm-4" name="allTaxRmb" id="allTaxRmb_add" type="number" readonly/>
+            </div>
+            <div class="col-xs-12">
+                <label class="col-sm-2">不含税单价(USD):</label><input placeholder="美元" class="col-sm-4" name="noTaxDollar" id="noTaxDollar_add" type="number" readonly/>
+                <label class="col-sm-2">不含税总价(USD):</label><input placeholder="美元" class="col-sm-4" name="allNoTaxDollar" id="allNoTaxDollar_add" type="number" readonly/>
+            </div>
+            <div class="col-xs-12 form-row">
+                <label class="col-sm-2">含税单价(USD):</label><input placeholder="美元" class="col-sm-4" name="taxDollar" id="taxDollar_add" type="number" readonly/>
+                <label class="col-sm-2">含税总价(USD):</label><input placeholder="美元" class="col-sm-4" name="allTaxDollar" id="allTaxDollar_add" type="number" readonly/>
+            </div>
+        </div>
+
+    </form>
+
+    <div class="container">
+        <div class="row">
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: datetimepicker-js" />
+<th:block th:include="include::bootstrap-table-editable-js"/>
+<script th:inline="javascript">
+    var prefix = ctx + "sales/estimate"
+    var materialGearPositionDatas = [[${@dict.getType('material_gear_position')}]];
+    var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
+    var processMethodDatas = [[${@dict.getType('processMethod')}]];
+
+    var salesEstimateDetailVo = [[${salesEstimateDetailVo}]];
+    var salesEstimate = [[${salesEstimate}]];
+
+    $("#form-estimate-add").validate({
+        focusCleanup: true
+    });
+
+    function submitHandler() {
+        if ($.validate.form()) {
+            // 获取表单数据
+            const estimateData = $("#form-estimate-add").serializeArray().reduce((obj, item) => {
+                obj[item.name] = item.value;
+                return obj;
+            }, {});
+
+            //设置一个标志来跟踪任何错误
+            var hasError = false;
+
+            // 销售估价物料
+            var estimateMaterialTable = $('#bootstrap-table').bootstrapTable('getData');
+
+
+            // 将表数据转换成与estimateData格式一致的数组
+            var estimateMaterialDataList = estimateMaterialTable.map(function(item) {
+                // 根据实际字段名调整
+                return {
+                    "estimateDetailId": item.estimateDetailId,
+                    "materialNum": item.materialNum,
+                    "noTaxDevelopCosts": null, // 初始化为 null 或 0
+                    "noTaxShippingCosts": null,
+                    "noTaxServiceCosts": null,
+                    "noTaxLaborCosts": null,
+                    "noTaxPromotionalCosts": null,
+                    "noTaxBusinessCosts": null,
+                    "noTaxManagesCosts": null,
+                    "noTaxMaterialCosts": null,
+                    "noTaxOperatingCosts": null,
+                    "taxOperatingCosts": null,
+                    "profitRate": null,
+                    // ...其他字段
+                };
+            });
+
+            $('.form-inline[data-index]').each(function () {
+                var index = $(this).data('index'); // 获取数据索引
+                var noTaxDevelopCosts = $('#noTaxDevelopCosts' + index).val();
+                var noTaxShippingCosts = $('#noTaxShippingCosts' + index).val();
+                var noTaxServiceCosts = $('#noTaxServiceCosts' + index).val();
+                var noTaxLaborCosts = $('#noTaxLaborCosts' + index).val();
+                var noTaxPromotionalCosts = $('#noTaxPromotionalCosts' + index).val();
+                var noTaxBusinessCosts = $('#noTaxBusinessCosts' + index).val();
+                var noTaxManagesCosts = $('#noTaxManagesCosts' + index).val();
+                var noTaxMaterialCosts = $('#noTaxMaterialCosts' + index).val();
+                var noTaxOperatingCosts = $('#noTaxOperatingCosts' + index).val();
+                var taxOperatingCosts = $('#taxOperatingCosts' + index).val();
+                var profitRate = $('#profitRate' + index).val(); // 添加利润率的验证
+
+                // 检查成本值是否为空或仅为0
+                if (!noTaxDevelopCosts && noTaxDevelopCosts !== '0') {
+                    $.modal.alertWarning("开发成本不能为空，请填写第 " + (parseInt(index) + 1) + " 行的开发成本");
+                    hasError = true;
+                    return; // 退出循环，阻止进一步处理
+                }
+                if (!noTaxShippingCosts && noTaxShippingCosts !== '0') {
+                    $.modal.alertWarning("运输成本不能为空，请填写第 " + (parseInt(index) + 1) + " 行的运输成本");
+                    hasError = true;
+                    return; // 退出循环，阻止进一步处理
+                }
+                if (!noTaxServiceCosts && noTaxServiceCosts !== '0') {
+                    $.modal.alertWarning("服务成本不能为空，请填写第 " + (parseInt(index) + 1) + " 行的服务成本");
+                    hasError = true;
+                    return; // 退出循环，阻止进一步处理
+                }
+
+                if (!noTaxLaborCosts && noTaxLaborCosts !== '0') {
+                    $.modal.alertWarning("人工成本不能为空，请填写第 " + (parseInt(index) + 1) + " 行的人工成本");
+                    hasError = true;
+                    return; // 退出循环，阻止进一步处理
+                }
+                if (!noTaxPromotionalCosts && noTaxPromotionalCosts !== '0') {
+                    $.modal.alertWarning("推广成本不能为空，请填写第 " + (parseInt(index) + 1) + " 行的推广成本");
+                    hasError = true;
+                    return; // 退出循环，阻止进一步处理
+                }
+                if (!noTaxBusinessCosts && noTaxBusinessCosts !== '0') {
+                    $.modal.alertWarning("业务成本不能为空，请填写第 " + (parseInt(index) + 1) + " 行的业务成本");
+                    hasError = true;
+                    return; // 退出循环，阻止进一步处理
+                }
+                if (!noTaxManagesCosts && noTaxManagesCosts !== '0') {
+                    $.modal.alertWarning("管理成本不能为空，请填写第 " + (parseInt(index) + 1) + " 行的管理成本");
+                    hasError = true;
+                    return; // 退出循环，阻止进一步处理
+                }
+                if (!noTaxMaterialCosts && noTaxMaterialCosts !== '0') {
+                    $.modal.alertWarning("物料成本不能为空，请填写第 " + (parseInt(index) + 1) + " 行的物料成本");
+                    hasError = true;
+                    return; // 退出循环，阻止进一步处理
+                }
+                if (!noTaxOperatingCosts && noTaxOperatingCosts !== '0') {
+                    $.modal.alertWarning("经营成本不能为空，请填写第 " + (parseInt(index) + 1) + " 行的经营成本");
+                    hasError = true;
+                    return; // 退出循环，阻止进一步处理
+                }
+                if (!taxOperatingCosts && taxOperatingCosts !== '0') {
+                    $.modal.alertWarning("税经营成本不能为空，请填写第 " + (parseInt(index) + 1) + " 行的税经营成本");
+                    hasError = true;
+                    return; // 退出循环，阻止进一步处理
+                }
+                if (!profitRate && profitRate !== '0') { // 添加利润率的验证
+                    $.modal.alertWarning("利润率不能为空，请填写第 " + (parseInt(index) + 1) + " 行的利润率");
+                    hasError = true;
+                    return; // 退出循环，阻止进一步处理
+                }
+
+                // 更新 estimateMaterialDataList 中对应的记录
+                estimateMaterialDataList[index].noTaxDevelopCosts = noTaxDevelopCosts;
+                estimateMaterialDataList[index].noTaxShippingCosts = noTaxShippingCosts;
+                estimateMaterialDataList[index].noTaxServiceCosts = noTaxServiceCosts;
+                estimateMaterialDataList[index].noTaxLaborCosts = noTaxLaborCosts;
+                estimateMaterialDataList[index].noTaxPromotionalCosts = noTaxPromotionalCosts;
+                estimateMaterialDataList[index].noTaxBusinessCosts = noTaxBusinessCosts;
+                estimateMaterialDataList[index].noTaxManagesCosts = noTaxManagesCosts;
+                estimateMaterialDataList[index].noTaxMaterialCosts = noTaxMaterialCosts;
+                estimateMaterialDataList[index].noTaxOperatingCosts = noTaxOperatingCosts;
+                estimateMaterialDataList[index].taxOperatingCosts = taxOperatingCosts;
+                estimateMaterialDataList[index].profitRate = profitRate; // 添加利润率到数据列表
+            });
+
+            if (hasError) {
+                return; // 存在错误，阻止提交
+            }
+
+            // 在需要收集所有子表数据的地方调用此函数
+            var allSubData = getAllSubTablesData();
+
+            // 将表数据转换成与complaintNoticeData格式一致的数组
+            var childDataList = allSubData.map(function(item) {
+
+                // 根据实际字段名调整
+                return {
+                    "estimateDetailMaterialId":item.estimateDetailMaterialId,
+                    "noTaxPurchaseRmb": item.noTaxPurchaseRmb,
+                    "taxPurchaseRmb": item.taxPurchaseRmb,
+                    "useNum": item.useNum,
+                    // ..其他字段
+                };
+            });
+
+
+            const combinedData = Object.assign({}, estimateData, {
+                salesEstimateDetailList: estimateMaterialDataList,
+                estimateDetailMaterialList: childDataList,
+                // ...其他字段
+            });
+            // 合并表单数据和表格数据
+            console.log(combinedData)
+            // 使用 JSON.stringify() 序列化数据
+            const jsonData = JSON.stringify(combinedData);
+            // 发送 AJAX 请求到后端接口
+            $.operate.saveJson(prefix + "/ceoAdd", jsonData);
+        }
+    }
+
+    $("input[name='pricingDate']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+
+
+
+    $(function() {
+        var options = {
+            url: prefix + "/getEstimateDetailList",
+            id:'bootstrap-table',
+            queryParams:queryParams,
+            showSearch: false,
+            showRefresh: false,
+            showToggle: false,
+            showColumns: false,
+            modalName: "销售估价详情",
+            detailView: true,
+            onExpandRow : function(index, row, $detail) {
+                initChildTable(index, row, $detail);
+            },
+            columns: [
+                {
+                    checkbox: true
+                },
+                {
+                    title: '销售估价详情ID',
+                    field: 'estimateDetailId',
+                    visible: false
+                },
+                {
+                    title: '料号',
+                    field: 'materialNo',
+                },
+                {
+                    title: '物料名称',
+                    field: 'materialName',
+                },
+                {
+                    title: '物料类型',
+                    field: 'materialType',
+                    formatter: function(value, row, index) {
+                        return $.table.selectCategoryLabel(materialTypeDatas, value);
+                    }
+                },
+                {
+                    title: '图片地址',
+                    field: 'materialPhotoUrl',
+                },
+                {
+                    title: '物料单位',
+                    field: 'materialUnit',
+                },
+                {
+                    title: '物料品牌',
+                    field: 'materialBrand',
+                },
+                {
+                    title: '物料描述',
+                    field: 'materialDescribe',
+                },
+                {
+                    title: '加工方式',
+                    field: 'materialProcessMethod',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(processMethodDatas, value);
+                    }
+                },
+                {
+                    title: '料号档位',
+                    field: 'materialGearPosition',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(materialGearPositionDatas, value);
+                    }
+                },
+                {
+                    title: '物料数量',
+                    field: 'materialNum',
+                },
+                {
+                    title: '不含税单价',
+                    field: 'noTaxRmb',
+                },
+                {
+                    title: '含税单价',
+                    field: 'taxRmb',
+                },
+                {
+                    title: '不含税总价',
+                    field: 'allNoTaxRmb',
+                },
+                {
+                    title: '含税总价',
+                    field: 'allTaxRmb',
+                },
+                {
+                    title: '含税单价',
+                    field: 'taxDollar',
+                },
+                {
+                    title: '不含税单价',
+                    field: 'noTaxDollar',
+                },
+                {
+                    title: '含税总价',
+                    field: 'allTaxDollar',
+                },
+                {
+                    title: '不含税总价',
+                    field: 'allNoTaxDollar',
+                },
+                {
+                    title: '入库部门',
+                    field: 'warehouseDept',
+                    visible:false
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="removeMaterialRow(\'' + row.materialNo + '\')"><i class="fa fa-remove"></i>删除</a> ');
+                        return actions.join('');
+                    }
+                }],
+            onEditableSave:function(field, row, oldValue, $el){
+                // 确保getTotalAmount函数存在且正确引用
+                getTotalAmount();
+            },
+
+        };
+        $.table.init(options);
+    });
+
+
+    initChildTable = function(index, row, $detail) {
+        var parentRow = row;
+        var childTableId = 'child_table_'+index;
+        $detail.html('<table id="'+childTableId+'"></table>');
+        $('#'+childTableId).bootstrapTable({
+            url: prefix + "/getEstimateDetailMaterialList",
+            method: 'post',
+            sidePagination: "server",
+            contentType: "application/x-www-form-urlencoded",
+            queryParams : {
+                estimateDetailId:parentRow.estimateDetailId
+            },
+            columns: [
+                {
+                    title: '销售估价详情物料ID',
+                    field: 'estimateDetailMaterialId',
+                    visible: false
+                },
+                {
+                    title: '销售估价详情ID',
+                    field: 'estimateDetailId',
+                    visible: false
+                },
+                {
+                    title: '不含税开发成本',
+                    field: 'noTaxDevelopCosts',
+                    visible: false
+                },
+                {
+                    title: '不含税运输成本',
+                    field: 'noTaxShippingCosts',
+                    visible: false
+                },
+                {
+                    title: '不含税服务成本',
+                    field: 'noTaxServiceCosts',
+                    visible: false
+                },
+                {
+                    title: '物料名称',
+                    field: 'materialName',
+                },
+                {
+                    title: '物料类型',
+                    field: 'materialType',
+                    formatter: function(value, row, index) {
+                        return $.table.selectCategoryLabel(materialTypeDatas, value);
+                    }
+                },
+                {
+                    title: '物料单位',
+                    field: 'materialUnit',
+                },
+                {
+                    title: '物料描述',
+                    field: 'materialDescribe',
+                },
+                {
+                    title: '用量',
+                    field: 'useNum',
+                },
+                {
+                    title: '不含税采购单价(RMB)',
+                    field: 'noTaxPurchaseRmb',
+                },
+                {
+                    title: '含税采购单价(RMB)',
+                    field: 'taxPurchaseRmb',
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        return '<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="deleteRow(\'' + row.shippingDeviceId + '\')"><i class="fa fa-remove"></i>删除</a>';
+                    }
+                }
+            ],
+            onLoadSuccess: function(data) {
+                // 初始化成本数据为一个空对象
+                var costs = {};
+
+                // 如果 data 是一个对象，将其转换为单元素数组
+                if (typeof data === 'object' && !Array.isArray(data)) {
+                    data = [data];
+                }
+                  console.log(data)
+
+                // 检查数据是否有效
+                if (data.length > 0 && data[0].rows && data[0].rows.length > 0) {
+                    // 使用第一条数据
+                    var firstRow = data[0].rows[0];
+
+                    // 从 `firstRow` 中获取成本信息
+                    const {
+                        noTaxDevelopCosts = '',
+                        noTaxShippingCosts = '',
+                        noTaxServiceCosts = '',
+                        noTaxPurchaseRmb = '',
+                        taxPurchaseRmb = ''
+                    } = firstRow || {};
+
+                    // 从 `salesEstimateDetailVo` 中获取其他成本信息
+                    const {
+                        noTaxLaborCosts = '',
+                        noTaxPromotionalCosts = '',
+                        noTaxBusinessCosts = '',
+                        noTaxManagesCosts = '',
+                        noTaxMaterialCosts = ''
+                    } = salesEstimateDetailVo || {};
+
+                    // 计算不含税总经营成本
+                    const noAllTaxOperatingCosts = (
+                        parseFloat(noTaxLaborCosts) +
+                        parseFloat(noTaxBusinessCosts) +
+                        parseFloat(noTaxManagesCosts) +
+                        parseFloat(noTaxPromotionalCosts)
+                    ).toFixed(2) || '';
+
+                    // 计算含税总经营成本，假设增值税率为 13%
+                    const allTaxOperatingCosts = (
+                        parseFloat(noAllTaxOperatingCosts) * 1.13
+                    ).toFixed(2) || '';
+                    //该料号的不含税经营成本
+                    const noTaxOperatingCosts = (
+                        (noTaxPurchaseRmb/noTaxMaterialCosts) * noAllTaxOperatingCosts
+                    ).toFixed(2) || '';
+                    // 该料号的含税经营成本
+                    const taxOperatingCosts = (
+                        (taxPurchaseRmb/noTaxMaterialCosts) * allTaxOperatingCosts
+                    ).toFixed(2) || '';
+                    // 根据 `parentRow.profitRate` 设置利润率
+                    let profitRateKey = 'aprofitRate';
+                    switch (parentRow.profitRate) {
+                        case "1":
+                            profitRateKey = 'bprofitRate';
+                            break;
+                        case "2":
+                            profitRateKey = 'cprofitRate';
+                            break;
+                        case "3":
+                            profitRateKey = 'dprofitRate';
+                            break;
+                        case "4":
+                            profitRateKey = 'eprofitRate';
+                            break;
+                        case "5":
+                            profitRateKey = 'fprofitRate';
+                            break;
+                    }
+
+                    // 使用解构赋值并设置默认值
+                    const profitRate = salesEstimateDetailVo[profitRateKey] || '';
+
+                    // 更新 `costs` 对象
+                    costs = {
+                        noTaxDevelopCosts,
+                        noTaxShippingCosts,
+                        noTaxServiceCosts,
+                        noTaxLaborCosts,
+                        noTaxPromotionalCosts,
+                        noTaxBusinessCosts,
+                        noTaxManagesCosts,
+                        noTaxMaterialCosts,
+                        noTaxOperatingCosts,
+                        taxOperatingCosts,
+                        profitRate,
+                        noTaxPurchaseRmb,
+                        taxPurchaseRmb,
+
+                    };
+                } else {
+                    // 如果没有数据，设置所有成本字段为空字符串
+                    costs = {
+                        noTaxDevelopCosts: '',
+                        noTaxShippingCosts: '',
+                        noTaxServiceCosts: '',
+                        noTaxLaborCosts: '',
+                        noTaxPromotionalCosts: '',
+                        noTaxBusinessCosts: '',
+                        noTaxManagesCosts: '',
+                        noTaxMaterialCosts: '',
+                        noTaxOperatingCosts: '',
+                        taxOperatingCosts: '',
+                        profitRate: ''
+                    };
+                }
+
+                // 动态生成 form 表单
+                var formHtml = '<form class="form-inline" data-index="' + index + '">';
+                formHtml += '<h3>运输、服务、开发成本</h3>';
+                formHtml += '<div class="form-group">';
+                formHtml += '<label for="noTaxDevelopCosts' + index + '">不含税开发成本(RMB):</label>';
+                formHtml += '<input type="text" class="form-control" id="noTaxDevelopCosts' + index + '" name="noTaxDevelopCosts' + index + '" value="' + costs.noTaxDevelopCosts + '" readonly>';
+                formHtml += '</div>';
+                formHtml += '<div class="form-group">';
+                formHtml += '<label for="noTaxShippingCosts' + index + '">不含税运输成本(RMB):</label>';
+                formHtml += '<input type="text" class="form-control" id="noTaxShippingCosts' + index + '" name="noTaxShippingCosts' + index + '" value="' + costs.noTaxShippingCosts + '" readonly>';
+                formHtml += '</div>';
+                formHtml += '<div class="form-group">';
+                formHtml += '<label for="noTaxServiceCosts' + index + '">不含税服务成本(RMB):</label>';
+                formHtml += '<input type="text" class="form-control" id="noTaxServiceCosts' + index + '" name="noTaxServiceCosts' + index + '" value="' + costs.noTaxServiceCosts + '" readonly>';
+                formHtml += '</div>';
+                formHtml += '<h3>总经营成本</h3>';
+                formHtml += '<div class="form-group">';
+                formHtml += '<label for="noTaxLaborCosts' + index + '">不含税人工成本(RMB):</label>';
+                formHtml += '<input type="text" class="form-control" id="noTaxLaborCosts' + index + '" name="noTaxLaborCosts' + index + '" value="' + costs.noTaxLaborCosts + '">';
+                formHtml += '</div>';
+                formHtml += '<div class="form-group">';
+                formHtml += '<label for="noTaxPromotionalCosts' + index + '">不含税推广成本(RMB):</label>';
+                formHtml += '<input type="text" class="form-control" id="noTaxPromotionalCosts' + index + '" name="noTaxPromotionalCosts' + index + '" value="' + costs.noTaxPromotionalCosts + '">';
+                formHtml += '</div>';
+                formHtml += '<div class="form-group">';
+                formHtml += '<label for="noTaxBusinessCosts' + index + '">不含税业务成本(RMB):</label>';
+                formHtml += '<input type="text" class="form-control" id="noTaxBusinessCosts' + index + '" name="noTaxBusinessCosts' + index + '" value="' + costs.noTaxBusinessCosts + '">';
+                formHtml += '</div>';
+                formHtml += '<div class="form-group">';
+                formHtml += '<label for="noTaxManagesCosts' + index + '">不含税管理成本(RMB):</label>';
+                formHtml += '<input type="text" class="form-control" id="noTaxManagesCosts' + index + '" name="noTaxManagesCosts' + index + '" value="' + costs.noTaxManagesCosts + '">';
+                formHtml += '</div>';
+                formHtml += '<h3>总物料成本</h3>';
+                formHtml += '<div class="form-group">';
+                formHtml += '<label for="noTaxMaterialCosts' + index + '">不含税总物料成本(RMB):</label>';
+                formHtml += '<input type="text" class="form-control" id="noTaxMaterialCosts' + index + '" name="noTaxMaterialCosts' + index + '" value="' + costs.noTaxMaterialCosts + '">';
+                formHtml += '</div>';
+                formHtml += '<h3>该料号经营成本</h3>';
+                formHtml += '<div class="form-group">';
+                formHtml += '<label for="noTaxOperatingCosts' + index + '">不含税经营成本(RMB):</label>';
+                formHtml += '<input type="text" class="form-control" id="noTaxOperatingCosts' + index + '" name="noTaxOperatingCosts' + index + '" value="' + costs.noTaxOperatingCosts + '" readonly>';
+                formHtml += '</div>';
+                formHtml += '<div class="form-group">';
+                formHtml += '<label for="taxOperatingCosts' + index + '">含税经营成本(RMB):</label>';
+                formHtml += '<input type="text" class="form-control" id="taxOperatingCosts' + index + '" name="taxOperatingCosts' + index + '" value="' + costs.taxOperatingCosts + '" readonly>';
+                formHtml += '</div>';
+                formHtml += '<h3>利润率</h3>';
+                formHtml += '<div class="form-group">';
+                formHtml += '<label for="profitRate' + index + '">利润率:</label>';
+                formHtml += '<div class="input-group">';
+                formHtml += '<input type="text" class="form-control" id="profitRate' + index + '" name="profitRate' + index + '" value="' + (costs.profitRate || '') + '">';
+                formHtml += '<span class="input-group-addon">%</span>';
+                formHtml += '</div>';
+                formHtml += '</div>';
+                formHtml += '</form>';
+                // 将 form 表单添加到子表下面
+                $detail.append(formHtml);
+                var $form = $detail.find('form[data-index="' + index + '"]');
+
+                // 使用事件委托监听 input 元素的变化
+                $form.on('input', 'input[type="text"]', function() {
+                    var $input = $(this);
+                    var inputId = $input.attr('id');
+                    var inputName = $input.attr('name');
+                    var inputValue = parseFloat($input.val());
+
+                    // 根据 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');
+                            break;
+                        case 'noTaxMaterialCosts' + index:
+                            updateMaterialCosts(inputValue);
+                            break;
+                        // 添加更多 case 语句以处理其他 input 的变化
+                        default:
+                            // 不做任何操作
+                            break;
+                    }
+                });
+
+                function calculateOperatingCosts(value, costType) {
+                    var noAllTaxOperatingCosts = 0;
+                    var allNoTaxPurchaseRmb = 0;
+                    var allTaxPurchaseRmb = 0;
+
+                    // 获取所有相关的不含税成本
+                    ['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 allTaxOperatingCosts = noAllTaxOperatingCosts * 1.13;
+                    $form.find('#allTaxOperatingCosts' + index).val(allTaxOperatingCosts.toFixed(2));
+
+                    // 遍历数据集计算不含税采购成本和含税采购成本
+                    data.forEach(function(item) {
+                        item.rows.forEach(function(row) {
+                            var noTaxPurchaseRmb = row.noTaxPurchaseRmb * row.useNum;
+                            var taxPurchaseRmb = row.taxPurchaseRmb * row.useNum;
+
+                            allNoTaxPurchaseRmb += noTaxPurchaseRmb;
+                            allTaxPurchaseRmb += taxPurchaseRmb;
+                        });
+                    });
+
+                    // 该料号的不含税经营成本
+                    var noTaxMaterialCosts = parseFloat($form.find('#noTaxMaterialCosts' + index).val());
+                    var noTaxOperatingCosts = (allNoTaxPurchaseRmb / noTaxMaterialCosts) * noAllTaxOperatingCosts;
+                    $form.find('#noTaxOperatingCosts' + index).val(noTaxOperatingCosts.toFixed(2));
+
+                    // 该料号的含税经营成本
+                    var taxOperatingCosts = (allTaxPurchaseRmb / noTaxMaterialCosts) * allTaxOperatingCosts;
+                    $form.find('#taxOperatingCosts' + index).val(taxOperatingCosts.toFixed(2));
+                }
+
+                function updateMaterialCosts(value) {
+                    var allNoTaxPurchaseRmb = 0;
+                    var allTaxPurchaseRmb = 0;
+                    // 更新不含税总物料成本
+                    $form.find('#noTaxMaterialCosts' + index).val(value.toFixed(2));
+
+                    // 遍历数据集计算不含税采购成本和含税采购成本
+                    data.forEach(function(item) {
+                        item.rows.forEach(function(row) {
+                            var noTaxPurchaseRmb = row.noTaxPurchaseRmb * row.useNum;
+                            var taxPurchaseRmb = row.taxPurchaseRmb * row.useNum;
+
+                            allNoTaxPurchaseRmb += noTaxPurchaseRmb;
+                            allTaxPurchaseRmb += taxPurchaseRmb;
+                        });
+                    });
+
+                    // 更新不含税经营成本
+                    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));
+                }
+            }
+        });
+
+    };
+
+
+
+    function queryParams(params) {
+        var curParams = {
+            // 传递参数查询参数
+            salesEstimateCode:  salesEstimate.salesEstimateCode
+        };
+        return curParams;
+    }
+
+
+
+
+
+
+    // 逻辑删除前端的一行数据
+    function removeMaterialRow(materialNo){
+        $("#bootstrap-table").bootstrapTable('remove', {
+            field: 'materialNo',
+            values: materialNo
+        })
+        getTotalAmount();
+    }
+
+
+    //form计算模块
+    function getTotalAmount(){
+        let getData = $('#bootstrap-table').bootstrapTable('getData');
+        var materialSum = 0;
+        var enterpriseSum = 0;
+        var noTaxRmb = 0;
+        var taxRmb = 0;
+        var allNoTaxRmb = 0;
+        var allTaxRmb = 0;
+        var noTaxDollar = 0;
+        var taxDollar = 0;
+        var allNoTaxDollar = 0;
+        var allTaxDollar = 0;
+        materialSum = getData.length;
+
+        enterpriseSum = getData.reduce((sum, item) => sum + (parseInt(item.materialNum) || 0), 0);
+        for(var i=0;i<getData.length;i++){
+            noTaxRmb += parseFloat(getData[i].noTaxRmb) || 0;
+            taxRmb += parseFloat(getData[i].taxRmb) || 0;
+            allNoTaxRmb += parseFloat(getData[i].allNoTaxRmb) || 0;
+            allTaxRmb += parseFloat(getData[i].allTaxRmb) || 0;
+            noTaxDollar += parseFloat(getData[i].noTaxDollar) || 0;
+            taxDollar += parseFloat(getData[i].taxDollar) || 0;
+            allNoTaxDollar += parseFloat(getData[i].allNoTaxDollar) || 0;
+            allTaxDollar += parseFloat(getData[i].allTaxDollar) || 0;
+        }
+        noTaxRmb = noTaxRmb.toFixed(2);
+        taxRmb = taxRmb.toFixed(2);
+        allNoTaxRmb = allNoTaxRmb.toFixed(2);
+        allTaxRmb = allTaxRmb.toFixed(2);
+        noTaxDollar = noTaxDollar.toFixed(2);
+        taxDollar = taxDollar.toFixed(2);
+        allNoTaxDollar = allNoTaxDollar.toFixed(2);
+        allTaxDollar = allTaxDollar.toFixed(2);
+        $("input[name='materialSum']").val(materialSum);
+        $("input[name='enterpriseSum']").val(enterpriseSum);
+        $("input[name='noTaxRmb']").val(noTaxRmb);
+        $("input[name='taxRmb']").val(taxRmb);
+        $("input[name='allNoTaxRmb']").val(allNoTaxRmb);
+        $("input[name='allTaxRmb']").val(allTaxRmb);
+        $("input[name='noTaxDollar']").val(noTaxDollar);
+        $("input[name='taxDollar']").val(taxDollar);
+        $("input[name='allNoTaxDollar']").val(allNoTaxDollar);
+        $("input[name='allTaxDollar']").val(allTaxDollar);
+
+    }
+
+
+    function getAllSubTablesData() {
+        var allSubData = [];
+        // 获取所有被展开的行
+        var parentLength = $("#bootstrap-table").bootstrapTable("getData").length;
+        for (let i = 0; i < parentLength; i++) {
+            var childTableId = "child_table_" + i;
+            var sonData = $('#' + childTableId).bootstrapTable("getData");
+
+            // 确保 sonData 是一个数组
+            if (!Array.isArray(sonData)) {
+                sonData = []; // 如果 sonData 不是数组，将其转换为空数组
+            }
+
+            // 循环获取子表中存在的行数据，每个行数据转换添加到allSubData数组中
+            sonData.forEach(function (item) {
+                item.tableId = childTableId;
+                allSubData.push(item);
+            });
+        }
+        return allSubData;
+    }
+
+
+    // $(function() {
+    //   $('#bootstrap-table').on('load-success.bs.table', function(e, data) {
+    //     // 页面加载成功后，遍历所有行并初始化子表
+    //     $('#bootstrap-table').bootstrapTable('getSelections').forEach(function(row) {
+    //       var $detail = $('#bootstrap-table').bootstrapTable('getRowDetail', row.fieldId);
+    //       var estimateDetailId = row.estimateDetailId;
+    //       if ($detail.length) {
+    //         // 预加载子表数据
+    //         $detail.bootstrapTable({
+    //           url: prefix + "/getEstimateDetailMaterialList" + "?estimateDetailId=" + estimateDetailId,
+    //           // 隐藏子表
+    //           initHidden: true,
+    //           onLoadSuccess: function() {
+    //             // 隐藏子表
+    //             $detail.hide();
+    //           },
+    //           // 子表其他配置
+    //         });
+    //       }
+    //     });
+    //   });
+    //
+    //   // 重写 onExpandRow 方法
+    //   $('#bootstrap-table').bootstrapTable({
+    //     onExpandRow: function(index, row, $detail) {
+    //       // 展开行时显示子表
+    //       $detail.show();
+    //     },
+    //     // 其他主表配置
+    //   });
+    // });
+
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/sales/estimate/engineeringAdd.html b/ruoyi-admin/src/main/resources/templates/sales/estimate/engineeringAdd.html
index bcd3e09a..f073a98c 100644
--- a/ruoyi-admin/src/main/resources/templates/sales/estimate/engineeringAdd.html
+++ b/ruoyi-admin/src/main/resources/templates/sales/estimate/engineeringAdd.html
@@ -64,8 +64,8 @@
     <div class="container">
       <h4 class="form-header h4">计算</h4>
       <div class="col-xs-12 form-row">
-        <label class=" col-sm-2">物料合计：</label><input class="col-sm-4" name="materialSum" id="materialSum_add" type="number" readonly/>
-        <label class=" col-sm-2">数量合计：</label><input class="col-sm-4" name="enterpriseSum" id="enterpriseSum_add" type="number" readonly/>
+        <label class=" col-sm-2">物料合计：</label><input class="col-sm-4" name="materialSum" th:field="*{materialSum}" id="materialSum_add" type="number" readonly/>
+        <label class=" col-sm-2">数量合计：</label><input class="col-sm-4" name="enterpriseSum" th:field="*{enterpriseSum}" id="enterpriseSum_add" type="number" readonly/>
       </div>
       <div class="col-xs-12 form-row">
         <label class="col-sm-2"> 不含税单价(RMB):</label><input placeholder="RMB" class="col-sm-4" name="noTaxRmb" id="noTaxRmb_add" type="number" readonly/>
diff --git a/ruoyi-admin/src/main/resources/templates/sales/estimate/estimate.html b/ruoyi-admin/src/main/resources/templates/sales/estimate/estimate.html
index 305d8e03..15eed8d3 100644
--- a/ruoyi-admin/src/main/resources/templates/sales/estimate/estimate.html
+++ b/ruoyi-admin/src/main/resources/templates/sales/estimate/estimate.html
@@ -69,6 +69,8 @@
         var restoreFlag = [[${@permission.hasPermi('sales:estimate:restore')}]];
         var engineeringAddFlag = [[${@permission.hasPermi('sales:estimate:engineeringAdd')}]];
         var purchaseAddFlag = [[${@permission.hasPermi('sales:estimate:purchaseAdd')}]];
+        var ceoAddFlag = [[${@permission.hasPermi('sales:estimate:ceoAdd')}]];
+
 
         var estimateStatusDatas = [[${@dict.getType('estimate_status')}]];
         var commonCurrencyDatas = [[${@dict.getType('sys_common_currency')}]];
@@ -174,7 +176,9 @@
                         if(row.estimateStatus == '1'){
                             actions.push('<a class="btn btn-success btn-xs ' + purchaseAddFlag + '" href="javascript:void(0)" onclick="purchaseAdd(\'' + row.salesEstimateId + '\')"><i class="fa fa-edit"></i>采购成本</a> ');
                         }
-
+                        if(row.estimateStatus == '2'){
+                            actions.push('<a class="btn btn-success btn-xs ' + ceoAddFlag + '" href="javascript:void(0)" onclick="ceoAdd(\'' + row.salesEstimateId + '\')"><i class="fa fa-edit"></i>经营成本</a> ');
+                        }
                         return actions.join('');
                     }
                 }]
@@ -195,11 +199,18 @@
             $.modal.open("添加BOM", url);
         }
 
-        //采购 添加BOM
+        //采购 添加采购成本
         function purchaseAdd(salesEstimateId){
             var url = prefix + "/purchaseAdd/" + salesEstimateId;
             $.modal.open("采购成本", url);
         }
+
+        //总经理 添加成本
+        function ceoAdd(salesEstimateId){
+            var url = prefix + "/ceoAdd/" + salesEstimateId;
+            $.modal.open("经营成本", url);
+        }
+
     </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/sales/estimate/purchaseAdd.html b/ruoyi-admin/src/main/resources/templates/sales/estimate/purchaseAdd.html
index c93c7ff7..c30a1668 100644
--- a/ruoyi-admin/src/main/resources/templates/sales/estimate/purchaseAdd.html
+++ b/ruoyi-admin/src/main/resources/templates/sales/estimate/purchaseAdd.html
@@ -64,8 +64,8 @@
     <div class="container">
       <h4 class="form-header h4">计算</h4>
       <div class="col-xs-12 form-row">
-        <label class=" col-sm-2">物料合计：</label><input class="col-sm-4" name="materialSum" id="materialSum_add" type="number" readonly/>
-        <label class=" col-sm-2">数量合计：</label><input class="col-sm-4" name="enterpriseSum" id="enterpriseSum_add" type="number" readonly/>
+        <label class=" col-sm-2">物料合计：</label><input class="col-sm-4" name="materialSum" th:field="*{materialSum}" id="materialSum_add" type="number" readonly/>
+        <label class=" col-sm-2">数量合计：</label><input class="col-sm-4" name="enterpriseSum" th:field="*{enterpriseSum}" id="enterpriseSum_add" type="number" readonly/>
       </div>
       <div class="col-xs-12 form-row">
         <label class="col-sm-2"> 不含税单价(RMB):</label><input placeholder="RMB" class="col-sm-4" name="noTaxRmb" id="noTaxRmb_add" type="number" readonly/>