Merge remote-tracking branch 'origin/master'

master
OathK1per 2022-04-19 14:56:50 +08:00
commit 47d6b0300b
1 changed files with 8 additions and 4 deletions

View File

@ -447,9 +447,11 @@
<script src="${base}/assets/js/project_estimate.js"></script>
<script>
var check = 0;
var result = 0;
$(function () {
calIncomeAndCost();
$("#saveDraft").click(function () {
check = 0;
$("#saveDraft").attr('disabled',true);
checkIfFillIn();
if (check == 1) {
@ -463,10 +465,11 @@
$("#pmsForm").submit();
});
$("#saveApprove").click(function () {
check = 0;
$("#saveApprove").attr('disabled',true);
checkIfFillIn();
if (check == 1) {
$("#saveDraft").attr('disabled', false);
$("#saveApprove").attr('disabled', false);
return;
}
setTimeout(function () {
@ -582,9 +585,10 @@
return;
}
f2()
console.info(changeToNumber(incomeDeviceTaxInclude)+"------"+changeToNumber(incomeDeviceTaxExclude))
console.info(changeToNumber(incomeDeviceTaxInclude)<changeToNumber(incomeDeviceTaxExclude))
if (changeToNumber(incomeDeviceTaxInclude) < changeToNumber(incomeDeviceTaxExclude)) {
window.confirm('设备类收入含税金额应于不含税金额');
window.confirm('设备类收入含税金额应于不含税金额');
check = 1;
return;
}
@ -644,7 +648,7 @@
function changeToNumber(value) {
value = value.replace(/[^\-\d.]/g, ""); //清除“-”、“数字”和“.”以外的字符
value = value.replace(/\.{2,}/g, "."); //只保留第一个. 清除多余的
return value;
return Number(value);
}
</script>
</@defaultLayout.layout>