diff --git a/src/main/java/cn/palmte/work/bean/IncomeCostBean.java b/src/main/java/cn/palmte/work/bean/IncomeCostBean.java
index ba29c02..c5c8e14 100644
--- a/src/main/java/cn/palmte/work/bean/IncomeCostBean.java
+++ b/src/main/java/cn/palmte/work/bean/IncomeCostBean.java
@@ -485,8 +485,8 @@ public abstract class IncomeCostBean {
      */
     public BigDecimal getProjectGrossProfitA() {
         BigDecimal incomeTotalTaxExclude = getIncomeTotalTaxExclude();
-        BigDecimal costTotalTaxExclude = getCostTotalTaxExclude();
-        if (null == incomeTotalTaxExclude || null == costTotalTaxExclude) {
+        BigDecimal costTotalTaxExclude = getCostPurchaseDeviceTaxExclude().add(getCostPurchaseBuildTaxExclude()).add(getCostPurchaseServiceTaxExclude()).add(getCostPurchaseOtherTaxExclude());
+        if (null == incomeTotalTaxExclude) {
             return handleSpecial(null);
         }
         return incomeTotalTaxExclude
diff --git a/src/main/java/cn/palmte/work/service/ProjectEstimateService.java b/src/main/java/cn/palmte/work/service/ProjectEstimateService.java
index 94101c7..c9c3f8e 100644
--- a/src/main/java/cn/palmte/work/service/ProjectEstimateService.java
+++ b/src/main/java/cn/palmte/work/service/ProjectEstimateService.java
@@ -340,6 +340,8 @@ public class ProjectEstimateService {
         projectBudget.setContractAmountBudget(estimateProject.getContractAmount());
         projectBudget.setIndustryScenarioBudget(estimateProject.getIndustryScenario());
         projectBudget.setIndustrySceneBudget(estimateProject.getIndustryScene());
+        projectBudget.setGrossProfitABudget(estimateProject.getGrossProfitA());
+        projectBudget.setGrossProfitAMarginBudget(estimateProject.getGrossProfitAMargin());
         projectBudget.setGrossProfitBudget(estimateProject.getGrossProfit());
         projectBudget.setGrossProfitMarginBudget(estimateProject.getGrossProfitMargin());
         projectBudget.setHuazhiProductAmountBudget(estimateProject.getHuazhiProductAmount());
diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js
index 2600c11..ce3feb1 100644
--- a/src/main/resources/static/assets/js/project_budget.js
+++ b/src/main/resources/static/assets/js/project_budget.js
@@ -809,7 +809,13 @@ function updateProjectContributionProfitRate() {
     //公司管理费用
     var costCompanyManageTaxExclude = f2(inputVal("costCompanyManageTaxExclude"));
 
-    var projectGrossProfitA = f2Fixed(incomeTotalTaxExclude - costTotalTaxExclude);
+    //采购成本不含税
+    var costPurchaseDeviceTaxExclude = f2(inputVal("costPurchaseDeviceTaxExclude"));
+    var costPurchaseBuildTaxExclude = f2(inputVal("costPurchaseBuildTaxExclude"));
+    var costPurchaseServiceTaxExclude = f2(inputVal("costPurchaseServiceTaxExclude"));
+    var costPurchaseOtherTaxExclude = f2(inputVal("costPurchaseOtherTaxExclude"));
+
+    var projectGrossProfitA = f2Fixed(incomeTotalTaxExclude - (costPurchaseDeviceTaxExclude + costPurchaseBuildTaxExclude + costPurchaseServiceTaxExclude + costPurchaseOtherTaxExclude));
     var projectGrossProfitARate = f2Fixed(rate(f2(projectGrossProfitA), incomeTotalTaxExclude));
     var projectGrossProfit = f2Fixed(incomeTotalTaxExclude - costTotalTaxExclude - costExpropriationTaxExclude);
     var projectGrossProfitRate = f2Fixed(rate(f2(projectGrossProfit), incomeTotalTaxExclude));
diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index 79d4ea0..5a778be 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -614,26 +614,23 @@
                                         <th class="table-title" colspan="4" id="coop0b" <#if projectBudget.cooperateTypeBudget! == 1>hidden</#if>></th>
 
                                     </tr>
-                                    <tr class="am-text-nowrap">
-                                        <th class="table-title" colspan="1" ><span style="font-size: 15px">项目毛利A:</span></th>
-                                        <td class="table-title" colspan="1" >
-                                            <input type="text" class="number am-input" style="border-style:none;" data-validate-async data-validation-message="请输入项目毛利A"
-                                                   name="grossProfitABudget" id="grossProfitABudget" placeholder="单位（元）" maxlength="16"
-                                                   value="${Utils.format(projectBudget.grossProfitABudget)}" />
-                                        </td>
-                                        <th class="table-title" colspan="1" ><span style="font-size: 15px">项目毛利A利率:</span></th>
-                                        <td class="table-title" colspan="1" >
-                                            <input type="text" class="number am-input" style="border-style:none;" data-validate-async data-validation-message="请输入项目毛利A利率"
-                                                   name="grossProfitAMarginBudget" id="grossProfitAMarginBudget" placeholder="单位（%）" maxlength="16"
-                                                   value="${Utils.format(projectBudget.grossProfitAMarginBudget)}"  />
-                                        </td>
-                                        <th class="table-title" colspan="2"></th>
-                                    </tr>
                                     <tr class="am-text-nowrap">
                                         <th class="table-title" colspan="1" ><span style="font-size: 15px">合同金额:</span></th>
                                         <td class="table-title" colspan="1" >
                                             <input readonly value="${Utils.format(projectBudget.contractAmountBudget)}" />
                                         </td>
+                                        <th class="table-title" colspan="1" ><span style="font-size: 15px">项目毛利A:</span></th>
+                                        <td class="table-title" colspan="1" >
+                                            <input readonly value="${Utils.format(projectBudget.grossProfitABudget)}" />
+                                        </td>
+                                        <th class="table-title" colspan="1" ><span style="font-size: 15px">项目毛利A利率:</span></th>
+                                        <td class="table-title" colspan="1" >
+                                            <input readonly value="${Utils.format(projectBudget.grossProfitAMarginBudget)}" />
+                                        </td>
+                                    </tr>
+                                    <tr class="am-text-nowrap">
+                                        <th class="table-title" colspan="2"></th>
+
                                         <th class="table-title" colspan="1" ><span style="font-size: 15px">项目毛利:</span></th>
                                         <td class="table-title" colspan="1" >
                                             <input readonly value="${Utils.format(projectBudget.grossProfitBudget)}"  />
@@ -1665,7 +1662,7 @@
                                         <td>项目毛利A（元）</td>
                                         <td><input type="text" class="number" name="projectGrossProfitARate" value="${Utils.format(budgetBean.projectGrossProfitARate,'0')}" readonly  title="毛利A（不含税）/收入总计（不含税）"></td>
                                         <td><input type="text" class="number" name="projectGrossProfitA" value="${Utils.format(budgetBean.projectGrossProfitA,'0')}" readonly  title="收入总计（不含税）-成本总计（不含税）"></td>
-                                        <td>毛利A=收入总计(不含税)-成本总计(不含税)</td>
+                                        <td>毛利A=收入明细表金额总计(不含税)-采购成本明细表金额总计(不含税)</td>
                                     </tr>
                                     <tr>
                                         <td>项目毛利（元）</td>
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index 588e7a6..a8f7e75 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -507,6 +507,12 @@
 
                         </tr>
                         <tr class="am-text-nowrap">
+                            <th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">合同金额:</span></th>
+                            <td class="table-title" colspan="1" >
+                                <input type="text" class="number am-input" style="border-style:none;" data-validate-async data-validation-message="请输入合同金额"
+                                       name="contractAmountBudget" id="contractAmountBudget" placeholder="单位（元）" maxlength="16"
+                                       value="${Utils.format(projectBudget.contractAmountBudget)}" />
+                            </td>
                             <th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">项目毛利A:</span></th>
                             <td class="table-title" colspan="1" >
                                 <input type="text" class="number am-input" style="border-style:none;" data-validate-async data-validation-message="请输入项目毛利A"
@@ -519,15 +525,10 @@
                                        name="grossProfitAMarginBudget" id="grossProfitAMarginBudget" placeholder="单位（%）" maxlength="16"
                                        value="${Utils.format(projectBudget.grossProfitAMarginBudget)}"  />
                             </td>
-                            <th class="table-title" colspan="2"></th>
                         </tr>
                         <tr class="am-text-nowrap">
-                            <th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">合同金额:</span></th>
-                            <td class="table-title" colspan="1" >
-                                <input type="text" class="number am-input" style="border-style:none;" data-validate-async data-validation-message="请输入合同金额"
-                                       name="contractAmountBudget" id="contractAmountBudget" placeholder="单位（元）" maxlength="16"
-                                       value="${Utils.format(projectBudget.contractAmountBudget)}" />
-                            </td>
+                            <th class="table-title" colspan="2"></th>
+
                             <th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">项目毛利:</span></th>
                             <td class="table-title" colspan="1" >
                                 <input type="text" class="number am-input" style="border-style:none;" data-validate-async data-validation-message="请输入项目毛利"
@@ -1381,7 +1382,7 @@
                             <td>项目毛利A（元）</td>
                             <td><input type="text" class="number" name="projectGrossProfitARate" value="${Utils.format(budgetBean.projectGrossProfitARate,'0')}" readonly  title="毛利A（不含税）/收入总计（不含税）"></td>
                             <td><input type="text" class="number" name="projectGrossProfitA" value="${Utils.format(budgetBean.projectGrossProfitA,'0')}" readonly  title="收入总计（不含税）-成本总计（不含税）"></td>
-                            <td>毛利A=收入总计(不含税)-成本总计(不含税)</td>
+                            <td>毛利A=收入明细表金额总计(不含税)-采购成本明细表金额总计(不含税)</td>
                         </tr>
                         <tr>
                             <td>项目毛利（元）</td>