From a102c1c9b8f1c23129f89b53318fdcacde313520 Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Fri, 29 Apr 2022 15:04:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B9=E7=9B=AE=E6=A6=82?=
 =?UTF-8?q?=E7=AE=97=E4=BF=A1=E6=81=AF=E5=8F=AF=E4=B8=8D=E5=A1=AB=E5=86=99?=
 =?UTF-8?q?=EF=BC=8C=E9=BB=98=E8=AE=A4=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/project_estimate_add.ftl  | 24 +++++++++----------
 .../templates/admin/project_estimate_edit.ftl |  4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl
index aa44bf7..dcd8c79 100644
--- a/src/main/resources/templates/admin/project_estimate_add.ftl
+++ b/src/main/resources/templates/admin/project_estimate_add.ftl
@@ -198,7 +198,7 @@
                                 <tr>
                                     <td>收入</td>
                                     <td>设备类</td>
-                                    <td><input type="text" class="number" maxlength="16" name="incomeDeviceTaxInclude" id="incomeDeviceTaxInclude" required></td>
+                                    <td><input type="text" class="number" maxlength="16" name="incomeDeviceTaxInclude" id="incomeDeviceTaxInclude"></td>
                                     <td><input type="text" class="number" maxlength="16" name="incomeDeviceTaxExclude" id="incomeDeviceTaxExclude" readonly></td>
                                     <td>
                                         <select data-am-selected name="incomeDeviceSelect" id="incomeDeviceSelect">
@@ -215,7 +215,7 @@
                                 <tr>
                                     <td>收入</td>
                                     <td>工程类</td>
-                                    <td><input type="text" class="number" maxlength="16" name="incomeEngineerTaxInclude" id="incomeEngineerTaxInclude" required></td>
+                                    <td><input type="text" class="number" maxlength="16" name="incomeEngineerTaxInclude" id="incomeEngineerTaxInclude"></td>
                                     <td><input type="text" class="number" maxlength="16" name="incomeEngineerTaxExclude" id="incomeEngineerTaxExclude" readonly></td>
                                     <td>
                                         <select data-am-selected name="incomeEngineerSelect" id="incomeEngineerSelect">
@@ -232,7 +232,7 @@
                                 <tr>
                                     <td>收入</td>
                                     <td>服务类</td>
-                                    <td><input type="text" class="number" maxlength="16" name="incomeServiceTaxInclude" id="incomeServiceTaxInclude" required></td>
+                                    <td><input type="text" class="number" maxlength="16" name="incomeServiceTaxInclude" id="incomeServiceTaxInclude"></td>
                                     <td><input type="text" class="number" maxlength="16" name="incomeServiceTaxExclude" id="incomeServiceTaxExclude" readonly></td>
                                     <td>
                                         <select data-am-selected name="incomeServiceSelect" id="incomeServiceSelect">
@@ -270,7 +270,7 @@
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>设备</td>
-                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseDeviceTaxInclude" id="costPurchaseDeviceTaxInclude" required></td>
+                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseDeviceTaxInclude" id="costPurchaseDeviceTaxInclude"></td>
                                     <td><input type="text" class="number" maxlength="16" name="costPurchaseDeviceTaxExclude" id="costPurchaseDeviceTaxExclude" readonly></td>
                                     <td>
                                         <select data-am-selected name="costPurchaseDeviceSelect" id="costPurchaseDeviceSelect">
@@ -288,7 +288,7 @@
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>施工</td>
-                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseBuildTaxInclude" id="costPurchaseBuildTaxInclude" required></td>
+                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseBuildTaxInclude" id="costPurchaseBuildTaxInclude"></td>
                                     <td><input type="text" class="number" maxlength="16" name="costPurchaseBuildTaxExclude" id="costPurchaseBuildTaxExclude" readonly></td>
                                     <td>
                                         <select data-am-selected name="costPurchaseBuildSelect" id="costPurchaseBuildSelect">
@@ -306,7 +306,7 @@
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>服务</td>
-                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseServiceTaxInclude" id="costPurchaseServiceTaxInclude" required></td>
+                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseServiceTaxInclude" id="costPurchaseServiceTaxInclude"></td>
                                     <td><input type="text" class="number" maxlength="16" name="costPurchaseServiceTaxExclude" id="costPurchaseServiceTaxExclude" readonly></td>
                                     <td>
                                         <select data-am-selected name="costPurchaseServiceSelect" id="costPurchaseServiceSelect">
