diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index c4b461f..989b684 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -1400,6 +1400,12 @@
                                             <button type="button" class="am-btn am-btn-default" onclick="closeDetail()">
                                                 <span class="am-icon-archive"></span> 隐藏明细
                                             </button>
+                                            <button type="button" class="am-btn am-btn-default" onclick="closeEmpty()">
+                                                <span class="am-icon-archive"></span> 隐藏无金额月份
+                                            </button>
+                                            <button type="button" class="am-btn am-btn-default" onclick="openEmpty()">
+                                                <span class="am-icon-archive"></span> 展示无金额月份
+                                            </button>
                                             <#--                                                <button type="button" class="am-btn am-btn-default" onclick="printPage('tab34')">-->
                                             <#--                                                    <span class="am-icon-archive"></span> 打印-->
                                             <#--                                                </button>-->
@@ -1411,7 +1417,7 @@
                                        style="display: flex;border-collapse: collapse;padding:0;"
                                        id="budgetPlanDetailTable">
 
-                                    <thead style="display: inline-block;white-space: nowrap;flex-shrink: 0;">
+                                    <thead style="display: inline-block;white-space: nowrap;flex-shrink: 0;width: 400px;">
                                     <tr style="display: inline-block;">
                                         <td style="display: block;border-top: 1px solid #ddd;"><input type="text"
                                                                                                       class="am-modal-prompt-input"
@@ -1482,9 +1488,6 @@
                                                                                                       value="还款计划"
                                                                                                       readonly></td>
                                     </tr>
-                                    </thead>
-
-                                    <tbody style="display: inline-block;white-space: nowrap;">
                                     <tr style="display: inline-block;">
                                         <td style="display: block;"><input type="text"
                                                                            class="am-modal-prompt-input input-total-month-budget-plan"
@@ -1557,9 +1560,14 @@
                                                                            readonly/></td>
                                     </tr>
 
+                                    </thead>
+
+                                    <tbody style="display: inline-block;overflow-x: scroll;width: calc(100% - 410px);white-space: nowrap;">
+
                                     <#if projectBudgetPlanDetails??>
                                         <#list projectBudgetPlanDetails as projectBudgetPlanDetail>
-                                            <tr style="display: inline-block;">
+                                            <tr style="display: inline-block;"
+                                                <#if projectBudgetPlanDetail.totalCost+projectBudgetPlanDetail.totalIncome==0>class="tr-budget-plan-empty"</#if> >
                                                 <td style="display: block;"><input type="text" readonly
                                                                                    class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-month-budget-plan"
                                                                                    value="${projectBudgetPlanDetail.month!}">
@@ -1928,7 +1936,7 @@
                                         <td>项目毛利B（元）</td>
                                         <td><input type="text" class="number" name="projectGrossProfitRate"
                                                    value="${Utils.format(budgetBean.projectGrossProfitRate,'0')}"
-                                                   readonly required title="毛利B（不含税）/收入总计（不含税）"></td>
+                                                   readonly required title="毛利B返（不含税）/收入总计（不含税）"></td>
                                         <td><input type="text" class="number" name="projectGrossProfit"
                                                    value="${Utils.format(budgetBean.projectGrossProfit,'0')}" readonly
                                                    required
@@ -3932,9 +3940,10 @@
             appendTrIncome();
         });
         // 初始化表格高度
-        var tab32HeadH = $("#tab32").find('thead').get(0).offsetHeight
-        $("#tab32TBody").get(0).style.maxHeight = 'calc(100% - ' + tab32HeadH + 'px)'
+        // var tab32HeadH = $("#tab32").find('thead').get(0).offsetHeight
+        // $("#tab32TBody").get(0).style.maxHeight = 'calc(100% - ' + tab32HeadH + 'px)'
         <#--.style.maxHeight = `calc(100% - ${tab32HeadH}px)`-->
+        $('.fixed-table tbody').css('max-height','calc(100% - 100px)')
     });
 
 
@@ -4099,4 +4108,12 @@
         if (url)
             location.href = url
     }
+
+    function closeEmpty() {
+        $('.tr-budget-plan-empty').css('display', 'none');
+    }
+
+    function openEmpty() {
+        $('.tr-budget-plan-empty').css('display', 'inline-block');
+    }
 </script>
\ No newline at end of file
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index a8bc1e8..7121f64 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -900,7 +900,7 @@
                                        ${projectBudget.incomeDetailAttrName}
                                     </span>
                                 </div>
