From 6d44cc52a1ed94571749ea2ecaa16b89a753583a Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Tue, 12 Apr 2022 18:22:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=93=E7=94=A8=E6=80=A7=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/backend/ProjectController.java |   4 +-
 .../static/assets/js/project_budget_cost.js   |   4 +-
 .../js/project_budget_cost_project_manage.js  |   8 +-
 .../static/assets/js/project_budget_income.js |   2 +-
 .../templates/admin/project_budget_edit.ftl   |  14 +-
 .../templates/admin/project_estimate_add.ftl  | 231 ++++++++++++++----
 .../templates/admin/project_estimate_edit.ftl | 230 ++++++++++++++---
 7 files changed, 392 insertions(+), 101 deletions(-)

diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
index 956ec71..3c462c6 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
@@ -561,9 +561,9 @@ public class ProjectController extends BaseController {
      */
     @RequestMapping("/checkName")
     @ResponseBody
-    public ResponseMsg checkName(@RequestParam String name) {
+    public ResponseMsg checkName(@RequestParam String name,@RequestParam int id) {
         Project project = projectRepository.findByProjectName(name);
-        if (project != null) {
+        if (project != null && id != project.getId()) {
             return ResponseMsg.buildFailedMsg("失败");
         }
         return ResponseMsg.buildSuccessMsg("成功");
diff --git a/src/main/resources/static/assets/js/project_budget_cost.js b/src/main/resources/static/assets/js/project_budget_cost.js
index 57a3a1d..8558d71 100644
--- a/src/main/resources/static/assets/js/project_budget_cost.js
+++ b/src/main/resources/static/assets/js/project_budget_cost.js
@@ -164,7 +164,7 @@ function appendTrCost() {
 
     var template = '<tr>' +
         '<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-budget-num" readonly></td>' +
-        '<td><select style="width: 82px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-type">'+
+        '<td><select style="width: 100px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-type">'+
         '<option value="xxxx" disabled selected>--请选择--</option>'+
         '<option value="1">设备</option>'+
         '<option value="2">施工</option>'+
@@ -173,7 +173,7 @@ function appendTrCost() {
         '</select>'+
         '</td>'+
         '<td>'+
-        '<select style="width: 80px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-category">'+
+        '<select style="width: 130px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-category">'+
 
         /*'<option value="1">华智产品</option>'+
         '<option value="2">紫光其他产品</option>'+
diff --git a/src/main/resources/static/assets/js/project_budget_cost_project_manage.js b/src/main/resources/static/assets/js/project_budget_cost_project_manage.js
index 99ca14f..ec31229 100644
--- a/src/main/resources/static/assets/js/project_budget_cost_project_manage.js
+++ b/src/main/resources/static/assets/js/project_budget_cost_project_manage.js
@@ -99,7 +99,7 @@ function appendTrCostProjectManage() {
     var template = '<tr>\n' +
         '        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-budget-num" readonly></td>\n' +
         '        <td>\n' +
-        '            <select style="width: 80px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage am-modal-prompt-input-cost-project-manage-type">\n' +
+        '            <select style="width: 180px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage am-modal-prompt-input-cost-project-manage-type">\n' +
         '                <option value="xxxx" disabled selected>--请选择--</option>\n' +
         '                <option value="1" >人工成本</option>\n' +
         '                <option value="2" >业务费用</option>\n' +
@@ -107,7 +107,7 @@ function appendTrCostProjectManage() {
         '            </select>\n' +
         '        </td>\n' +
         '        <td>\n' +
-        '            <select style="width: 80px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage am-modal-prompt-input-cost-project-manage-category">\n' +
+        '            <select style="width: 180px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage am-modal-prompt-input-cost-project-manage-category">\n' +
         '                <option value="xxxx" disabled selected>--请选择--</option>\n' +
         '                <option value="1" >人工费</option>\n' +
         '                <option value="2" >总部支撑人力费用</option>\n' +
@@ -126,7 +126,7 @@ function appendTrCostProjectManage() {
         '        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"></td>\n' +
         '        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"></td>\n' +
         '        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"></td>\n' +
-        '        <td><button type="button" class="am-btn am-btn-danger am-btn-xs am-round am-modal-line-delete"><span class="am-icon-minus"></span></button>' +
+        '        <td><button type="button" style="margin-top: 10px" class="am-btn am-btn-danger am-btn-xs am-round am-modal-line-delete"><span class="am-icon-minus"></span></button>' +
         '            <input type="hidden" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="1"></td>\n' +
         '    </tr>';
     $("#costProjectManageTable").append(template);
@@ -155,7 +155,7 @@ function bindTypeSelectChangeManager() {
             categorySelect.attr("style", "display:none");
             categoryInput.attr("type", "text");
         } else if(SELECT_TYPE_CATEGORY_MAP_DATA_MANAGER[type]){
-            categorySelect.attr("style", "width: 80px;float: left;");
+            categorySelect.attr("style", "width: 180px;float: left;");
             categoryInput.val("");
             categoryInput.attr("type", "hidden");
             categorySelect.append("<option value='xxxx' disabled selected>--请选择--</option>");
diff --git a/src/main/resources/static/assets/js/project_budget_income.js b/src/main/resources/static/assets/js/project_budget_income.js
index a433273..081fa5a 100644
--- a/src/main/resources/static/assets/js/project_budget_income.js
+++ b/src/main/resources/static/assets/js/project_budget_income.js
@@ -143,7 +143,7 @@ function appendTrIncome() {
         '                        <td><input type="text" min="0.00" max="99.99" step="0.01" maxlength="5" class="number am-modal-prompt-input am-modal-prompt-input-income input-changeable-tax-rate"></td>\n' +
         '                        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-include" readonly></td>\n' +
         '                        <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-exclude" readonly></td>\n' +
-        '                        <td><button type="button" class="am-btn am-btn-danger am-btn-xs am-round am-modal-line-delete"><span class="am-icon-minus"></span></button></td>\n' +
+        '                        <td><button type="button" style="margin-top: 10px" class="am-btn am-btn-danger am-btn-xs am-round am-modal-line-delete"><span class="am-icon-minus"></span></button></td>\n' +
         '                    </tr>';
     $("#incomeTable").append(template);
     //重新绑定删除事件和input修改事件
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index db0d773..8fa9b75 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -402,7 +402,7 @@
                                     <td><input type="text" maxlength="5" class="number am-modal-prompt-input am-modal-prompt-input-income input-changeable-tax-rate" value="${Utils.format(incomeDetail.taxRate,'0')}" oninput="if(value.length>5)value=value.slice(0,5)"></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-include" value="${Utils.format(incomeDetail.totalTaxInclude,'0')}" readonly></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-tax-exclude" value="${Utils.format(incomeDetail.totalTaxExclude,'0')}" readonly></td>
-                                    <td><button type="button" class="am-btn am-btn-danger am-btn-xs am-round am-modal-line-delete"><span class="am-icon-minus"></span></button></td>
+                                    <td><button type="button" style="margin-top: 10px" class="am-btn am-btn-danger am-btn-xs am-round am-modal-line-delete"><span class="am-icon-minus"></span></button></td>
                                 </tr>
                             </#list>
                         </#if>
@@ -442,7 +442,7 @@
                                 <tr>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-budget-num" value="${(costDetail_index+1)!}" readonly></td>
                                     <td>
-                                        <select style="width: 80px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-type">
+                                        <select style="width: 100px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-type">
                                             <option value="1" <#if costDetail.type == 1>selected</#if>>设备</option>
                                             <option value="2" <#if costDetail.type == 2>selected</#if>>施工</option>
                                             <option value="3" <#if costDetail.type == 3>selected</#if>>服务</option>
@@ -450,7 +450,7 @@
                                         </select>
                                     </td>
                                     <td>
-                                        <select style="width: 80px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-category">
+                                        <select style="width: 180px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-category">
                                             <#--<option value="1" <#if costDetail.category == 1>selected</#if>>华智产品</option>
                                             <option value="2" <#if costDetail.category == 2>selected</#if>>紫光其他产品</option>
                                             <option value="3" <#if costDetail.category == 3>selected</#if>>外购产品</option>
@@ -471,7 +471,7 @@
                                     <td><input type="text" maxlength="5" class="number am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate" value="${Utils.format(costDetail.taxRate,'0')}" oninput="if(value.length>5)value=value.slice(0,5)"></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-include" value="${Utils.format(costDetail.totalTaxInclude,'0')}" readonly></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-tax-exclude" value="${Utils.format(costDetail.totalTaxExclude,'0')}" readonly></td>
-                                    <td><button type="button" class="am-btn am-btn-danger am-btn-xs am-round am-modal-line-delete"><span class="am-icon-minus"></span></button></td>
+                                    <td><button type="button" style="margin-top: 10px" class="am-btn am-btn-danger am-btn-xs am-round am-modal-line-delete"><span class="am-icon-minus"></span></button></td>
                                 </tr>
                             </#list>
                         </#if>
@@ -511,14 +511,14 @@
                                 <tr>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-budget-num" value="${(costProjectManageDetail_index+1)!}" readonly></td>
                                     <td>
-                                        <select style="width: 80px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage am-modal-prompt-input-cost-project-manage-type">
+                                        <select style="width: 180px;float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage am-modal-prompt-input-cost-project-manage-type">
                                             <option value="1" <#if costProjectManageDetail.type == 1>selected</#if>>人工成本</option>
                                             <option value="2" <#if costProjectManageDetail.type == 2>selected</#if>>业务费用</option>
                                             <option value="3" <#if costProjectManageDetail.type == 3>selected</#if>>其他费用</option>
                                         </select>
                                     </td>
                                     <td>
-                                        <select <#if costProjectManageDetail.isDiy == 1>style="display:none"<#else>style="width: 80px;float: left;"</#if> class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage am-modal-prompt-input-cost-project-manage-category">
+                                        <select <#if costProjectManageDetail.isDiy == 1>style="display:none"<#else>style="width: 180px;float: left;"</#if> class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage am-modal-prompt-input-cost-project-manage-category">
                                             <#if costProjectManageDetail.type == 1>
                                             <option value="1" <#if costProjectManageDetail.name == "人工费">selected</#if>>人工费</option>
                                             <option value="2" <#if costProjectManageDetail.name == "总部支撑人力费用">selected</#if>>总部支撑人力费用</option>
@@ -542,7 +542,7 @@
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="${costProjectManageDetail.predictMethod!}"></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="${costProjectManageDetail.predictWhy!}"></td>
                                     <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="${costProjectManageDetail.remark!}"></td>
-                                    <td><button type="button" class="am-btn am-btn-danger am-btn-xs am-round am-modal-line-delete"><span class="am-icon-minus"></span></button>
+                                    <td><button type="button" style="margin-top: 10px" class="am-btn am-btn-danger am-btn-xs am-round am-modal-line-delete"><span class="am-icon-minus"></span></button>
                                         <input type="hidden" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="${costProjectManageDetail.deletable!}">
                                     </td>
                                 </tr>
diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl
index b6ee6e4..ca0b4de 100644
--- a/src/main/resources/templates/admin/project_estimate_add.ftl
+++ b/src/main/resources/templates/admin/project_estimate_add.ftl
@@ -1,7 +1,6 @@
 <#assign base=request.contextPath />
 <#import "../common/defaultLayout.ftl" as defaultLayout>
 <@defaultLayout.layout>
-
 <div class="admin-content">
     <div class="admin-content-body">
         <div class="am-cf am-padding">
@@ -95,7 +94,7 @@
                             <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>客户名称</div>
                             <div class="am-u-sm-6 am-u-md-6">
                                 <input type="text" class="am-input" data-validate-async data-validation-message="请输入客户名称（20字符以内）"
-                                       name="customer" placeholder="请输入客户名称（20字符以内）" maxlength="20"
+                                       name="customer" id="customer" placeholder="请输入客户名称（20字符以内）" maxlength="20"
                                        value="" required />
                             </div>
                             <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
@@ -104,7 +103,7 @@
                             <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>终端客户名称</div>
                             <div class="am-u-sm-6 am-u-md-6">
                                 <input type="text" class="am-input" data-validate-async data-validation-message="请输入终端客户名称（20字符以内）"
-                                       name="terminalCustomer" placeholder="请输入终端客户名称（20字符以内）" maxlength="20"
+                                       name="terminalCustomer" id="terminalCustomer" placeholder="请输入终端客户名称（20字符以内）" maxlength="20"
                                        value="" required />
                             </div>
                             <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
@@ -131,7 +130,7 @@
                             <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>合同金额</div>
                             <div class="am-u-sm-6 am-u-md-6">
                                 <input type="text" class="number am-input" data-validate-async data-validation-message="请输入合同金额"
-                                       name="contractAmount" placeholder="单位（元）" maxlength="16"
+                                       name="contractAmount" id="contractAmount" placeholder="单位（元）" maxlength="16"
                                        value="" required />
                             </div>
                             <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
@@ -140,7 +139,7 @@
                             <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>行业场景应用</div>
                             <div class="am-u-sm-6 am-u-md-6">
                                 <input type="text" class="am-input" data-validate-async data-validation-message="请输入行业场景应用"
-                                       name="industryScenario" placeholder="请输入行业场景应用" maxlength="20"
+                                       name="industryScenario" id="industryScenario" placeholder="请输入行业场景应用" maxlength="20"
                                        value="" required />
                             </div>
                             <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
@@ -149,7 +148,7 @@
                             <div class="am-u-sm-4 am-u-md-2 am-text-right">华智产品金额</div>
                             <div class="am-u-sm-6 am-u-md-6">
                                 <input type="text" class="number am-input" data-validation-message="华智产品金额"
-                                       name="huazhiProductAmount" placeholder="单位（元）" maxlength="16" value="" />
+                                       name="huazhiProductAmount" id="huazhiProductAmount" placeholder="单位（元）" maxlength="16" value="" />
                             </div>
                             <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                         </div>
@@ -157,7 +156,7 @@
                             <div class="am-u-sm-4 am-u-md-2 am-text-right">其他产品金额</div>
                             <div class="am-u-sm-6 am-u-md-6">
                                 <input type="text" class="number am-input" data-validation-message="请输入其他产品金额"
-                                       name="ziguangOtherAmount" placeholder="单位（元）" maxlength="16" value="" />
+                                       name="ziguangOtherAmount" id="ziguangOtherAmount" placeholder="单位（元）" maxlength="16" value="" />
                             </div>
                             <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                         </div>
@@ -199,8 +198,8 @@
                                 <tr>
                                     <td>收入</td>
                                     <td>设备类</td>
-                                    <td><input type="text" class="number" maxlength="16" name="incomeDeviceTaxInclude" required></td>
-                                    <td><input type="text" class="number" maxlength="16" name="incomeDeviceTaxExclude" readonly></td>
+                                    <td><input type="text" class="number" maxlength="16" name="incomeDeviceTaxInclude" id="incomeDeviceTaxInclude" required></td>
+                                    <td><input type="text" class="number" maxlength="16" name="incomeDeviceTaxExclude" id="incomeDeviceTaxExclude" readonly></td>
                                     <td>
                                         <select data-am-selected name="incomeDeviceSelect" id="incomeDeviceSelect">
                                         <option value="0">0%</option>
@@ -216,8 +215,8 @@
                                 <tr>
                                     <td>收入</td>
                                     <td>工程类</td>
-                                    <td><input type="text" class="number" maxlength="16" name="incomeEngineerTaxInclude" required></td>
-                                    <td><input type="text" class="number" maxlength="16" name="incomeEngineerTaxExclude" readonly></td>
+                                    <td><input type="text" class="number" maxlength="16" name="incomeEngineerTaxInclude" id="incomeEngineerTaxInclude" required></td>
+                                    <td><input type="text" class="number" maxlength="16" name="incomeEngineerTaxExclude" id="incomeEngineerTaxExclude" readonly></td>
                                     <td>
                                         <select data-am-selected name="incomeEngineerSelect" id="incomeEngineerSelect">
                                             <option value="0">0%</option>
@@ -233,8 +232,8 @@
                                 <tr>
                                     <td>收入</td>
                                     <td>服务类</td>
-                                    <td><input type="text" class="number" maxlength="16" name="incomeServiceTaxInclude" required></td>
-                                    <td><input type="text" class="number" maxlength="16" name="incomeServiceTaxExclude" readonly></td>
+                                    <td><input type="text" class="number" maxlength="16" name="incomeServiceTaxInclude" id="incomeServiceTaxInclude" required></td>
+                                    <td><input type="text" class="number" maxlength="16" name="incomeServiceTaxExclude" id="incomeServiceTaxExclude" readonly></td>
                                     <td>
                                         <select data-am-selected name="incomeServiceSelect" id="incomeServiceSelect">
                                             <option value="0">0%</option>
@@ -271,8 +270,8 @@
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>设备</td>
-                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseDeviceTaxInclude" required></td>
-                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseDeviceTaxExclude" readonly></td>
+                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseDeviceTaxInclude" id="costPurchaseDeviceTaxInclude" required></td>
+                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseDeviceTaxExclude" id="costPurchaseDeviceTaxExclude" readonly></td>
                                     <td>
                                         <select data-am-selected name="costPurchaseDeviceSelect" id="costPurchaseDeviceSelect">
                                             <option value="0">0%</option>
@@ -289,8 +288,8 @@
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>施工</td>
-                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseBuildTaxInclude" required></td>
-                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseBuildTaxExclude" readonly></td>
+                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseBuildTaxInclude" id="costPurchaseBuildTaxInclude" required></td>
+                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseBuildTaxExclude" id="costPurchaseBuildTaxExclude" readonly></td>
                                     <td>
                                         <select data-am-selected name="costPurchaseBuildSelect" id="costPurchaseBuildSelect">
                                             <option value="0">0%</option>
@@ -307,8 +306,8 @@
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>服务</td>
-                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseServiceTaxInclude" required></td>
-                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseServiceTaxExclude" readonly></td>
+                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseServiceTaxInclude" id="costPurchaseServiceTaxInclude" required></td>
+                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseServiceTaxExclude" id="costPurchaseServiceTaxExclude" readonly></td>
                                     <td>
                                         <select data-am-selected name="costPurchaseServiceSelect" id="costPurchaseServiceSelect">
                                             <option value="0">0%</option>
@@ -325,8 +324,8 @@
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>其他</td>
-                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseOtherTaxInclude" required></td>
-                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseOtherTaxExclude" readonly></td>
+                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseOtherTaxInclude" id="costPurchaseOtherTaxInclude" required></td>
+                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseOtherTaxExclude" id="costPurchaseOtherTaxExclude" readonly></td>
                                     <td>
                                         <select data-am-selected name="costPurchaseOtherSelect" id="costPurchaseOtherSelect">
                                             <option value="0">0%</option>
@@ -343,8 +342,8 @@
                                     <td>成本</td>
                                     <td>项目管理成本</td>
                                     <td>项目管理成本</td>
-                                    <td><input type="text" class="number" name="costProjectManageTaxInclude" readonly></td>
-                                    <td><input type="text" class="number" maxlength="16" name="costProjectManageTaxExclude" required></td>
+                                    <td><input type="text" class="number" name="costProjectManageTaxInclude" id="costProjectManageTaxInclude" readonly></td>
+                                    <td><input type="text" class="number" maxlength="16" name="costProjectManageTaxExclude" id="costProjectManageTaxExclude" required></td>
                                     <td>/</td>
                                 </tr>
                                 <tr>
@@ -387,12 +386,12 @@
                             <tr>
                                 <td>财务费用</td>
                                 <td>资金占用成本</td>
-                                <td><input type="text" class="number" maxlength="16" name="costExpropriationTaxExclude" required></td>
+                                <td><input type="text" class="number" maxlength="16" name="costExpropriationTaxExclude" id="costExpropriationTaxExclude" required></td>
                             </tr>
                             <tr>
                                 <td>公司管理费用</td>
                                 <td></td>
-                                <td><input type="text" class="number" maxlength="16" name="costCompanyManageTaxExclude" required></td>
+                                <td><input type="text" class="number" maxlength="16" name="costCompanyManageTaxExclude" id="costCompanyManageTaxExclude" required></td>
                             </tr>
                             </tbody>
                         </table>
@@ -441,24 +440,16 @@
 <script src="${base}/assets/js/project_estimate.js"></script>
 <script>
     var result = 0;
+    var check = 0;
     $(function () {
         calIncomeAndCost();
         $("#saveDraft").click(function () {
             $("#saveDraft").attr('disabled',true);
-            var startTime = $("#startDate").val();
-            var endTime = $("#endDate").val();
-            if (startTime > endTime) {
-                $("#saveDraft").attr('disabled',false);
-                window.confirm('开始日期应早于结束日期');
+            checkIfFillIn();
+            if (check == 1) {
+                $("#saveDraft").attr('disabled', false);
                 return;
             }
-            checkName();
-            if (result == 1) {
-                $("#saveDraft").attr('disabled',false);
-                window.confirm('项目名称已存在');
-                return;
-            }
-
             setTimeout(function () {
                 $("#saveDraft").attr('disabled', false);
             }, 5000);
@@ -468,20 +459,11 @@
         });
         $("#saveApprove").click(function () {
             $("#saveApprove").attr('disabled',true);
-            var startTime = $("#startDate").val();
-            var endTime = $("#endDate").val();
-            if (startTime > endTime) {
-                $("#saveApprove").attr('disabled',false);
-                window.confirm('开始日期应早于结束日期');
+            checkIfFillIn();
+            if (check == 1) {
+                $("#saveDraft").attr('disabled', false);
                 return;
             }
-            checkName();
-            if (result == 1) {
-                $("#saveApprove").attr('disabled',false);
-                window.confirm('项目名称已存在');
-                return;
-            }
-
             setTimeout(function () {
                 $("#saveApprove").attr('disabled', false);
             }, 5000);
@@ -490,11 +472,160 @@
         });
     });
 
+    function checkIfFillIn() {
+        var startTime = $("#startDate").val();
+        var endTime = $("#endDate").val();
+        var name = $("#name").val();
+        var customer = $("#customer").val();
+        var terminalCustomer = $("#terminalCustomer").val();
+        var contractAmount = $("#contractAmount").val();
+        var industryScenario = $("#industryScenario").val();
+        var mainContractCollectionTerms = $("#mainContractCollectionTerms").val();
+        var valueRisk = $("#valueRisk").val();
+
+        var incomeDeviceTaxInclude = $("#incomeDeviceTaxInclude").val();
+        var incomeDeviceTaxExclude = $("#incomeDeviceTaxExclude").val();
+        var incomeEngineerTaxInclude = $("#incomeEngineerTaxInclude").val();
+        var incomeEngineerTaxExclude = $("#incomeEngineerTaxExclude").val();
+        var incomeServiceTaxInclude = $("#incomeServiceTaxInclude").val();
+        var incomeServiceTaxExclude = $("#incomeServiceTaxExclude").val();
+        var costPurchaseDeviceTaxInclude = $("#costPurchaseDeviceTaxInclude").val();
+        var costPurchaseDeviceTaxExclude = $("#costPurchaseDeviceTaxExclude").val();
+        var costPurchaseBuildTaxInclude = $("#costPurchaseBuildTaxInclude").val();
+        var costPurchaseBuildTaxExclude = $("#costPurchaseBuildTaxExclude").val();
+        var costPurchaseServiceTaxInclude = $("#costPurchaseServiceTaxInclude").val();
+        var costPurchaseServiceTaxExclude = $("#costPurchaseServiceTaxExclude").val();
+        var costPurchaseOtherTaxInclude = $("#costPurchaseOtherTaxInclude").val();
+        var costPurchaseOtherTaxExclude = $("#costPurchaseOtherTaxExclude").val();
+        var costCompanyManageTaxExclude  = $("#costCompanyManageTaxExclude ").val();
+        var costProjectManageTaxExclude  = $("#costProjectManageTaxExclude ").val();
+
+        if (startTime.length <= 0) {
+            window.confirm('项目计划开始时间不能为空');
+            check = 1;
+            return;
+        }
+
+        if (endTime.length <= 0) {
+            window.confirm('项目计划结束时间不能为空');
+            check = 1;
+            return;
+        }
+
+        if (startTime > endTime) {
+            window.confirm('开始日期应早于结束日期');
+            check = 1;
+            return;
+        }
+
+        if (name.length <= 0) {
+            window.confirm('项目名称不能为空');
+            check = 1;
+            return;
+        }
+
+        checkName();
+        if (result == 1) {
+            window.confirm('项目名称已存在');
+            check = 1;
+            return;
+        }
+
+        if (customer == undefined || customer.length <= 0 ) {
+            window.confirm('客户名称不能为空');
+            check = 1;
+            return;
+        }
+
+        if (terminalCustomer == undefined || terminalCustomer.length <= 0) {
+            window.confirm('终端客户名称不能为空');
+            check = 1;
+            return;
+        }
+
+        if (contractAmount == undefined || contractAmount.length <= 0) {
+            window.confirm('合同金额不能为空');
+            check = 1;
+            return;
+        }
+
+        if (industryScenario == undefined || industryScenario.length <= 0) {
+            window.confirm('行业应用场景不能为空');
+            check = 1;
+            return;
+        }
+
+        if (mainContractCollectionTerms == undefined || mainContractCollectionTerms.length <= 0) {
+            window.confirm('主合同收款条款不能为空');
+            check = 1;
+            return;
+        }
+
+        if (valueRisk == undefined || valueRisk.length <= 0) {
+            window.confirm('价值及风险不能为空');
+            check = 1;
+            return;
+        }
+
+        if (incomeDeviceTaxInclude == '' || incomeDeviceTaxExclude == '' || incomeEngineerTaxInclude == '' || incomeEngineerTaxExclude == '' ||
+            incomeServiceTaxInclude == '' || incomeServiceTaxExclude == '' || costPurchaseDeviceTaxInclude == '' || costPurchaseDeviceTaxExclude == '' ||
+            costPurchaseBuildTaxInclude == '' || costPurchaseBuildTaxExclude == '' || costPurchaseServiceTaxInclude == '' || costPurchaseServiceTaxExclude == '' ||
+            costPurchaseOtherTaxInclude == '' || costPurchaseOtherTaxExclude == '' || costProjectManageTaxExclude == '' || costExpropriationTaxExclude == '' ||
+            costCompanyManageTaxExclude == '') {
+            window.confirm('请完善项目详细信息');
+            check = 1;
+            return;
+        }
+
+        if (incomeDeviceTaxInclude < incomeDeviceTaxExclude) {
+            window.confirm('设备类收入含税金额应小于不含税金额');
+            check = 1;
+            return;
+        }
+
+        if (incomeEngineerTaxInclude < incomeEngineerTaxExclude) {
+            window.confirm('工程类收入含税金额应小于不含税金额');
+            check = 1;
+            return;
+        }
+
+        if (incomeServiceTaxInclude < incomeServiceTaxExclude) {
+            window.confirm('服务类收入含税金额应小于不含税金额');
+            check = 1;
+            return;
+        }
+
+        if (costPurchaseDeviceTaxInclude < costPurchaseDeviceTaxExclude) {
+            window.confirm('设备类采购成本含税金额应小于不含税金额');
+            check = 1;
+            return;
+        }
+
+        if (costPurchaseBuildTaxInclude < costPurchaseBuildTaxExclude) {
+            window.confirm('施工类采购成本含税金额应小于不含税金额');
+            check = 1;
+            return;
+        }
+
+        if (costPurchaseServiceTaxInclude < costPurchaseServiceTaxExclude) {
+            window.confirm('服务类采购成本含税金额应小于不含税金额');
+            check = 1;
+            return;
+        }
+
+        if (costPurchaseOtherTaxInclude < costPurchaseOtherTaxExclude) {
+            window.confirm('其他类采购成本含税金额应小于不含税金额');
+            check = 1;
+            return;
+        }
+    }
+
     function checkName () {
         var name = $("#name").val();
+        var id = $("#id").val();
         $.ajax({
             url: "${base}/project/checkName",
-            data: {name: name},
+            data: {name: name, id: id},
             type: "post",
             dataType: "json",
             async: false,
diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl
index 24f9cdf..27527ce 100644
--- a/src/main/resources/templates/admin/project_estimate_edit.ftl
+++ b/src/main/resources/templates/admin/project_estimate_edit.ftl
@@ -68,7 +68,7 @@
                     <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>项目名称</div>
                     <div class="am-u-sm-6 am-u-md-6">
                         <input type="text" class="am-input" data-validate-async data-validation-message="请输入项目名称（35字符以内）"
-                               name="name" placeholder="请输入项目名称（35字符以内）" maxlength="35"
+                               name="name" id="name" placeholder="请输入项目名称（35字符以内）" maxlength="35"
                                value="${project.name}" required/>
                     </div>
                     <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
@@ -102,7 +102,7 @@
                     <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>客户名称</div>
                     <div class="am-u-sm-6 am-u-md-6">
                         <input type="text" class="am-input" data-validate-async data-validation-message="请输入客户名称（20字符以内）"
-                               name="customer" placeholder="请输入客户名称（20字符以内）" maxlength="20"
+                               name="customer" id="customer" placeholder="请输入客户名称（20字符以内）" maxlength="20"
                                value="${project.customer}" required/>
                     </div>
                     <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
@@ -111,7 +111,7 @@
                     <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>终端客户名称</div>
                     <div class="am-u-sm-6 am-u-md-6">
                         <input type="text" class="am-input" data-validate-async data-validation-message="请输入终端客户名称（20字符以内）"
-                               name="terminalCustomer" placeholder="请输入终端客户名称（20字符以内）" maxlength="20"
+                               name="terminalCustomer" id="terminalCustomer" placeholder="请输入终端客户名称（20字符以内）" maxlength="20"
                                value="${project.terminalCustomer}" required/>
                     </div>
                     <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
@@ -138,7 +138,7 @@
                     <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>合同金额</div>
                     <div class="am-u-sm-6 am-u-md-6">
                         <input type="text" class="number am-input" data-validate-async data-validation-message="请输入合同金额"
-                               name="contractAmount" placeholder="单位（元）" maxlength="16"
+                               name="contractAmount" id="contractAmount" placeholder="单位（元）" maxlength="16"
                                value="${Utils.format(project.contractAmount)}" required />
                     </div>
                     <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
@@ -147,7 +147,7 @@
                     <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>行业场景应用</div>
                     <div class="am-u-sm-6 am-u-md-6">
                         <input type="text" class="am-input" data-validate-async data-validation-message="请输入行业场景应用"
-                               name="industryScenario" placeholder="请输入行业场景应用" maxlength="20"
+                               name="industryScenario" id="industryScenario" placeholder="请输入行业场景应用" maxlength="20"
                                value="${project.industryScenario}" required/>
                     </div>
                     <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
@@ -156,7 +156,7 @@
                     <div class="am-u-sm-4 am-u-md-2 am-text-right"><#--<span style="color: red;">*</span>-->华智产品金额</div>
                     <div class="am-u-sm-6 am-u-md-6">
                         <input type="text" class="number am-input" data-validation-message="华智产品金额"
-                               name="huazhiProductAmount" placeholder="单位（元）" maxlength="16" value="${Utils.format(project.huazhiProductAmount, "0.00")}"  />
+                               name="huazhiProductAmount" id="huazhiProductAmount" placeholder="单位（元）" maxlength="16" value="${Utils.format(project.huazhiProductAmount, "0.00")}"  />
                     </div>
                     <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                 </div>
@@ -164,7 +164,7 @@
                     <div class="am-u-sm-4 am-u-md-2 am-text-right"><#--<span style="color: red;">*</span>-->其他产品金额</div>
                     <div class="am-u-sm-6 am-u-md-6">
                         <input type="text" class="number am-input" data-validation-message="请输入其他产品金额"
-                               name="ziguangOtherAmount" placeholder="单位（元）" maxlength="16" value="${Utils.format(project.ziguangOtherAmount, "0.00")}" />
+                               name="ziguangOtherAmount" id="ziguangOtherAmount" placeholder="单位（元）" maxlength="16" value="${Utils.format(project.ziguangOtherAmount, "0.00")}" />
                     </div>
                     <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                 </div>
@@ -206,8 +206,8 @@
                         <tr>
                             <td>收入</td>
                             <td>设备类</td>
-                            <td><input type="text" class="number" maxlength="16" name="incomeDeviceTaxInclude" value="${Utils.format(estimateBean.incomeDeviceTaxInclude)}" required></td>
-                            <td><input type="text" class="number" maxlength="16" name="incomeDeviceTaxExclude" value="${Utils.format(estimateBean.incomeDeviceTaxExclude)}" <#if estimateBean.incomeDeviceSelect! !="自定义">readonly</#if> required></td>
+                            <td><input type="text" class="number" maxlength="16" name="incomeDeviceTaxInclude" id="incomeDeviceTaxInclude" value="${Utils.format(estimateBean.incomeDeviceTaxInclude)}" required></td>
+                            <td><input type="text" class="number" maxlength="16" name="incomeDeviceTaxExclude" id="incomeDeviceTaxExclude" value="${Utils.format(estimateBean.incomeDeviceTaxExclude)}" <#if estimateBean.incomeDeviceSelect! !="自定义">readonly</#if> required></td>
                             <td>
                                 <select data-am-selected name="incomeDeviceSelect" id="incomeDeviceSelect">
                                     <option value="0" <#if estimateBean.incomeDeviceSelect! =="0">selected</#if>>0%</option>
@@ -223,8 +223,8 @@
                         <tr>
                             <td>收入</td>
                             <td>工程类</td>
-                            <td><input type="text" class="number" maxlength="16" name="incomeEngineerTaxInclude" value="${Utils.format(estimateBean.incomeEngineerTaxInclude)}" required></td>
-                            <td><input type="text" class="number" maxlength="16" name="incomeEngineerTaxExclude" value="${Utils.format(estimateBean.incomeEngineerTaxExclude)}" <#if estimateBean.incomeEngineerSelect! !="自定义">readonly</#if> required></td>
+                            <td><input type="text" class="number" maxlength="16" name="incomeEngineerTaxInclude" id="incomeEngineerTaxInclude" value="${Utils.format(estimateBean.incomeEngineerTaxInclude)}" required></td>
+                            <td><input type="text" class="number" maxlength="16" name="incomeEngineerTaxExclude" id="incomeEngineerTaxExclude" value="${Utils.format(estimateBean.incomeEngineerTaxExclude)}" <#if estimateBean.incomeEngineerSelect! !="自定义">readonly</#if> required></td>
                             <td>
                                 <select data-am-selected name="incomeEngineerSelect" id="incomeEngineerSelect">
                                     <option value="0" <#if estimateBean.incomeEngineerSelect! =="0">selected</#if>>0%</option>
@@ -240,8 +240,8 @@
                         <tr>
                             <td>收入</td>
                             <td>服务类</td>
-                            <td><input type="text" class="number" maxlength="16" name="incomeServiceTaxInclude" value="${Utils.format(estimateBean.incomeServiceTaxInclude)}" required></td>
-                            <td><input type="text" class="number" maxlength="16" name="incomeServiceTaxExclude" value="${Utils.format(estimateBean.incomeServiceTaxExclude)}" <#if estimateBean.incomeServiceSelect! !="自定义">readonly</#if> required></td>
+                            <td><input type="text" class="number" maxlength="16" name="incomeServiceTaxInclude" id="incomeServiceTaxInclude" value="${Utils.format(estimateBean.incomeServiceTaxInclude)}" required></td>
+                            <td><input type="text" class="number" maxlength="16" name="incomeServiceTaxExclude" id="incomeServiceTaxExclude" value="${Utils.format(estimateBean.incomeServiceTaxExclude)}" <#if estimateBean.incomeServiceSelect! !="自定义">readonly</#if> required></td>
                             <td>
                                 <select data-am-selected name="incomeServiceSelect" id="incomeServiceSelect">
                                     <option value="0" <#if estimateBean.incomeServiceSelect! =="0">selected</#if>>0%</option>
@@ -278,8 +278,8 @@
                             <td>成本</td>
                             <td>采购成本</td>
                             <td>设备</td>
-                            <td><input type="text" class="number" maxlength="16" name="costPurchaseDeviceTaxInclude" value="${Utils.format(estimateBean.costPurchaseDeviceTaxInclude)}" required></td>
-                            <td><input type="text" class="number" maxlength="16" name="costPurchaseDeviceTaxExclude" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude)}" <#if estimateBean.costPurchaseDeviceSelect! !="自定义">readonly</#if> required></td>
+                            <td><input type="text" class="number" maxlength="16" name="costPurchaseDeviceTaxInclude" id="costPurchaseDeviceTaxInclude" value="${Utils.format(estimateBean.costPurchaseDeviceTaxInclude)}" required></td>
+                            <td><input type="text" class="number" maxlength="16" name="costPurchaseDeviceTaxExclude" id="costPurchaseDeviceTaxExclude" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude)}" <#if estimateBean.costPurchaseDeviceSelect! !="自定义">readonly</#if> required></td>
                             <td>
                                 <select data-am-selected name="costPurchaseDeviceSelect" id="costPurchaseDeviceSelect">
                                     <option value="0" <#if estimateBean.costPurchaseDeviceSelect! =="0">selected</#if>>0%</option>
@@ -296,8 +296,8 @@
                             <td>成本</td>
                             <td>采购成本</td>
                             <td>施工</td>
-                            <td><input type="text" class="number" maxlength="16" name="costPurchaseBuildTaxInclude" value="${Utils.format(estimateBean.costPurchaseBuildTaxInclude)}" required></td>
-                            <td><input type="text" class="number" maxlength="16" name="costPurchaseBuildTaxExclude" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude)}" <#if estimateBean.costPurchaseBuildSelect! !="自定义">readonly</#if> required></td>
+                            <td><input type="text" class="number" maxlength="16" name="costPurchaseBuildTaxInclude" id="costPurchaseBuildTaxInclude" value="${Utils.format(estimateBean.costPurchaseBuildTaxInclude)}" required></td>
+                            <td><input type="text" class="number" maxlength="16" name="costPurchaseBuildTaxExclude" id="costPurchaseBuildTaxExclude" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude)}" <#if estimateBean.costPurchaseBuildSelect! !="自定义">readonly</#if> required></td>
                             <td>
                                 <select data-am-selected name="costPurchaseBuildSelect" id="costPurchaseBuildSelect">
                                     <option value="0" <#if estimateBean.costPurchaseBuildSelect! =="0">selected</#if>>0%</option>
@@ -314,8 +314,8 @@
                             <td>成本</td>
                             <td>采购成本</td>
                             <td>服务</td>
-                            <td><input type="text" class="number" maxlength="16" name="costPurchaseServiceTaxInclude" value="${Utils.format(estimateBean.costPurchaseServiceTaxInclude)}" required></td>
-                            <td><input type="text" class="number" maxlength="16" name="costPurchaseServiceTaxExclude" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude)}" <#if estimateBean.costPurchaseServiceSelect! !="自定义">readonly</#if> required></td>
+                            <td><input type="text" class="number" maxlength="16" name="costPurchaseServiceTaxInclude" id="costPurchaseServiceTaxInclude" value="${Utils.format(estimateBean.costPurchaseServiceTaxInclude)}" required></td>
+                            <td><input type="text" class="number" maxlength="16" name="costPurchaseServiceTaxExclude" id="costPurchaseServiceTaxExclude" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude)}" <#if estimateBean.costPurchaseServiceSelect! !="自定义">readonly</#if> required></td>
                             <td>
                                 <select data-am-selected name="costPurchaseServiceSelect" id="costPurchaseServiceSelect">
                                     <option value="0" <#if estimateBean.costPurchaseServiceSelect! =="0">selected</#if>>0%</option>
@@ -332,8 +332,8 @@
                             <td>成本</td>
                             <td>采购成本</td>
                             <td>其他</td>
-                            <td><input type="text" class="number" maxlength="16" name="costPurchaseOtherTaxInclude" value="${Utils.format(estimateBean.costPurchaseOtherTaxInclude)}" required></td>
-                            <td><input type="text" class="number" maxlength="16" name="costPurchaseOtherTaxExclude" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude)}" <#if estimateBean.costPurchaseOtherSelect! !="自定义">readonly</#if> required></td>
+                            <td><input type="text" class="number" maxlength="16" name="costPurchaseOtherTaxInclude" id="costPurchaseOtherTaxInclude" value="${Utils.format(estimateBean.costPurchaseOtherTaxInclude)}" required></td>
+                            <td><input type="text" class="number" maxlength="16" name="costPurchaseOtherTaxExclude" id="costPurchaseOtherTaxExclude" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude)}" <#if estimateBean.costPurchaseOtherSelect! !="自定义">readonly</#if> required></td>
                             <td>
                                 <select data-am-selected name="costPurchaseOtherSelect" id="costPurchaseOtherSelect">
                                     <option value="0" <#if estimateBean.costPurchaseOtherSelect! =="0">selected</#if>>0%</option>
@@ -350,8 +350,8 @@
                             <td>成本</td>
                             <td>项目管理成本</td>
                             <td>项目管理成本</td>
-                            <td><input type="text" class="number" name="costProjectManageTaxInclude" value="${Utils.format(estimateBean.costProjectManageTaxInclude)}" required readonly></td>
-                            <td><input type="text" class="number" maxlength="16" name="costProjectManageTaxExclude" value="${Utils.format(estimateBean.costProjectManageTaxExclude)}" required></td>
+                            <td><input type="text" class="number" name="costProjectManageTaxInclude" id="costProjectManageTaxInclude" value="${Utils.format(estimateBean.costProjectManageTaxInclude)}" required readonly></td>
+                            <td><input type="text" class="number" maxlength="16" name="costProjectManageTaxExclude" id="costProjectManageTaxExclude" value="${Utils.format(estimateBean.costProjectManageTaxExclude)}" required></td>
                         </tr>
                         <tr>
                             <td>成本</td>
@@ -393,12 +393,12 @@
                     <tr>
                         <td>财务费用</td>
                         <td>资金占用成本</td>
-                        <td><input type="text" class="number" maxlength="16" name="costExpropriationTaxExclude" value="${Utils.format(estimateBean.costExpropriationTaxExclude)}" required></td>
+                        <td><input type="text" class="number" maxlength="16" name="costExpropriationTaxExclude" id="costExpropriationTaxExclude" value="${Utils.format(estimateBean.costExpropriationTaxExclude)}" required></td>
                     </tr>
                     <tr>
                         <td>公司管理费用</td>
                         <td></td>
-                        <td><input type="text" class="number" maxlength="16" name="costCompanyManageTaxExclude" value="${Utils.format(estimateBean.costCompanyManageTaxExclude)}" required></td>
+                        <td><input type="text" class="number" maxlength="16" name="costCompanyManageTaxExclude" id="costCompanyManageTaxExclude" value="${Utils.format(estimateBean.costCompanyManageTaxExclude)}" required></td>
                     </tr>
                     </tbody>
                 </table>
@@ -446,15 +446,14 @@
 <script src="${base}/assets/js/project_common.js"></script>
 <script src="${base}/assets/js/project_estimate.js"></script>
 <script>
+    var check = 0;
     $(function () {
         calIncomeAndCost();
         $("#saveDraft").click(function () {
             $("#saveDraft").attr('disabled',true);
-            var startTime = $("#startDate").val();
-            var endTime = $("#endDate").val();
-            if (startTime > endTime) {
-                window.confirm('开始日期应早于结束日期');
-                $("#saveDraft").attr('disabled',false);
+            checkIfFillIn();
+            if (check == 1) {
+                $("#saveDraft").attr('disabled', false);
                 return;
             }
             setTimeout(function () {
@@ -465,11 +464,9 @@
         });
         $("#saveApprove").click(function () {
             $("#saveApprove").attr('disabled',true);
-            var startTime = $("#startDate").val();
-            var endTime = $("#endDate").val();
-            if (startTime > endTime) {
-                window.confirm('开始日期应早于结束日期');
-                $("#saveApprove").attr('disabled',false);
+            checkIfFillIn();
+            if (check == 1) {
+                $("#saveDraft").attr('disabled', false);
                 return;
             }
             setTimeout(function () {
@@ -479,6 +476,169 @@
             $("#pmsForm").submit();
         });
     });
+
+    function checkIfFillIn() {
+        var startTime = $("#startDate").val();
+        var endTime = $("#endDate").val();
+        var name = $("#name").val();
+        var customer = $("#customer").val();
+        var terminalCustomer = $("#terminalCustomer").val();
+        var contractAmount = $("#contractAmount").val();
+        var industryScenario = $("#industryScenario").val();
+        var mainContractCollectionTerms = $("#mainContractCollectionTerms").val();
+        var valueRisk = $("#valueRisk").val();
+
+        var incomeDeviceTaxInclude = $("#incomeDeviceTaxInclude").val();
+        var incomeDeviceTaxExclude = $("#incomeDeviceTaxExclude").val();
+        var incomeEngineerTaxInclude = $("#incomeEngineerTaxInclude").val();
+        var incomeEngineerTaxExclude = $("#incomeEngineerTaxExclude").val();
+        var incomeServiceTaxInclude = $("#incomeServiceTaxInclude").val();
+        var incomeServiceTaxExclude = $("#incomeServiceTaxExclude").val();
+        var costPurchaseDeviceTaxInclude = $("#costPurchaseDeviceTaxInclude").val();
+        var costPurchaseDeviceTaxExclude = $("#costPurchaseDeviceTaxExclude").val();
+        var costPurchaseBuildTaxInclude = $("#costPurchaseBuildTaxInclude").val();
+        var costPurchaseBuildTaxExclude = $("#costPurchaseBuildTaxExclude").val();
+        var costPurchaseServiceTaxInclude = $("#costPurchaseServiceTaxInclude").val();
+        var costPurchaseServiceTaxExclude = $("#costPurchaseServiceTaxExclude").val();
+        var costPurchaseOtherTaxInclude = $("#costPurchaseOtherTaxInclude").val();
+        var costPurchaseOtherTaxExclude = $("#costPurchaseOtherTaxExclude").val();
+        var costCompanyManageTaxExclude  = $("#costCompanyManageTaxExclude ").val();
+        var costProjectManageTaxExclude  = $("#costProjectManageTaxExclude ").val();
+
+        if (startTime.length <= 0) {
+            window.confirm('项目计划开始时间不能为空');
+            check = 1;
+            return;
+        }
+
+        if (endTime.length <= 0) {
+            window.confirm('项目计划结束时间不能为空');
+            check = 1;
+            return;
+        }
+
+        if (startTime > endTime) {
+            window.confirm('开始日期应早于结束日期');
+            check = 1;
+            return;
+        }
+
+        if (name.length <= 0) {
+            window.confirm('项目名称不能为空');
+            check = 1;
+            return;
+        }
+
+        checkName();
+        if (result == 1) {
+            window.confirm('项目名称已存在');
+            check = 1;
+            return;
+        }
+
+        if (customer == undefined || customer.length <= 0 ) {
+            window.confirm('客户名称不能为空');
+            check = 1;
+            return;
+        }
+
+        if (terminalCustomer == undefined || terminalCustomer.length <= 0) {
+            window.confirm('终端客户名称不能为空');
+            check = 1;
+            return;
+        }
+
+        if (contractAmount == undefined || contractAmount.length <= 0) {
+            window.confirm('合同金额不能为空');
+            check = 1;
+            return;
+        }
+
+        if (industryScenario == undefined || industryScenario.length <= 0) {
+            window.confirm('行业应用场景不能为空');
+            check = 1;
+            return;
+        }
+
+        if (mainContractCollectionTerms == undefined || mainContractCollectionTerms.length <= 0) {
+            window.confirm('主合同收款条款不能为空');
+            check = 1;
+            return;
+        }
+
+        if (valueRisk == undefined || valueRisk.length <= 0) {
+            window.confirm('价值及风险不能为空');
+            check = 1;
+            return;
+        }
+
+        if (incomeDeviceTaxInclude == '' || incomeDeviceTaxExclude == '' || incomeEngineerTaxInclude == '' || incomeEngineerTaxExclude == '' ||
+            incomeServiceTaxInclude == '' || incomeServiceTaxExclude == '' || costPurchaseDeviceTaxInclude == '' || costPurchaseDeviceTaxExclude == '' ||
+            costPurchaseBuildTaxInclude == '' || costPurchaseBuildTaxExclude == '' || costPurchaseServiceTaxInclude == '' || costPurchaseServiceTaxExclude == '' ||
+            costPurchaseOtherTaxInclude == '' || costPurchaseOtherTaxExclude == '' || costProjectManageTaxExclude == '' || costExpropriationTaxExclude == '' ||
+            costCompanyManageTaxExclude == '') {
+            window.confirm('请完善项目详细信息');
+            check = 1;
+            return;
+        }
+
+        if (incomeDeviceTaxInclude < incomeDeviceTaxExclude) {
+            window.confirm('设备类收入含税金额应小于不含税金额');
+            check = 1;
+            return;
+        }
+
+        if (incomeEngineerTaxInclude < incomeEngineerTaxExclude) {
+            window.confirm('工程类收入含税金额应小于不含税金额');
+            check = 1;
+            return;
+        }
+
+        if (incomeServiceTaxInclude < incomeServiceTaxExclude) {
+            window.confirm('服务类收入含税金额应小于不含税金额');
+            check = 1;
+            return;
+        }
+
+        if (costPurchaseDeviceTaxInclude < costPurchaseDeviceTaxExclude) {
+            window.confirm('设备类采购成本含税金额应小于不含税金额');
+            check = 1;
+            return;
+        }
+
+        if (costPurchaseBuildTaxInclude < costPurchaseBuildTaxExclude) {
+            window.confirm('施工类采购成本含税金额应小于不含税金额');
+            check = 1;
+            return;
+        }
+
+        if (costPurchaseServiceTaxInclude < costPurchaseServiceTaxExclude) {
+            window.confirm('服务类采购成本含税金额应小于不含税金额');
+            check = 1;
+            return;
+        }
+
+        if (costPurchaseOtherTaxInclude < costPurchaseOtherTaxExclude) {
+            window.confirm('其他类采购成本含税金额应小于不含税金额');
+            check = 1;
+            return;
+        }
+    }
+
+    function checkName () {
+        var name = $("#name").val();
+        var id = $("#id").val();
+        $.ajax({
+            url: "${base}/project/checkName",
+            data: {name: name, id: id},
+            type: "post",
+            dataType: "json",
+            async: false,
+            success: function (data) {
+                result = data.status;
+            }
+        });
+    };
 </script>
 </@defaultLayout.layout>