@@ -324,7 +324,7 @@
                                     <td>成本</td>
                                     <td>采购成本</td>
                                     <td>其他</td>
-                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseOtherTaxInclude" id="costPurchaseOtherTaxInclude" required></td>
+                                    <td><input type="text" class="number" maxlength="16" name="costPurchaseOtherTaxInclude" id="costPurchaseOtherTaxInclude"></td>
                                     <td><input type="text" class="number" maxlength="16" name="costPurchaseOtherTaxExclude" id="costPurchaseOtherTaxExclude" readonly></td>
                                     <td>
                                         <select data-am-selected name="costPurchaseOtherSelect" id="costPurchaseOtherSelect">
@@ -343,7 +343,7 @@
                                     <td>项目管理成本</td>
                                     <td>项目管理成本</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><input type="text" class="number" maxlength="16" name="costProjectManageTaxExclude" id="costProjectManageTaxExclude"></td>
                                     <td>/</td>
                                 </tr>
                                 <tr>
@@ -386,12 +386,12 @@
                             <tr>
                                 <td>财务费用</td>
                                 <td>资金占用成本</td>
-                                <td><input type="text" class="number" maxlength="16" name="costExpropriationTaxExclude" id="costExpropriationTaxExclude" required></td>
+                                <td><input type="text" class="number" maxlength="16" name="costExpropriationTaxExclude" id="costExpropriationTaxExclude"></td>
                             </tr>
                             <tr>
                                 <td>公司管理费用</td>
                                 <td></td>
-                                <td><input type="text" class="number" maxlength="16" name="costCompanyManageTaxExclude" id="costCompanyManageTaxExclude" required></td>
+                                <td><input type="text" class="number" maxlength="16" name="costCompanyManageTaxExclude" id="costCompanyManageTaxExclude"></td>
                             </tr>
                             </tbody>
                         </table>
@@ -572,7 +572,7 @@
             return;
         }
 
-        if (incomeDeviceTaxInclude == '' || incomeDeviceTaxExclude == '' || incomeEngineerTaxInclude == '' || incomeEngineerTaxExclude == '' ||
+        /*if (incomeDeviceTaxInclude == '' || incomeDeviceTaxExclude == '' || incomeEngineerTaxInclude == '' || incomeEngineerTaxExclude == '' ||
             incomeServiceTaxInclude == '' || incomeServiceTaxExclude == '' || costPurchaseDeviceTaxInclude == '' || costPurchaseDeviceTaxExclude == '' ||
             costPurchaseBuildTaxInclude == '' || costPurchaseBuildTaxExclude == '' || costPurchaseServiceTaxInclude == '' || costPurchaseServiceTaxExclude == '' ||
             costPurchaseOtherTaxInclude == '' || costPurchaseOtherTaxExclude == '' || costProjectManageTaxExclude == '' || costExpropriationTaxExclude == '' ||
@@ -628,7 +628,7 @@
             window.confirm('其他成本含税金额应大于不含税金额');
             check = 1;
             return;
-        }
+        }*/
 
         checkRate();
         if (rateResult == 1) {
diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl
index 88e6755..90fc8f9 100644
--- a/src/main/resources/templates/admin/project_estimate_edit.ftl
+++ b/src/main/resources/templates/admin/project_estimate_edit.ftl
@@ -578,7 +578,7 @@
             return;
         }
 
-        if (incomeDeviceTaxInclude == '' || incomeDeviceTaxExclude == '' || incomeEngineerTaxInclude == '' || incomeEngineerTaxExclude == '' ||
+        /*if (incomeDeviceTaxInclude == '' || incomeDeviceTaxExclude == '' || incomeEngineerTaxInclude == '' || incomeEngineerTaxExclude == '' ||
             incomeServiceTaxInclude == '' || incomeServiceTaxExclude == '' || costPurchaseDeviceTaxInclude == '' || costPurchaseDeviceTaxExclude == '' ||
             costPurchaseBuildTaxInclude == '' || costPurchaseBuildTaxExclude == '' || costPurchaseServiceTaxInclude == '' || costPurchaseServiceTaxExclude == '' ||
             costPurchaseOtherTaxInclude == '' || costPurchaseOtherTaxExclude == '' || costProjectManageTaxExclude == '' || costExpropriationTaxExclude == '' ||
@@ -636,7 +636,7 @@
             window.confirm('其他成本含税金额应大于不含税金额');
             check = 1;
             return;
-        }
+        }*/
 
         checkRate();
         if (rateResult == 1) {