修复项目概算表

src/main/resources/templates/admin/project_estimate_add.ftl

@@ -481,7 +481,8 @@
                 $("#pmsForm").submit();
                 $("#saveDraft").attr('disabled',false);
             }else {
-                alert("请完善不含税金额")
+                alert("请完善不含税金额");
+                $("#saveDraft").attr('disabled',false);
                 return;
             }
 
@@ -514,9 +515,10 @@
                 && costPurchaseDeviceTaxExclude && costPurchaseBuildTaxExclude && costPurchaseServiceTaxExclude && costOtherOtherTaxExclude){
                 $("#pmsForm").attr("action","${base}/project/estimateAddSave");
                 $("#pmsForm").submit();
-                $("#saveDraft").attr('disabled',false);
+                $("#saveApprove").attr('disabled',false);
             }else {
-                alert("请完善不含税金额")
+                alert("请完善不含税金额");
+                $("#saveApprove").attr('disabled',false);
                 return;
             }
         });

src/main/resources/templates/admin/project_estimate_edit.ftl

@@ -210,7 +210,6 @@
                             <td><input type="text" class="number" maxlength="16" name="incomeDeviceTaxExclude" value="${Utils.format(estimateBean.incomeDeviceTaxExclude)}" <#if estimateBean.incomeDeviceSelect! !="自定义">readonly</#if> required></td>
                             <td>
                                 <select data-am-selected name="incomeDeviceSelect" id="incomeDeviceSelect">
-                                    <option value="请选择税率">请选择税率</option>
                                     <option value="0" <#if estimateBean.incomeDeviceSelect! =="0">selected</#if>>0%</option>
                                     <option value="0.01" <#if estimateBean.incomeDeviceSelect! =="0.01">selected</#if>>1%</option>
                                     <option value="0.03" <#if estimateBean.incomeDeviceSelect! =="0.03">selected</#if>>3%</option>
@@ -228,7 +227,6 @@
                             <td><input type="text" class="number" maxlength="16" name="incomeEngineerTaxExclude" value="${Utils.format(estimateBean.incomeEngineerTaxExclude)}" <#if estimateBean.incomeEngineerSelect! !="自定义">readonly</#if> required></td>
                             <td>
                                 <select data-am-selected name="incomeEngineerSelect" id="incomeEngineerSelect">
-                                    <option value="请选择税率">请选择税率</option>
                                     <option value="0" <#if estimateBean.incomeEngineerSelect! =="0">selected</#if>>0%</option>
                                     <option value="0.01" <#if estimateBean.incomeEngineerSelect! =="0.01">selected</#if>>1%</option>
                                     <option value="0.03" <#if estimateBean.incomeEngineerSelect! =="0.03">selected</#if>>3%</option>
@@ -246,7 +244,6 @@
                             <td><input type="text" class="number" maxlength="16" name="incomeServiceTaxExclude" value="${Utils.format(estimateBean.incomeServiceTaxExclude)}" <#if estimateBean.incomeServiceSelect! !="自定义">readonly</#if> required></td>
                             <td>
                                 <select data-am-selected name="incomeServiceSelect" id="incomeServiceSelect">
-                                    <option value="请选择税率">请选择税率</option>
                                     <option value="0" <#if estimateBean.incomeServiceSelect! =="0">selected</#if>>0%</option>
                                     <option value="0.01" <#if estimateBean.incomeServiceSelect! =="0.01">selected</#if>>1%</option>
                                     <option value="0.03" <#if estimateBean.incomeServiceSelect! =="0.03">selected</#if>>3%</option>
@@ -285,7 +282,6 @@
                             <td><input type="text" class="number" maxlength="16" name="costPurchaseDeviceTaxExclude" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude)}" <#if estimateBean.costPurchaseDeviceSelect! !="自定义">readonly</#if> required></td>
                             <td>
                                 <select data-am-selected name="costPurchaseDeviceSelect" id="costPurchaseDeviceSelect">
-                                    <option value="请选择税率">请选择税率</option>
                                     <option value="0" <#if estimateBean.costPurchaseDeviceSelect! =="0">selected</#if>>0%</option>
                                     <option value="0.01" <#if estimateBean.costPurchaseDeviceSelect! =="0.01">selected</#if>>1%</option>
                                     <option value="0.03" <#if estimateBean.costPurchaseDeviceSelect! =="0.03">selected</#if>>3%</option>
@@ -304,7 +300,6 @@
                             <td><input type="text" class="number" maxlength="16" name="costPurchaseBuildTaxExclude" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude)}" <#if estimateBean.costPurchaseBuildSelect! !="自定义">readonly</#if> required></td>
                             <td>
                                 <select data-am-selected name="costPurchaseBuildSelect" id="costPurchaseBuildSelect">
-                                    <option value="请选择税率">请选择税率</option>
                                     <option value="0" <#if estimateBean.costPurchaseBuildSelect! =="0">selected</#if>>0%</option>
                                     <option value="0.01" <#if estimateBean.costPurchaseBuildSelect! =="0.01">selected</#if>>1%</option>
                                     <option value="0.03" <#if estimateBean.costPurchaseBuildSelect! =="0.03">selected</#if>>3%</option>
@@ -323,7 +318,6 @@
                             <td><input type="text" class="number" maxlength="16" name="costPurchaseServiceTaxExclude" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude)}" <#if estimateBean.costPurchaseServiceSelect! !="自定义">readonly</#if> required></td>
                             <td>
                                 <select data-am-selected name="costPurchaseServiceSelect" id="costPurchaseServiceSelect">
-                                    <option value="请选择税率">请选择税率</option>
                                     <option value="0" <#if estimateBean.costPurchaseServiceSelect! =="0">selected</#if>>0%</option>
                                     <option value="0.01" <#if estimateBean.costPurchaseServiceSelect! =="0.01">selected</#if>>1%</option>
                                     <option value="0.03" <#if estimateBean.costPurchaseServiceSelect! =="0.03">selected</#if>>3%</option>
@@ -342,7 +336,6 @@
                             <td><input type="text" class="number" maxlength="16" name="costPurchaseOtherTaxExclude" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude)}" <#if estimateBean.costPurchaseOtherSelect! !="自定义">readonly</#if> required></td>
                             <td>
                                 <select data-am-selected name="costPurchaseOtherSelect" id="costPurchaseOtherSelect">
-                                    <option value="请选择税率">请选择税率</option>
                                     <option value="0" <#if estimateBean.costPurchaseOtherSelect! =="0">selected</#if>>0%</option>
                                     <option value="0.01" <#if estimateBean.costPurchaseOtherSelect! =="0.01">selected</#if>>1%</option>
                                     <option value="0.03" <#if estimateBean.costPurchaseOtherSelect! =="0.03">selected</#if>>3%</option>
@@ -369,7 +362,6 @@
                             <td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxExclude" value="${Utils.format(estimateBean.costOtherOtherTaxExclude, "0.00")}" <#if estimateBean.costOtherOtherSelect! !="自定义">readonly</#if>></td>
                             <td>
                                 <select data-am-selected name="costOtherOtherSelect" id="costOtherOtherSelect">
-                                    <option value="请选择税率">请选择税率</option>
                                     <option value="0" <#if estimateBean.costOtherOtherSelect! =="0">selected</#if>>0%</option>
                                     <option value="0.01" <#if estimateBean.costOtherOtherSelect! =="0.01">selected</#if>>1%</option>
                                     <option value="0.03" <#if estimateBean.costOtherOtherSelect! =="0.03">selected</#if>>3%</option>