From a305337e85eec89d144e9b05217b24fda50d4bc3 Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Fri, 14 Jan 2022 18:34:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=AE=97=E6=9F=A5=E7=9C=8B=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/project_approve.ftl       | 18 ++++----
 .../templates/admin/project_estimate_add.ftl  | 43 ++++++++++++++++---
 2 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index 913f01f..02398ce 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -419,15 +419,6 @@
 
                     <div class="am-tabs-bd">
                         <div class="am-tab-panel am-fade am-in" id="tab3">
-                            <#if (project.status==5 || project.status==10 || project.status==15) && project.approveStatusBudget == 1>
-                                <div class="approve-topass"></div>
-                            </#if>
-                            <#if (project.status==5 || project.status==10 || project.status==15) && project.approveStatusBudget == 2>
-                                <div class="approve-passed"></div>
-                            </#if>
-                            <#if (project.status==5 || project.status==10 || project.status==15) && project.approveStatusBudget == 3>
-                                <div class="approve-nopass"></div>
-                            </#if>
 
                             <div class="am-tabs am-margin" data-am-tabs id="subTab">
                                 <ul class="am-tabs-nav am-nav am-nav-tabs">
@@ -440,6 +431,15 @@
                             </div>
                             <div class="am-tabs-bd">
                                 <div class="am-tab-panel am-fade am-in am-active" id="tab31">
+                                    <#if (project.status==5 || project.status==10 || project.status==15) && project.approveStatusBudget == 1>
+                                        <div class="approve-topass"></div>
+                                    </#if>
+                                    <#if (project.status==5 || project.status==10 || project.status==15) && project.approveStatusBudget == 2>
+                                        <div class="approve-passed"></div>
+                                    </#if>
+                                    <#if (project.status==5 || project.status==10 || project.status==15) && project.approveStatusBudget == 3>
+                                        <div class="approve-nopass"></div>
+                                    </#if>
                                     <#--<span class="am-text-lg">收入明细表</span>-->
                                     <table class="am-table am-table-bordered am-table-radius table-main"
                                            style="padding:0;"
diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl
index 52e1ce8..a183a11 100644
--- a/src/main/resources/templates/admin/project_estimate_add.ftl
+++ b/src/main/resources/templates/admin/project_estimate_add.ftl
@@ -466,9 +466,25 @@
                 window.confirm('项目名称已存在');
                 return;
             }
-            $("#pmsForm").attr("action","${base}/project/estimateAddSave");
-            $("#pmsForm").submit();
-            $("#saveDraft").attr('disabled',false);
+
+            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){
+                $("#pmsForm").attr("action","${base}/project/estimateAddSave");
+                $("#pmsForm").submit();
+                $("#saveDraft").attr('disabled',false);
+            }else {
+                alert("请完善不含税金额")
+                return;
+            }
+
         });
         $("#saveApprove").click(function () {
             $("#saveApprove").attr('disabled',true);
@@ -485,9 +501,24 @@
                 window.confirm('项目名称已存在');
                 return;
             }
-            $("#pmsForm").attr("action","${base}/project/estimateAddSaveAndApprove");
-            $("#pmsForm").submit();
-            $("#saveApprove").attr('disabled',false);
+
+            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){
+                $("#pmsForm").attr("action","${base}/project/estimateAddSave");
+                $("#pmsForm").submit();
+                $("#saveDraft").attr('disabled',false);
+            }else {
+                alert("请完善不含税金额")
+                return;
+            }
         });
     });