From 49e617b3db0574b5c6ec25567150a812aefcadec Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Tue, 18 Jan 2022 16:09:55 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A2=84=E7=AE=97?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=A0=A1=E9=AA=8C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/static/assets/js/project_estimate.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/resources/static/assets/js/project_estimate.js b/src/main/resources/static/assets/js/project_estimate.js
index aa0842f..20ddbc4 100644
--- a/src/main/resources/static/assets/js/project_estimate.js
+++ b/src/main/resources/static/assets/js/project_estimate.js
@@ -147,6 +147,7 @@ function calIncomeAndCost() {
             $incomeDeviceTaxExclude.val("");
         } else {
             $("input[name='incomeDeviceTaxExclude']").attr('readonly',true);
+            $("input[name='incomeDeviceTaxExclude']").removeClass("number am-field-error am-active").addClass("number am-active am-field-valid");
             var incomeDeviceTaxInclude = inputVal("incomeDeviceTaxInclude");
             $incomeDeviceTaxExclude.val(f2Fixed(f2(incomeDeviceTaxInclude)/(1+Number(val))));
         }
@@ -180,6 +181,7 @@ function calIncomeAndCost() {
             $incomeEngineerTaxExclude.val("");
         } else {
             $("input[name='incomeEngineerTaxExclude']").attr('readonly',true);
+            $("input[name='incomeEngineerTaxExclude']").removeClass("number am-field-error am-active").addClass("number am-active am-field-valid");
             var incomeEngineerTaxInclude = inputVal("incomeEngineerTaxInclude");
             $incomeEngineerTaxExclude.val(f2Fixed(f2(incomeEngineerTaxInclude)/(1+Number(val))));
         }
@@ -213,6 +215,7 @@ function calIncomeAndCost() {
             $incomeServiceTaxExclude.val("");
         } else {
             $("input[name='incomeServiceTaxExclude']").attr('readonly',true);
+            $("input[name='incomeServiceTaxExclude']").removeClass("number am-field-error am-active").addClass("number am-active am-field-valid");
             var incomeServiceTaxInclude = inputVal("incomeServiceTaxInclude");
             $incomeServiceTaxExclude.val(f2Fixed(f2(incomeServiceTaxInclude)/(1+Number(val))));
         }
@@ -246,6 +249,7 @@ function calIncomeAndCost() {
             $costPurchaseDeviceTaxExclude.val("");
         } else {
             $("input[name='costPurchaseDeviceTaxExclude']").attr('readonly',true);
+            $("input[name='costPurchaseDeviceTaxExclude']").removeClass("number am-field-error am-active").addClass("number am-active am-field-valid");
             var costPurchaseDeviceTaxInclude = inputVal("costPurchaseDeviceTaxInclude");
             $costPurchaseDeviceTaxExclude.val(f2Fixed(f2(costPurchaseDeviceTaxInclude)/(1+Number(val))));
         }
@@ -279,6 +283,7 @@ function calIncomeAndCost() {
             $costPurchaseBuildTaxExclude.val("");
         } else {
             $("input[name='costPurchaseBuildTaxExclude']").attr('readonly',true);
+            $("input[name='costPurchaseBuildTaxExclude']").removeClass("number am-field-error am-active").addClass("number am-active am-field-valid");
             var costPurchaseBuildTaxInclude = inputVal("costPurchaseBuildTaxInclude");
             $costPurchaseBuildTaxExclude.val(f2Fixed(f2(costPurchaseBuildTaxInclude)/(1+Number(val))));
         }
@@ -312,6 +317,7 @@ function calIncomeAndCost() {
             $costPurchaseServiceTaxExclude.val("");
         } else {
             $("input[name='costPurchaseServiceTaxExclude']").attr('readonly',true);
+            $("input[name='costPurchaseServiceTaxExclude']").removeClass("number am-field-error am-active").addClass("number am-active am-field-valid");
             var costPurchaseServiceTaxInclude = inputVal("costPurchaseServiceTaxInclude");
             $costPurchaseServiceTaxExclude.val(f2Fixed(f2(costPurchaseServiceTaxInclude)/(1+Number(val))));
         }
