Browse Source

[feat] 工程管理

物料详情页面新增:
采购价历史列表:数量、含税价格、不含税价格、含税总价、不含税总价,上面这些字段新增前端进行合计,并且进行判断加上没值默认设置为0,防止出现NaN问题
销售价历史列表:数量、含税价格、不含税价格、含税总价、不含税总价,上面这些字段新增前端进行合计,并且进行判断加上没值默认设置为0,防止出现NaN问题
dev
liuxiaoxu 5 days ago
parent
commit
217398c45e
  1. 36
      ruoyi-admin/src/main/resources/templates/erp/material/detail.html

36
ruoyi-admin/src/main/resources/templates/erp/material/detail.html

@ -371,7 +371,7 @@
footerFormatter: function (value) { footerFormatter: function (value) {
var sum = 0; var sum = 0;
for (var i in value) { for (var i in value) {
sum += parseFloat(value[i].materialNum); sum += parseFloat(value[i].materialNum) || 0;
} }
return "总数量: " + sum; return "总数量: " + sum;
} }
@ -387,9 +387,9 @@
footerFormatter: function (value) { footerFormatter: function (value) {
var sum = 0; var sum = 0;
for (var i in value) { for (var i in value) {
sum += parseFloat(value[i].taxPrice); sum += parseFloat(value[i].taxPrice) || 0;
} }
return "总含税价格: " +sum; return "总含税价格: " +sum.toFixed(2);
} }
}, },
{ {
@ -398,9 +398,9 @@
footerFormatter: function (value) { footerFormatter: function (value) {
var sum = 0; var sum = 0;
for (var i in value) { for (var i in value) {
sum += parseFloat(value[i].noTaxPrice); sum += parseFloat(value[i].noTaxPrice) || 0;
} }
return "总不含税价格: " +sum; return "总不含税价格: " +sum.toFixed(2);
} }
}, },
{ {
@ -409,9 +409,9 @@
footerFormatter: function (value) { footerFormatter: function (value) {
var sum = 0; var sum = 0;
for (var i in value) { for (var i in value) {
sum += parseFloat(value[i].taxSum); sum += parseFloat(value[i].taxSum) || 0;
} }
return "总含税总价: " +sum; return "总含税总价: " +sum.toFixed(2);
} }
}, },
{ {
@ -420,9 +420,9 @@
footerFormatter: function (value) { footerFormatter: function (value) {
var sum = 0; var sum = 0;
for (var i in value) { for (var i in value) {
sum += parseFloat(value[i].noTaxSum); sum += parseFloat(value[i].noTaxSum) || 0;
} }
return "总不含税总价: " +sum; return "总不含税总价: " +sum.toFixed(2);
} }
}, },
{ {
@ -477,7 +477,7 @@
footerFormatter: function (value) { footerFormatter: function (value) {
var sum = 0; var sum = 0;
for (var i in value) { for (var i in value) {
sum += parseFloat(value[i].materialNum); sum += parseFloat(value[i].materialNum) || 0;
} }
return "总数量: " +sum; return "总数量: " +sum;
} }
@ -488,9 +488,9 @@
footerFormatter: function (value) { footerFormatter: function (value) {
var sum = 0; var sum = 0;
for (var i in value) { for (var i in value) {
sum += parseFloat(value[i].taxPrice); sum += parseFloat(value[i].taxPrice) || 0;
} }
return "总含税价格: " +sum; return "总含税价格: " +sum.toFixed(2);
} }
}, },
{ {
@ -499,9 +499,9 @@
footerFormatter: function (value) { footerFormatter: function (value) {
var sum = 0; var sum = 0;
for (var i in value) { for (var i in value) {
sum += parseFloat(value[i].noTaxPrice); sum += parseFloat(value[i].noTaxPrice) || 0;
} }
return "总不含税价格: " +sum; return "总不含税价格: " +sum.toFixed(2);
} }
}, },
{ {
@ -510,9 +510,9 @@
footerFormatter: function (value) { footerFormatter: function (value) {
var sum = 0; var sum = 0;
for (var i in value) { for (var i in value) {
sum += parseFloat(value[i].taxSum); sum += parseFloat(value[i].taxSum) || 0;
} }
return "总含税总价: " +sum; return "总含税总价: " +sum.toFixed(2);
} }
}, },
{ {
@ -521,9 +521,9 @@
footerFormatter: function (value) { footerFormatter: function (value) {
var sum = 0; var sum = 0;
for (var i in value) { for (var i in value) {
sum += parseFloat(value[i].noTaxSum); sum += parseFloat(value[i].noTaxSum) || 0;
} }
return "总不含税总价: " +sum; return "总不含税总价: " +sum.toFixed(2);
} }
}, },
{ {

Loading…
Cancel
Save