-                                <div class="fixed-table has-actions" style="max-height: calc(100% - 110px)">
+                                <div class="fixed-table has-actions" style="height: calc(100% - 140px)">
                                     <table class="am-table am-table-bordered am-table-radius table-main"
                                            style="padding:0;" id="incomeTable">
                                         <thead>
@@ -1123,7 +1123,7 @@
                                     </span>
                                 </div>
                                 <div class="fixed-table has-actions is-vertical-scroll"
-                                     style="max-height: calc(100% - 110px)">
+                                     style="height: calc(100% - 140px)">
                                     <table class="am-table am-table-bordered am-table-radius table-main"
                                            style="padding:0;" id="costTable">
                                         <thead style="display:block;width: 1810px;">
@@ -1470,7 +1470,7 @@
                             <table class="am-table table-main"
                                    style="display: block;border-collapse: collapse;width: 1700px;overflow-x: scroll;padding:0;"
                                    id="budgetPlanDetailTable">
-                                <thead style="display: inline-block;overflow-x: scroll;width: 200px;">
+                                <thead style="display: inline-block;overflow-x: scroll;width: 400px;">
                                 <tr style="display: inline-block;">
                                     <td style="display: block;border-top: 1px solid #ddd;"><input type="text"
                                                                                                   class="am-modal-prompt-input"
@@ -1542,8 +1542,6 @@
                                                 disabled="disabled"><span class="am-icon-minus"></span></button>
                                     </td>
                                 </tr>
-                                </thead>
-                                <tbody style="display: inline-block;overflow-x: scroll;width: calc(100% - 210px);white-space: nowrap;">
                                 <tr style="display: inline-block;">
                                     <td style="display: block;"><input type="text"
                                                                        class="am-modal-prompt-input input-total-title-month-budget-plan"
@@ -1614,7 +1612,10 @@
                                                 disabled="disabled"><span class="am-icon-minus"></span></button>
                                     </td>
                                 </tr>
-                                <tr id="firstBlock" class="am-hide" style="display: inline-block;">
+
+                                </thead>
+                                <tbody style="display: inline-block;overflow-x: scroll;width: calc(100% - 410px);white-space: nowrap;">
+                             <tr id="firstBlock" class="am-hide" style="display: inline-block;">
                                     <td style="display: block;"><input type="text"
                                                                        class="am-modal-prompt-input input-total-month-budget-plan"
                                                                        value="${projectBudgetPlanDetailTotal.month}"
diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl
index 96c6264..0e3e2f9 100644
--- a/src/main/resources/templates/admin/project_estimate_add.ftl
+++ b/src/main/resources/templates/admin/project_estimate_add.ftl
@@ -224,14 +224,14 @@
                                            name="principal" placeholder="请输入项目负责人" maxlength="20"
                                            value="" />
                                 </td>
-                                <th class="table-title" colspan="1" ><span style="font-size: 15px">预计合同签订时间:</span></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="am-form-field am-input-sm" style="border-style:none;" id="contractTime"
                                            name="contractTime" autocomplete="off"
                                            value="" placeholder="预计合同签订时间"
                                            data-am-datepicker>
                                 </td>
-                                <th class="table-title" colspan="1" ><span style="font-size: 15px">项目计划招标时间:</span></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="am-form-field am-input-sm" style="border-style:none;" id="bidsTime"
                                            name="bidsTime" autocomplete="off"
@@ -240,7 +240,7 @@
                                 </td>
                             </tr>
                             <tr class="am-text-nowrap">
-                                <th class="table-title" colspan="1" ><span style="font-size: 15px">是否二次合作:</span></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" >
                                     <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="isSecond" name="isSecond">
                                         <option value="-1" ></option>
@@ -248,7 +248,7 @@
                                         <option value="2" >否</option>
                                     </select>
                                 </td>
-                                <th class="table-title" colspan="1" ><span style="font-size: 15px">是否汇智中标:</span></th>
+                                <th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">是否汇智中标:</span></th>
                                 <td class="table-title" colspan="3" >
                                     <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="signType" name="signType">
                                         <option value="-1" ></option>
@@ -276,7 +276,7 @@
 <#--                                </td>-->
 <#--                            </tr>-->
                             <tr class="am-text-nowrap">