@@ -378,6 +384,7 @@ function calIncomeAndCost() {
             $costPurchaseOtherTaxExclude.val("");
         } else {
             $("input[name='costPurchaseOtherTaxExclude']").attr('readonly',true);
+            $("input[name='costPurchaseOtherTaxExclude']").removeClass("number am-field-error am-active").addClass("number am-active am-field-valid");
             var costPurchaseOtherTaxInclude = inputVal("costPurchaseOtherTaxInclude");
             $costPurchaseOtherTaxExclude.val(f2Fixed(f2(costPurchaseOtherTaxInclude)/(1+Number(val))));
         }

From bbf42734d72cfb5e41eba219c648579d3c9a699d Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Tue, 18 Jan 2022 16:12:01 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A2=84=E7=AE=97?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=A0=A1=E9=AA=8C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/project_estimate_add.ftl  | 50 ++++---------------
 1 file changed, 10 insertions(+), 40 deletions(-)

diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl
index 620cf45..7427f7c 100644
--- a/src/main/resources/templates/admin/project_estimate_add.ftl
+++ b/src/main/resources/templates/admin/project_estimate_add.ftl
@@ -467,26 +467,11 @@
                 return;
             }
 
-            var incomeDeviceTaxExclude = $("input[name='incomeDeviceTaxExclude']").val();
-            var incomeEngineerTaxExclude = $("input[name='incomeEngineerTaxExclude']").val();
-            var incomeServiceTaxExclude = $("input[name='incomeServiceTaxExclude']").val();
-            var costPurchaseDeviceTaxExclude = $("input[name='costPurchaseDeviceTaxExclude']").val();
-            var costPurchaseBuildTaxExclude = $("input[name='costPurchaseBuildTaxExclude']").val();
-            var costPurchaseServiceTaxExclude = $("input[name='costPurchaseServiceTaxExclude']").val();
-            var costOtherOtherTaxExclude = $("input[name='costOtherOtherTaxExclude']").val();
-
-            if(incomeDeviceTaxExclude && incomeEngineerTaxExclude && incomeServiceTaxExclude
-            && costPurchaseDeviceTaxExclude && costPurchaseBuildTaxExclude && costPurchaseServiceTaxExclude && costOtherOtherTaxExclude){
-                setTimeout(function () {
-                    $("#saveDraft").attr('disabled', false);
-                }, 5000);
-                $("#pmsForm").attr("action","${base}/project/estimateAddSave");
-                $("#pmsForm").submit();
-            }else {
-                alert("请完善不含税金额");
-                $("#saveDraft").attr('disabled',false);
-                return;
-            }
+            setTimeout(function () {
+                $("#saveDraft").attr('disabled', false);
+            }, 5000);
+            $("#pmsForm").attr("action","${base}/project/estimateAddSave");
+            $("#pmsForm").submit();
 
         });
         $("#saveApprove").click(function () {
@@ -505,26 +490,11 @@
                 return;
             }
 
-            var incomeDeviceTaxExclude = $("input[name='incomeDeviceTaxExclude']").val();
-            var incomeEngineerTaxExclude = $("input[name='incomeEngineerTaxExclude']").val();
-            var incomeServiceTaxExclude = $("input[name='incomeServiceTaxExclude']").val();
-            var costPurchaseDeviceTaxExclude = $("input[name='costPurchaseDeviceTaxExclude']").val();
-            var costPurchaseBuildTaxExclude = $("input[name='costPurchaseBuildTaxExclude']").val();
-            var costPurchaseServiceTaxExclude = $("input[name='costPurchaseServiceTaxExclude']").val();
-            var costOtherOtherTaxExclude = $("input[name='costOtherOtherTaxExclude']").val();
-
-            if(incomeDeviceTaxExclude && incomeEngineerTaxExclude && incomeServiceTaxExclude
-                && costPurchaseDeviceTaxExclude && costPurchaseBuildTaxExclude && costPurchaseServiceTaxExclude && costOtherOtherTaxExclude){
-                setTimeout(function () {
-                    $("#saveApprove").attr('disabled', false);
-                }, 5000);
-                $("#pmsForm").attr("action","${base}/project/estimateAddSave");
-                $("#pmsForm").submit();
-            }else {
-                alert("请完善不含税金额");
-                $("#saveApprove").attr('disabled',false);
-                return;
-            }
+            setTimeout(function () {
+                $("#saveApprove").attr('disabled', false);
+            }, 5000);
+            $("#pmsForm").attr("action","${base}/project/estimateAddSave");
+            $("#pmsForm").submit();
         });
     });
 

