Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
===================================================================
diff -u -r37842 -r37844
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js (.../departmentMonthlyDetailDSInvoiceItemView.js) (revision 37842)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js (.../departmentMonthlyDetailDSInvoiceItemView.js) (revision 37844)
@@ -189,7 +189,7 @@
if (value == '') {
value = 0;
} else {
- value = parseFloat(value).toFixed(4);
+ value = parseFloat(value).toFixed(getMoneyDigitCount());
}
} else if (dataIndex == 'amount') {
if (value == '') {
@@ -206,7 +206,7 @@
if (obj.totalPrice == '') {
totalPrice = 0;
} else {
- totalPrice = parseFloat(obj.totalPrice).toFixed(4);
+ totalPrice = parseFloat(obj.totalPrice).toFixed(getMoneyDigitCount());
}
html += '
' + totalPrice + ' | ';
html += '';
@@ -321,10 +321,10 @@
tableHtml += "" + amount + " | ";
}
tableHtml += "" + items[goodsName]['数量'] + " | ";
- tableHtml += "" + parseFloat(items[goodsName]['单价'] || 0).toFixed(4) + " | ";
- tableHtml += "" + parseFloat(items[goodsName]['总计'] || 0).toFixed(4) + " | ";
+ tableHtml += "" + parseFloat(items[goodsName]['单价'] || 0).toFixed(getMoneyDigitCount()) + " | ";
+ tableHtml += "" + parseFloat(items[goodsName]['总计'] || 0).toFixed(getMoneyDigitCount()) + " | ";
if (j == 0 && k == 0) {
- tableHtml += "" + parseFloat(data[i].totalPrice || 0).toFixed(4) + " | ";
+ tableHtml += "" + parseFloat(data[i].totalPrice || 0).toFixed(getMoneyDigitCount()) + " | ";
}
tableHtml += "";
sumAmount += parseInt(items[goodsName]['数量'] || 0);
@@ -349,8 +349,8 @@
}
tableHtml += "" + sumAmount + " | ";
tableHtml += " | ";
- tableHtml += "" + parseFloat(sumSettlementPrice || 0).toFixed(4) + " | ";
- tableHtml += "" + parseFloat(sumTotalPrice || 0).toFixed(4) + " | ";
+ tableHtml += "" + parseFloat(sumSettlementPrice || 0).toFixed(getMoneyDigitCount()) + " | ";
+ tableHtml += "" + parseFloat(sumTotalPrice || 0).toFixed(getMoneyDigitCount()) + " | ";
tableHtml += "";
tableHtml += "";
tableHtml += "";
@@ -414,17 +414,17 @@
}
tableHtml += "" + items[j].amount + " | ";
tableHtml += "" + items[j].batchNumber + " | ";
- tableHtml += "" + Number(items[j].price).toFixed(getMoneyDigitCount()) + " | ";
+ tableHtml += "" + parseFloat(items[j].price).toFixed(getMoneyDigitCount()) + " | ";
if(sstsConfig.showSupplierNameInDetailedAccountingMonthlyReport){
tableHtml += "" + items[j].supplierName + " | ";
colspan2 = 5;
}else {
colspan2 = 4;
}
tableHtml += "" + items[j].expDate + " | ";
- tableHtml += "" + parseFloat(items[j].settlementPrice).toFixed(4) + " | ";
+ tableHtml += "" + parseFloat(items[j].settlementPrice).toFixed(getMoneyDigitCount()) + " | ";
if (j == 0) {
- tableHtml += "" + parseFloat(data[i].totalPrice).toFixed(4) + " | ";
+ tableHtml += "" + parseFloat(data[i].totalPrice).toFixed(getMoneyDigitCount()) + " | ";
}
tableHtml += "";
}
@@ -434,7 +434,7 @@
tableHtml += " | ";
tableHtml += "" + sumAmount + " | ";
tableHtml += " | ";
- tableHtml += "" + parseFloat(sumPrice).toFixed(4) + " | ";
+ tableHtml += "" + parseFloat(sumPrice).toFixed(getMoneyDigitCount()) + " | ";
tableHtml += "";
tableHtml += "";
tableHtml += "";
Index: ssts-web/src/main/webapp/ext/js/common.js
===================================================================
diff -u -r22204 -r37844
--- ssts-web/src/main/webapp/ext/js/common.js (.../common.js) (revision 22204)
+++ ssts-web/src/main/webapp/ext/js/common.js (.../common.js) (revision 37844)
@@ -369,5 +369,5 @@
if(sstsConfig && sstsConfig.moneyDigitCount){
return sstsConfig.moneyDigitCount
}
- return 2;
+ return 4;
}
\ No newline at end of file