-                                <th class="table-title" colspan="1" ><span style="font-size: 15px">计收计划:</span></th>
+                                <th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">计收计划:</span></th>
                                 <td class="table-title" colspan="5" >
                                     <textarea rows="3" cols="20" id="calculationCollection" name="calculationCollection" maxlength="1000"
                                           class="am-input" style="border-style:none;" data-validate-async data-validation-message="按照开票金额及时间罗列计收计划"
@@ -285,7 +285,7 @@
                                 </td>
                             </tr>
                             <tr class="am-text-nowrap">
-                                <th class="table-title" colspan="1" ><span style="font-size: 15px">项目阶段:</span></th>
+                                <th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">项目阶段:</span></th>
                                 <td class="table-title" colspan="2" >
                                     <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="stage" name="stage">
                                         <option value="0" >C0、项目可研</option>
@@ -298,7 +298,7 @@
                                         <option value="7" >C7、项目结算期</option>
                                     </select>
                                 </td>
-                                <th class="table-title" colspan="1" ><span style="font-size: 15px">公司销售阶段:</span></th>
+                                <th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">公司销售阶段:</span></th>
                                 <td class="table-title" colspan="2" >
                                     <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="saleStage" name="saleStage">
                                         <option value="0" >S0-商机线索</option>
@@ -316,7 +316,7 @@
                                 </td>
                             </tr>
                             <tr class="am-text-nowrap">
-                                <th class="table-title" colspan="1" ><span style="font-size: 15px">当前进度描述:</span></th>
+                                <th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">当前进度描述:</span></th>
                                 <td class="table-title" colspan="5" >
                                     <textarea rows="3" cols="20" id="stageRemark" name="stageRemark" maxlength="1000"
                                               class="am-input" style="border-style:none;" data-validate-async data-validation-message="当前进度描述"
@@ -693,12 +693,19 @@
         var valueRisk = $("#valueRisk").val();
 
         var principal = $("#principal").val();
+        var principal = $("#principal").val();
+
+
+        var contractTime = $("#contractTime").val();
+        var bidsTime = $("#bidsTime").val();
+        var isSecond = $("#isSecond").val();
 
 
-        // var contractTime = $("#contractTime").val();
-        // var bidsTime = $("#bidsTime").val();
         // var mainContractResolvePlan = $("#mainContractResolvePlan").val();
-        // var calculationCollection = $("#calculationCollection").val();
+        var calculationCollection = $("#calculationCollection").val();
+        var stage = $("#saleStage").val();
+        var saleStage = $("#saleStage").val();
+        var stageRemark = $("#stageRemark").val();
 
         // var incomeDeviceTaxInclude = $("#incomeDeviceTaxInclude").val();
         // var incomeDeviceTaxExclude = $("#incomeDeviceTaxExclude").val();
@@ -840,17 +847,27 @@
             return;
         }
         //
-        // if (contractTime.length <= 0) {
-        //     window.confirm('预计合同签订时间不能为空');
-        //     check = 1;
-        //     return;
-        // }
+        if (contractTime.length <= 0) {
+            window.confirm('预计合同签订时间不能为空');
+            check = 1;
+            return;
+        }
         //
-        // if (bidsTime.length <= 0) {
-        //     window.confirm('项目计划招标时间不能为空');
-        //     check = 1;
-        //     return;
-        // }
+        if (bidsTime.length <= 0) {
+            window.confirm('项目计划招标时间不能为空');
+            check = 1;
+            return;
+        }
+        if(!isSecond){
+            window.confirm('是否二次合作不能为空');
+            check = 1;
+            return;
+        }
+        if(!isSecond){
+            window.confirm('是否二次合作不能为空');
+            check = 1;
+            return;
+        }
         //
         // if (mainContractResolvePlan == undefined || mainContractResolvePlan.length <= 0) {
         //     window.confirm('主合同具体解决方案不能为空');
@@ -858,12 +875,26 @@
         //     return;
         // }
         //
