diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl index 37fb5fd..43b98c3 100644 --- a/src/main/resources/templates/admin/project_estimate_add.ftl +++ b/src/main/resources/templates/admin/project_estimate_add.ftl @@ -579,43 +579,43 @@ return; } - if (incomeDeviceTaxInclude < incomeDeviceTaxExclude) { + if (changeToNumber(incomeDeviceTaxInclude) < changeToNumber(incomeDeviceTaxExclude)) { window.confirm('设备类收入含税金额应小于不含税金额'); check = 1; return; } - if (incomeEngineerTaxInclude < incomeEngineerTaxExclude) { + if (changeToNumber(incomeEngineerTaxInclude) < changeToNumber(incomeEngineerTaxExclude)) { window.confirm('工程类收入含税金额应小于不含税金额'); check = 1; return; } - if (incomeServiceTaxInclude < incomeServiceTaxExclude) { + if (changeToNumber(incomeServiceTaxInclude) < changeToNumber(incomeServiceTaxExclude)) { window.confirm('服务类收入含税金额应小于不含税金额'); check = 1; return; } - if (costPurchaseDeviceTaxInclude < costPurchaseDeviceTaxExclude) { + if (changeToNumber(costPurchaseDeviceTaxInclude) < changeToNumber(costPurchaseDeviceTaxExclude)) { window.confirm('设备类采购成本含税金额应小于不含税金额'); check = 1; return; } - if (costPurchaseBuildTaxInclude < costPurchaseBuildTaxExclude) { + if (changeToNumber(costPurchaseBuildTaxInclude) < changeToNumber(costPurchaseBuildTaxExclude)) { window.confirm('施工类采购成本含税金额应小于不含税金额'); check = 1; return; } - if (costPurchaseServiceTaxInclude < costPurchaseServiceTaxExclude) { + if (changeToNumber(costPurchaseServiceTaxInclude) < changeToNumber(costPurchaseServiceTaxExclude)) { window.confirm('服务类采购成本含税金额应小于不含税金额'); check = 1; return; } - if (costPurchaseOtherTaxInclude < costPurchaseOtherTaxExclude) { + if (changeToNumber(costPurchaseOtherTaxInclude) < changeToNumber(costPurchaseOtherTaxExclude)) { window.confirm('其他类采购成本含税金额应小于不含税金额'); check = 1; return; @@ -636,6 +636,12 @@ } }); }; + + function changeToNumber(value) { + value = value.replace(/[^\-\d.]/g, ""); //清除“-”、“数字”和“.”以外的字符 + value = value.replace(/\.{2,}/g, "."); //只保留第一个. 清除多余的 + return value; + } diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl index 27527ce..cc318f2 100644 --- a/src/main/resources/templates/admin/project_estimate_edit.ftl +++ b/src/main/resources/templates/admin/project_estimate_edit.ftl @@ -582,43 +582,44 @@ return; } - if (incomeDeviceTaxInclude < incomeDeviceTaxExclude) { + f2() + if (changeToNumber(incomeDeviceTaxInclude) < changeToNumber(incomeDeviceTaxExclude)) { window.confirm('设备类收入含税金额应小于不含税金额'); check = 1; return; } - if (incomeEngineerTaxInclude < incomeEngineerTaxExclude) { + if (changeToNumber(incomeEngineerTaxInclude) < changeToNumber(incomeEngineerTaxExclude)) { window.confirm('工程类收入含税金额应小于不含税金额'); check = 1; return; } - if (incomeServiceTaxInclude < incomeServiceTaxExclude) { + if (changeToNumber(incomeServiceTaxInclude) < changeToNumber(incomeServiceTaxExclude)) { window.confirm('服务类收入含税金额应小于不含税金额'); check = 1; return; } - if (costPurchaseDeviceTaxInclude < costPurchaseDeviceTaxExclude) { + if (changeToNumber(costPurchaseDeviceTaxInclude) < changeToNumber(costPurchaseDeviceTaxExclude)) { window.confirm('设备类采购成本含税金额应小于不含税金额'); check = 1; return; } - if (costPurchaseBuildTaxInclude < costPurchaseBuildTaxExclude) { + if (changeToNumber(costPurchaseBuildTaxInclude) < changeToNumber(costPurchaseBuildTaxExclude)) { window.confirm('施工类采购成本含税金额应小于不含税金额'); check = 1; return; } - if (costPurchaseServiceTaxInclude < costPurchaseServiceTaxExclude) { + if (changeToNumber(costPurchaseServiceTaxInclude) < changeToNumber(costPurchaseServiceTaxExclude)) { window.confirm('服务类采购成本含税金额应小于不含税金额'); check = 1; return; } - if (costPurchaseOtherTaxInclude < costPurchaseOtherTaxExclude) { + if (changeToNumber(costPurchaseOtherTaxInclude) < changeToNumber(costPurchaseOtherTaxExclude)) { window.confirm('其他类采购成本含税金额应小于不含税金额'); check = 1; return; @@ -639,6 +640,12 @@ } }); }; + + function changeToNumber(value) { + value = value.replace(/[^\-\d.]/g, ""); //清除“-”、“数字”和“.”以外的字符 + value = value.replace(/\.{2,}/g, "."); //只保留第一个. 清除多余的 + return value; + }