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

连击置灰按钮，修改提示语

master
OathK1per 2022-01-18 11:06:54 +08:00
parent bca776430b
commit 97f6a85a92
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/resources/static/assets/js/project_settle_valid.js
View File

@ -47,7 +47,7 @@ var incomeServiceValid = function() {
var incomeTotalValid = function() {
var settle = $("input[name='incomeSettleTotal']").val();
var budget = $("input[name='incomeBudgetTotal']").val();
if (parseFloat(settle) > parseFloat(budget)) {
if (parseFloat(f2(settle)) > parseFloat(f2(budget))) {
layui.use('layer', function(){
var layer = layui.layer;
layer.alert("合计收入结算总额不能高于预算总额");
@ -115,7 +115,7 @@ var costProjectManageValid = function() {
});
return false;
}
if (parseFloat(salary) > parseFloat(month)) {
if (parseFloat(f2(salary)) > parseFloat(f2(month))) {
layui.use('layer', function(){
var layer = layui.layer;
layer.alert("本月项目管理成本不能低于人力成本");
@ -128,10 +128,10 @@ var costProjectManageValid = function() {
var costTotalValid = function() {
var settle = $("input[name='costSettleTotal']").val();
var budget = $("input[name='costBudgetTotal']").val();
if (parseFloat(settle) > parseFloat(budget)) {
if (parseFloat(f2(settle)) > parseFloat(f2(budget))) {
layui.use('layer', function(){
var layer = layui.layer;
layer.alert("合计支出结算总额不能高于预算总额");
layer.alert("合计成本结算总额不能高于预算总额");
});
return false;
}
@ -149,7 +149,7 @@ var costExpropriationValid = function() {
});
return false;
}
if (parseFloat(settle) > parseFloat(budget)) {
if (parseFloat(f2(settle)) > parseFloat(f2(budget))) {
layui.use('layer', function(){
var layer = layui.layer;
layer.alert("财务费用结算总额不能高于预算总额");
@ -160,7 +160,9 @@ var costExpropriationValid = function() {
};
var costCompanyManageValid = function() {
var settle = $("input[name='costCompanyManageSettleTotal']").val();
var month = $("input[name='costCompanyManage']").val();
var budget = $("input[name='costCompanyManageBudgetTotal']").val();
if (month == "") {
layui.use('layer', function(){
var layer = layui.layer;
@ -168,6 +170,13 @@ var costCompanyManageValid = function() {
});
return false;
}
if (parseFloat(f2(settle)) > parseFloat(f2(budget))) {
layui.use('layer', function(){
var layer = layui.layer;
layer.alert("公司管理费用结算总额不能高于预算总额");
});
return false;
}
return true;
};

4
src/main/resources/templates/admin/project_final_edit.ftl
View File

@ -366,13 +366,17 @@
$(function () {
calculateFinal();
$("#saveFinal").click(function () {
$("#saveFinal").attr('disabled',true);
$("#pmsForm").attr("action","${base}/project/final/save");
$("#pmsForm").submit();
$("#saveFinal").attr('disabled',false);
});
$("#saveApprove").click(function () {
$("#saveApprove").attr('disabled',true);
$("#pmsForm").attr("action",base+"/project/final/saveAndApprove");
$("#pmsForm").submit();
$("#saveApprove").attr('disabled',false);
});
});

6
src/main/resources/templates/admin/project_settle_edit.ftl
View File

@ -426,23 +426,29 @@
calculateSettle();
$("#saveSettle").click(function () {
$("#saveSettle").attr('disabled',true);
var result = valid();
console.log(result);
if (result) {
console.log("result: " + result);
$("#pmsForm").attr("action", "${base}/project/settle/save");
$("#pmsForm").submit();
$("#saveSettle").attr('disabled',false);
} else {
$("#saveSettle").attr('disabled',false);
return false;
}
});
$("#saveApprove").click(function () {
$("#saveApprove").attr('disabled',true);
var result = valid();
if (result) {
$("#pmsForm").attr("action",base+"/project/settle/saveAndApprove");
$("#pmsForm").submit();
$("#saveApprove").attr('disabled',false);
} else {
$("#saveApprove").attr('disabled',false);
return false;
}
});