-        // if (calculationCollection == undefined || calculationCollection.length <= 0) {
-        //     window.confirm('计收计划不能为空');
-        //     check = 1;
-        //     return;
-        // }
-
+        if (calculationCollection == undefined || calculationCollection.length <= 0) {
+            window.confirm('计收计划不能为空');
+            check = 1;
+            return;
+        }
+        if (!stage  ) {
+            window.confirm('项目阶段不能为空');
+            check = 1;
+            return;
+        }
+        if (!saleStage ) {
+            window.confirm('公司销售阶段不能为空');
+            check = 1;
+            return;
+        }
+        if (!stageRemark ) {
+            window.confirm('当前进度描述不能为空');
+            check = 1;
+            return;
+        }
         /*if (incomeDeviceTaxInclude == '' || incomeDeviceTaxExclude == '' || incomeEngineerTaxInclude == '' || incomeEngineerTaxExclude == '' ||
             incomeServiceTaxInclude == '' || incomeServiceTaxExclude == '' || costPurchaseDeviceTaxInclude == '' || costPurchaseDeviceTaxExclude == '' ||
             costPurchaseBuildTaxInclude == '' || costPurchaseBuildTaxExclude == '' || costPurchaseServiceTaxInclude == '' || costPurchaseServiceTaxExclude == '' ||
diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl
index 42e93e2..dfafc1e 100644
--- a/src/main/resources/templates/admin/project_estimate_edit.ftl
+++ b/src/main/resources/templates/admin/project_estimate_edit.ftl
@@ -257,14 +257,14 @@
                                    name="principal" placeholder="请输入项目负责人" maxlength="20"
                                    value="${project.principal!}" />
                         </td>
-                        <th class="table-title" colspan="1" ><span style="font-size: 15px">预计合同签订时间:</span></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="am-form-field am-input-sm" style="border-style:none;" id="contractTime"
                                    name="contractTime" autocomplete="off"
                                    value="${(project.contractTime?string("yyyy-MM-dd"))!}" placeholder="预计合同签订时间"
                                    data-am-datepicker>
                         </td>
-                        <th class="table-title" colspan="1" ><span style="font-size: 15px">项目计划招标时间:</span></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="am-form-field am-input-sm" style="border-style:none;" id="bidsTime"
                                    name="bidsTime" autocomplete="off"
@@ -273,7 +273,7 @@
                         </td>
                     </tr>
                     <tr class="am-text-nowrap">
-                        <th class="table-title" colspan="1" ><span style="font-size: 15px">是否二次合作:</span></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" >
                             <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="isSecond" name="isSecond">
                                 <#if project.isSecond??>
@@ -287,7 +287,7 @@
                                 </#if>
                             </select>
                         </td>
-                        <th class="table-title" colspan="1" ><span style="font-size: 15px">是否汇智中标:</span></th>
+                        <th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">是否汇智中标:</span></th>
                         <td class="table-title" colspan="3" >
                             <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="signType" name="signType">
                                 <#if project.signType??>
@@ -322,7 +322,7 @@
 <#--                        </td>-->
 <#--                    </tr>-->
                     <tr class="am-text-nowrap">
-                        <th class="table-title" colspan="1" ><span style="font-size: 15px">计收计划:</span></th>
+                        <th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">计收计划:</span></th>
                         <td class="table-title" colspan="5" >
                                     <textarea rows="3" cols="20" id="calculationCollection" name="calculationCollection" maxlength="1000"
                                               class="am-input" style="border-style:none;" data-validate-async data-validation-message="按照开票金额及时间罗列计收计划"
@@ -331,7 +331,7 @@
                         </td>
                     </tr>
                     <tr class="am-text-nowrap">
-                        <th class="table-title" colspan="1" ><span style="font-size: 15px">项目阶段:</span></th>
+                        <th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">项目阶段:</span></th>
                         <td class="table-title" colspan="2" >
                             <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="stage" name="stage">
                                 <option value="0" <#if project.stage?? && project.stage=0>selected</#if>>C0、项目可研</option>
@@ -344,7 +344,7 @@
                                 <option value="7" <#if project.stage?? && project.stage=7>selected</#if>>C7、项目结算期</option>
                             </select>
                         </td>
-                        <th class="table-title" colspan="1" ><span style="font-size: 15px">公司销售阶段:</span></th>
+                        <th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">公司销售阶段:</span></th>
                         <td class="table-title" colspan="2" >
                             <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="saleStage" name="saleStage">
                                 <option value="0" <#if project.saleStage?? && project.saleStage=0>selected</#if>>S0-商机线索</option>
@@ -362,7 +362,7 @@
                         </td>
                     </tr>
                     <tr class="am-text-nowrap">
-                        <th class="table-title" colspan="1" ><span style="font-size: 15px">当前进度描述:</span></th>
+                        <th class="table-title" colspan="1" ><span style="color: red;">*</span><span style="font-size: 15px">当前进度描述:</span></th>
                         <td class="table-title" colspan="5" >
                                     <textarea rows="3" cols="20" id="stageRemark" name="stageRemark" maxlength="1000"
                                               class="am-input" style="border-style:none;" data-validate-async data-validation-message="当前进度描述"
@@ -749,12 +749,25 @@
         var huazhiProductAmount = $("#huazhiProductAmount").val();
         var huasanProductAmount = $("#huasanProductAmount").val();
         var ziguangOtherAmount = $("#ziguangOtherAmount").val();
-        // var industryScenario = $("#industryScenario").val();
+        var industryScene = $("#industryScene").val();
         var customer = $("#customer").val();
         var terminalCustomer = $("#terminalCustomer").val();
         var valueRisk = $("#valueRisk").val();
 
         var principal = $("#principal").val();
+        var principal = $("#principal").val();
+
+
+        var contractTime = $("#contractTime").val();
+        var bidsTime = $("#bidsTime").val();
+        var isSecond = $("#isSecond").val();
+
+
+        // var mainContractResolvePlan = $("#mainContractResolvePlan").val();
+        var calculationCollection = $("#calculationCollection").val();
+        var stage = $("#saleStage").val();
+        var saleStage = $("#saleStage").val();
+        var stageRemark = $("#stageRemark").val();
 
         // var incomeDeviceTaxInclude = $("#incomeDeviceTaxInclude").val();
         // var incomeDeviceTaxExclude = $("#incomeDeviceTaxExclude").val();
@@ -789,6 +802,7 @@
         }
 
 
+
         // if (projectNo.length <= 0) {
         //     window.confirm('项目编号不能为空');
         //     check = 1;
@@ -805,7 +819,6 @@
 
 
 
-
         if (underwrittenMode > 2 && (advanceInterestAmount == undefined || advanceInterestAmount.length <= 0)) {
             window.confirm('垫资利息不能为空');
             check = 1;
@@ -895,7 +908,55 @@
             check = 1;
             return;
         }
-
+        //
+        if (contractTime.length <= 0) {
+            window.confirm('预计合同签订时间不能为空');
+            check = 1;
+            return;
+        }
+        //
+        if (bidsTime.length <= 0) {
+            window.confirm('项目计划招标时间不能为空');
+            check = 1;
+            return;
+        }
+        if(!isSecond){
+            window.confirm('是否二次合作不能为空');
+            check = 1;
+            return;
+        }
+        if(!isSecond){
+            window.confirm('是否二次合作不能为空');
+            check = 1;
+            return;
+        }
+        //
+        // if (mainContractResolvePlan == undefined || mainContractResolvePlan.length <= 0) {
+        //     window.confirm('主合同具体解决方案不能为空');
+        //     check = 1;
+        //     return;
+        // }
+        //
+        if (calculationCollection == undefined || calculationCollection.length <= 0) {
+            window.confirm('计收计划不能为空');
+            check = 1;
+            return;
+        }
+        if (!stage  ) {
+            window.confirm('项目阶段不能为空');
+            check = 1;
+            return;
+        }
+        if (!saleStage ) {
+            window.confirm('公司销售阶段不能为空');
+            check = 1;
+            return;
+        }
+        if (!stageRemark ) {
+            window.confirm('当前进度描述不能为空');
+            check = 1;
+            return;
+        }
         /*if (incomeDeviceTaxInclude == '' || incomeDeviceTaxExclude == '' || incomeEngineerTaxInclude == '' || incomeEngineerTaxExclude == '' ||
             incomeServiceTaxInclude == '' || incomeServiceTaxExclude == '' || costPurchaseDeviceTaxInclude == '' || costPurchaseDeviceTaxExclude == '' ||
             costPurchaseBuildTaxInclude == '' || costPurchaseBuildTaxExclude == '' || costPurchaseServiceTaxInclude == '' || costPurchaseServiceTaxExclude == '' ||
@@ -906,8 +967,6 @@
             return;
         }
 
-        console.info(changeToNumber(incomeDeviceTaxInclude)+"------"+changeToNumber(incomeDeviceTaxExclude))
-        console.info(changeToNumber(incomeDeviceTaxInclude)<changeToNumber(incomeDeviceTaxExclude))
         if (changeToNumber(incomeDeviceTaxInclude) < changeToNumber(incomeDeviceTaxExclude)) {
             window.confirm('设备类收入含税金额应大于不含税金额');
             check = 1;