From b789ff0465b8aedd46454346f8fd9ee7e2ff28c9 Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Tue, 18 Jan 2022 16:25:56 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A2=84=E7=AE=97?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=A0=A1=E9=AA=8C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/project_estimate_add.ftl     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl
index 7427f7c..d866a3b 100644
--- a/src/main/resources/templates/admin/project_estimate_add.ftl
+++ b/src/main/resources/templates/admin/project_estimate_add.ftl
@@ -200,7 +200,7 @@
                                     <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="incomeDeviceTaxExclude" readonly required></td>
                                     <td>
                                         <select data-am-selected name="incomeDeviceSelect" id="incomeDeviceSelect">
                                         <option value="请选择税率">请选择税率</option>
@@ -218,7 +218,7 @@
                                     <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="incomeEngineerTaxExclude" readonly required></td>
                                     <td>
                                         <select data-am-selected name="incomeEngineerSelect" id="incomeEngineerSelect">
                                             <option value="请选择税率">请选择税率</option>
@@ -236,7 +236,7 @@
                                     <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="incomeServiceTaxExclude" readonly required></td>
                                     <td>
                                         <select data-am-selected name="incomeServiceSelect" id="incomeServiceSelect">
                                             <option value="请选择税率">请选择税率</option>
@@ -275,7 +275,7 @@
                                     <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="costPurchaseDeviceTaxExclude" readonly required></td>
                                     <td>
                                         <select data-am-selected name="costPurchaseDeviceSelect" id="costPurchaseDeviceSelect">
                                             <option value="请选择税率">请选择税率</option>
@@ -294,7 +294,7 @@
                                     <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="costPurchaseBuildTaxExclude" readonly required></td>
                                     <td>
                                         <select data-am-selected name="costPurchaseBuildSelect" id="costPurchaseBuildSelect">
                                             <option value="请选择税率">请选择税率</option>
@@ -313,7 +313,7 @@
                                     <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="costPurchaseServiceTaxExclude" readonly required></td>
                                     <td>
                                         <select data-am-selected name="costPurchaseServiceSelect" id="costPurchaseServiceSelect">
                                             <option value="请选择税率">请选择税率</option>
@@ -332,7 +332,7 @@
                                     <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="costPurchaseOtherTaxExclude" readonly required></td>
                                     <td>
                                         <select data-am-selected name="costPurchaseOtherSelect" id="costPurchaseOtherSelect">
                                             <option value="请选择税率">请选择税率</option>
@@ -351,7 +351,7 @@
                                     <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" maxlength="16" name="costProjectManageTaxExclude" required required></td>
                                     <td>/</td>
                                 </tr>
                                 <tr>

From 422b0676762b4e57f2bd849a45a972625dc62ab0 Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Tue, 18 Jan 2022 17:47:02 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A6=82=E7=AE=97?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=A0=A1=E9=AA=8C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/assets/js/project_estimate.js      | 18 +++++++-------
 .../templates/admin/project_estimate_add.ftl  | 24 +++++++------------
 2 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/src/main/resources/static/assets/js/project_estimate.js b/src/main/resources/static/assets/js/project_estimate.js
