mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

master
OathK1per 2022-04-19 14:11:39 +08:00
parent ac1bec1302 17f3c46618
commit 86b7eb26b5
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/resources/templates/admin/project_estimate_add.ftl
View File

@ -579,43 +579,43 @@
return; return;
} }
if (incomeDeviceTaxInclude < incomeDeviceTaxExclude) { if (changeToNumber(incomeDeviceTaxInclude) < changeToNumber(incomeDeviceTaxExclude)) {
window.confirm('设备类收入含税金额应小于不含税金额'); window.confirm('设备类收入含税金额应小于不含税金额');
check = 1; check = 1;
return; return;
} }
if (incomeEngineerTaxInclude < incomeEngineerTaxExclude) { if (changeToNumber(incomeEngineerTaxInclude) < changeToNumber(incomeEngineerTaxExclude)) {
window.confirm('工程类收入含税金额应小于不含税金额'); window.confirm('工程类收入含税金额应小于不含税金额');
check = 1; check = 1;
return; return;
} }
if (incomeServiceTaxInclude < incomeServiceTaxExclude) { if (changeToNumber(incomeServiceTaxInclude) < changeToNumber(incomeServiceTaxExclude)) {
window.confirm('服务类收入含税金额应小于不含税金额'); window.confirm('服务类收入含税金额应小于不含税金额');
check = 1; check = 1;
return; return;
} }
if (costPurchaseDeviceTaxInclude < costPurchaseDeviceTaxExclude) { if (changeToNumber(costPurchaseDeviceTaxInclude) < changeToNumber(costPurchaseDeviceTaxExclude)) {
window.confirm('设备类采购成本含税金额应小于不含税金额'); window.confirm('设备类采购成本含税金额应小于不含税金额');
check = 1; check = 1;
return; return;
} }
if (costPurchaseBuildTaxInclude < costPurchaseBuildTaxExclude) { if (changeToNumber(costPurchaseBuildTaxInclude) < changeToNumber(costPurchaseBuildTaxExclude)) {
window.confirm('施工类采购成本含税金额应小于不含税金额'); window.confirm('施工类采购成本含税金额应小于不含税金额');
check = 1; check = 1;
return; return;
} }
if (costPurchaseServiceTaxInclude < costPurchaseServiceTaxExclude) { if (changeToNumber(costPurchaseServiceTaxInclude) < changeToNumber(costPurchaseServiceTaxExclude)) {
window.confirm('服务类采购成本含税金额应小于不含税金额'); window.confirm('服务类采购成本含税金额应小于不含税金额');
check = 1; check = 1;
return; return;
} }
if (costPurchaseOtherTaxInclude < costPurchaseOtherTaxExclude) { if (changeToNumber(costPurchaseOtherTaxInclude) < changeToNumber(costPurchaseOtherTaxExclude)) {
window.confirm('其他类采购成本含税金额应小于不含税金额'); window.confirm('其他类采购成本含税金额应小于不含税金额');
check = 1; check = 1;
return; return;
@ -636,6 +636,12 @@
} }
}); });
}; };
function changeToNumber(value) {
value = value.replace(/[^\-\d.]/g, ""); //清除“-”、“数字”和“.”以外的字符
value = value.replace(/\.{2,}/g, "."); //只保留第一个. 清除多余的
return value;
}
</script> </script>
</@defaultLayout.layout> </@defaultLayout.layout>

21
src/main/resources/templates/admin/project_estimate_edit.ftl
View File

@ -582,43 +582,44 @@
return; return;
} }
if (incomeDeviceTaxInclude < incomeDeviceTaxExclude) { f2()
if (changeToNumber(incomeDeviceTaxInclude) < changeToNumber(incomeDeviceTaxExclude)) {
window.confirm('设备类收入含税金额应小于不含税金额'); window.confirm('设备类收入含税金额应小于不含税金额');
check = 1; check = 1;
return; return;
} }
if (incomeEngineerTaxInclude < incomeEngineerTaxExclude) { if (changeToNumber(incomeEngineerTaxInclude) < changeToNumber(incomeEngineerTaxExclude)) {
window.confirm('工程类收入含税金额应小于不含税金额'); window.confirm('工程类收入含税金额应小于不含税金额');
check = 1; check = 1;
return; return;
} }
if (incomeServiceTaxInclude < incomeServiceTaxExclude) { if (changeToNumber(incomeServiceTaxInclude) < changeToNumber(incomeServiceTaxExclude)) {
window.confirm('服务类收入含税金额应小于不含税金额'); window.confirm('服务类收入含税金额应小于不含税金额');
check = 1; check = 1;
return; return;
} }
if (costPurchaseDeviceTaxInclude < costPurchaseDeviceTaxExclude) { if (changeToNumber(costPurchaseDeviceTaxInclude) < changeToNumber(costPurchaseDeviceTaxExclude)) {
window.confirm('设备类采购成本含税金额应小于不含税金额'); window.confirm('设备类采购成本含税金额应小于不含税金额');
check = 1; check = 1;
return; return;
} }
if (costPurchaseBuildTaxInclude < costPurchaseBuildTaxExclude) { if (changeToNumber(costPurchaseBuildTaxInclude) < changeToNumber(costPurchaseBuildTaxExclude)) {
window.confirm('施工类采购成本含税金额应小于不含税金额'); window.confirm('施工类采购成本含税金额应小于不含税金额');
check = 1; check = 1;
return; return;
} }
if (costPurchaseServiceTaxInclude < costPurchaseServiceTaxExclude) { if (changeToNumber(costPurchaseServiceTaxInclude) < changeToNumber(costPurchaseServiceTaxExclude)) {
window.confirm('服务类采购成本含税金额应小于不含税金额'); window.confirm('服务类采购成本含税金额应小于不含税金额');
check = 1; check = 1;
return; return;
} }
if (costPurchaseOtherTaxInclude < costPurchaseOtherTaxExclude) { if (changeToNumber(costPurchaseOtherTaxInclude) < changeToNumber(costPurchaseOtherTaxExclude)) {
window.confirm('其他类采购成本含税金额应小于不含税金额'); window.confirm('其他类采购成本含税金额应小于不含税金额');
check = 1; check = 1;
return; return;
@ -639,6 +640,12 @@
} }
}); });
}; };
function changeToNumber(value) {
value = value.replace(/[^\-\d.]/g, ""); //清除“-”、“数字”和“.”以外的字符
value = value.replace(/\.{2,}/g, "."); //只保留第一个. 清除多余的
return value;
}
</script> </script>
</@defaultLayout.layout> </@defaultLayout.layout>