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