index 20ddbc4..ac1ad26 100644
--- a/src/main/resources/static/assets/js/project_estimate.js
+++ b/src/main/resources/static/assets/js/project_estimate.js
@@ -141,13 +141,12 @@ function calIncomeAndCost() {
         var $incomeDeviceTaxExclude = $("input[name='incomeDeviceTaxExclude']");
         if(val == "自定义"){
             $("input[name='incomeDeviceTaxExclude']").attr('readonly',false);
-            $incomeDeviceTaxExclude.val("");
+            $("input[name='incomeDeviceTaxExclude']").attr("required",true);
         }else if(val == "请选择税率"){
             $("input[name='incomeDeviceTaxExclude']").attr('readonly',true);
             $incomeDeviceTaxExclude.val("");
         } else {
             $("input[name='incomeDeviceTaxExclude']").attr('readonly',true);
-            $("input[name='incomeDeviceTaxExclude']").removeClass("number am-field-error am-active").addClass("number am-active am-field-valid");
             var incomeDeviceTaxInclude = inputVal("incomeDeviceTaxInclude");
             $incomeDeviceTaxExclude.val(f2Fixed(f2(incomeDeviceTaxInclude)/(1+Number(val))));
         }
@@ -176,12 +175,12 @@ function calIncomeAndCost() {
         var $incomeEngineerTaxExclude = $("input[name='incomeEngineerTaxExclude']");
         if(val == "自定义"){
             $("input[name='incomeEngineerTaxExclude']").attr('readonly',false)
+            $("input[name='incomeEngineerTaxExclude']").attr("required",true);
         }else if(val == "请选择税率"){
             $("input[name='incomeEngineerTaxExclude']").attr('readonly',true);
             $incomeEngineerTaxExclude.val("");
         } else {
             $("input[name='incomeEngineerTaxExclude']").attr('readonly',true);
-            $("input[name='incomeEngineerTaxExclude']").removeClass("number am-field-error am-active").addClass("number am-active am-field-valid");
             var incomeEngineerTaxInclude = inputVal("incomeEngineerTaxInclude");
             $incomeEngineerTaxExclude.val(f2Fixed(f2(incomeEngineerTaxInclude)/(1+Number(val))));
         }
@@ -209,13 +208,13 @@ function calIncomeAndCost() {
         let val = $('#incomeServiceSelect option:selected').val();
         var $incomeServiceTaxExclude = $("input[name='incomeServiceTaxExclude']");
         if(val == "自定义"){
-            $("input[name='incomeServiceTaxExclude']").attr('readonly',false)
+            $("input[name='incomeServiceTaxExclude']").attr('readonly',false);
+            $("input[name='incomeServiceTaxExclude']").attr("required",true);
         }else if(val == "请选择税率"){
             $("input[name='incomeServiceTaxExclude']").attr('readonly',true);
             $incomeServiceTaxExclude.val("");
         } else {
             $("input[name='incomeServiceTaxExclude']").attr('readonly',true);
-            $("input[name='incomeServiceTaxExclude']").removeClass("number am-field-error am-active").addClass("number am-active am-field-valid");
             var incomeServiceTaxInclude = inputVal("incomeServiceTaxInclude");
             $incomeServiceTaxExclude.val(f2Fixed(f2(incomeServiceTaxInclude)/(1+Number(val))));
         }
@@ -244,12 +243,12 @@ function calIncomeAndCost() {
         var $costPurchaseDeviceTaxExclude = $("input[name='costPurchaseDeviceTaxExclude']");
         if(val == "自定义"){
             $("input[name='costPurchaseDeviceTaxExclude']").attr('readonly',false)
+            $("input[name='costPurchaseDeviceTaxExclude']").attr("required",true);
         }else if(val == "请选择税率"){
             $("input[name='costPurchaseDeviceTaxExclude']").attr('readonly',true);
             $costPurchaseDeviceTaxExclude.val("");
         } else {
             $("input[name='costPurchaseDeviceTaxExclude']").attr('readonly',true);
-            $("input[name='costPurchaseDeviceTaxExclude']").removeClass("number am-field-error am-active").addClass("number am-active am-field-valid");
             var costPurchaseDeviceTaxInclude = inputVal("costPurchaseDeviceTaxInclude");
             $costPurchaseDeviceTaxExclude.val(f2Fixed(f2(costPurchaseDeviceTaxInclude)/(1+Number(val))));
         }
@@ -278,12 +277,12 @@ function calIncomeAndCost() {
         var $costPurchaseBuildTaxExclude = $("input[name='costPurchaseBuildTaxExclude']");
         if(val == "自定义"){
             $("input[name='costPurchaseBuildTaxExclude']").attr('readonly',false)
+            $("input[name='costPurchaseBuildTaxExclude']").attr("required",true);
         }else if(val == "请选择税率"){
             $("input[name='costPurchaseBuildTaxExclude']").attr('readonly',true);
             $costPurchaseBuildTaxExclude.val("");
         } else {
             $("input[name='costPurchaseBuildTaxExclude']").attr('readonly',true);
-            $("input[name='costPurchaseBuildTaxExclude']").removeClass("number am-field-error am-active").addClass("number am-active am-field-valid");
             var costPurchaseBuildTaxInclude = inputVal("costPurchaseBuildTaxInclude");
             $costPurchaseBuildTaxExclude.val(f2Fixed(f2(costPurchaseBuildTaxInclude)/(1+Number(val))));
         }
@@ -312,12 +311,12 @@ function calIncomeAndCost() {
         var $costPurchaseServiceTaxExclude = $("input[name='costPurchaseServiceTaxExclude']");
         if(val == "自定义"){
             $("input[name='costPurchaseServiceTaxExclude']").attr('readonly',false)
+            $("input[name='costPurchaseServiceTaxExclude']").attr("required",true);
         }else if(val == "请选择税率"){
             $("input[name='costPurchaseServiceTaxExclude']").attr('readonly',true);
             $costPurchaseServiceTaxExclude.val("");
         } else {
             $("input[name='costPurchaseServiceTaxExclude']").attr('readonly',true);
-            $("input[name='costPurchaseServiceTaxExclude']").removeClass("number am-field-error am-active").addClass("number am-active am-field-valid");
             var costPurchaseServiceTaxInclude = inputVal("costPurchaseServiceTaxInclude");
             $costPurchaseServiceTaxExclude.val(f2Fixed(f2(costPurchaseServiceTaxInclude)/(1+Number(val))));
         }
@@ -346,6 +345,7 @@ function calIncomeAndCost() {
         var $costOtherOtherTaxExclude = $("input[name='costOtherOtherTaxExclude']");
         if(val == "自定义"){
             $("input[name='costOtherOtherTaxExclude']").attr('readonly',false)
+            $("input[name='costOtherOtherTaxExclude']").attr("required",true);
         }else if(val == "请选择税率"){
             $("input[name='costOtherOtherTaxExclude']").attr('readonly',true);
             $costOtherOtherTaxExclude.val("");
@@ -379,12 +379,12 @@ function calIncomeAndCost() {
         var $costPurchaseOtherTaxExclude = $("input[name='costPurchaseOtherTaxExclude']");
         if(val == "自定义"){
             $("input[name='costPurchaseOtherTaxExclude']").attr('readonly',false)
+            $("input[name='costPurchaseOtherTaxExclude']").attr("required",true);
         }else if(val == "请选择税率"){
             $("input[name='costPurchaseOtherTaxExclude']").attr('readonly',true);
             $costPurchaseOtherTaxExclude.val("");
         } else {
             $("input[name='costPurchaseOtherTaxExclude']").attr('readonly',true);
-            $("input[name='costPurchaseOtherTaxExclude']").removeClass("number am-field-error am-active").addClass("number am-active am-field-valid");
             var costPurchaseOtherTaxInclude = inputVal("costPurchaseOtherTaxInclude");
             $costPurchaseOtherTaxExclude.val(f2Fixed(f2(costPurchaseOtherTaxInclude)/(1+Number(val))));
         }
diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl
index d866a3b..751a4f0 100644
--- a/src/main/resources/templates/admin/project_estimate_add.ftl
+++ b/src/main/resources/templates/admin/project_estimate_add.ftl
@@ -200,10 +200,9 @@
                                     <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 required></td>
+                                    <td><input type="text" class="number" maxlength="16" name="incomeDeviceTaxExclude" readonly></td>
                                     <td>
                                         <select data-am-selected name="incomeDeviceSelect" id="incomeDeviceSelect">
-                                        <option value="请选择税率">请选择税率</option>
                                         <option value="0">0%</option>
                                         <option value="0.01">1%</option>
                                         <option value="0.03">3%</option>
@@ -218,10 +217,9 @@
                                     <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 required></td>
+                                    <td><input type="text" class="number" maxlength="16" name="incomeEngineerTaxExclude" readonly></td>
                                     <td>
                                         <select data-am-selected name="incomeEngineerSelect" id="incomeEngineerSelect">
-                                            <option value="请选择税率">请选择税率</option>
                                             <option value="0">0%</option>
                                             <option value="0.01">1%</option>
                                             <option value="0.03">3%</option>
@@ -236,10 +234,9 @@
                                     <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 required></td>
+                                    <td><input type="text" class="number" maxlength="16" name="incomeServiceTaxExclude" readonly></td>
                                     <td>
                                         <select data-am-selected name="incomeServiceSelect" id="incomeServiceSelect">
-                                            <option value="请选择税率">请选择税率</option>
                                             <option value="0">0%</option>
                                             <option value="0.01">1%</option>
                                             <option value="0.03">3%</option>
@@ -275,10 +272,9 @@
                                     <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 required></td>
+                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseDeviceTaxExclude" readonly></td>
                                     <td>
                                         <select data-am-selected name="costPurchaseDeviceSelect" id="costPurchaseDeviceSelect">
-                                            <option value="请选择税率">请选择税率</option>
                                             <option value="0">0%</option>
                                             <option value="0.01">1%</option>
                                             <option value="0.03">3%</option>
@@ -294,10 +290,9 @@
                                     <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 required></td>
+                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseBuildTaxExclude" readonly></td>
                                     <td>
                                         <select data-am-selected name="costPurchaseBuildSelect" id="costPurchaseBuildSelect">
-                                            <option value="请选择税率">请选择税率</option>
                                             <option value="0">0%</option>
                                             <option value="0.01">1%</option>
                                             <option value="0.03">3%</option>
@@ -313,10 +308,9 @@
                                     <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 required></td>
+                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseServiceTaxExclude" readonly></td>
                                     <td>
                                         <select data-am-selected name="costPurchaseServiceSelect" id="costPurchaseServiceSelect">
-                                            <option value="请选择税率">请选择税率</option>
                                             <option value="0">0%</option>
                                             <option value="0.01">1%</option>
                                             <option value="0.03">3%</option>
@@ -332,10 +326,9 @@
                                     <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 required></td>
+                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseOtherTaxExclude" readonly></td>
                                     <td>
                                         <select data-am-selected name="costPurchaseOtherSelect" id="costPurchaseOtherSelect">
-                                            <option value="请选择税率">请选择税率</option>
                                             <option value="0">0%</option>
                                             <option value="0.01">1%</option>
                                             <option value="0.03">3%</option>
@@ -351,7 +344,7 @@
                                     <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 required></td>
+                                    <td><input type="text" class="number" maxlength="16" name="costProjectManageTaxExclude" required></td>
                                     <td>/</td>
                                 </tr>
                                 <tr>
@@ -363,7 +356,6 @@
                                     <td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxExclude" readonly></td>
                                     <td>
                                         <select data-am-selected name="costOtherOtherSelect" id="costOtherOtherSelect">
-                                            <option value="请选择税率">请选择税率</option>
                                             <option value="0">0%</option>
                                             <option value="0.01">1%</option>
                                             <option value="0.03">3%</option>

From ba8d8b4427080d6150e3707afa127b8de89f621a Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Tue, 18 Jan 2022 18:00:34 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A6=82=E7=AE=97?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=A0=A1=E9=AA=8C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/admin/project_estimate_add.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl
index 751a4f0..5db5ee2 100644
--- a/src/main/resources/templates/admin/project_estimate_add.ftl
+++ b/src/main/resources/templates/admin/project_estimate_add.ftl
@@ -485,7 +485,7 @@
             setTimeout(function () {
                 $("#saveApprove").attr('disabled', false);
             }, 5000);
-            $("#pmsForm").attr("action","${base}/project/estimateAddSave");
+            $("#pmsForm").attr("action","${base}/project/estimateAddSaveAndApprove");
             $("#pmsForm").submit();
         });
     });

From 361f50647685c93b2bede985dc7fe018083305f2 Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Tue, 18 Jan 2022 18:27:55 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=8D=95=E4=BB=B7=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E6=97=B6=E4=B9=9F=E5=8F=965=E4=BD=8D=E5=B0=8F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/static/assets/js/project_budget.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js
index 169b47e..40935ee 100644
--- a/src/main/resources/static/assets/js/project_budget.js
+++ b/src/main/resources/static/assets/js/project_budget.js
@@ -448,7 +448,7 @@ function bindChangeableInput() {
     $(".input-changeable-amount").change(function () {
         var amount = parseInt($(this).val());
         //找到对应的单价和税率
-        var price = f2($(this).parent().parent().find(".input-changeable-price").val());
+        var price = f5($(this).parent().parent().find(".input-changeable-price").val());
         var taxRate = f2($(this).parent().parent().find(".input-changeable-tax-rate").val());
         console.log(amount, price, taxRate);
 
@@ -473,7 +473,7 @@ function bindChangeableInput() {
         var taxRate = f2($(this).val());
         //找到对应的数量和单价
         var amount = parseInt($(this).parent().parent().find(".input-changeable-amount").val());
-        var price = f2($(this).parent().parent().find(".input-changeable-price").val());
+        var price = f5($(this).parent().parent().find(".input-changeable-price").val());
         console.log(amount, price, taxRate);
 
         $(this).parent().parent().find(".input-changeable-total-tax-exclude").val(f2Fixed(amount * price / (1 + taxRate / 100)));