Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js =================================================================== diff -u -r38350 -r40690 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js (.../departmentMonthlyDetailDSInvoiceItemView.js) (revision 38350) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js (.../departmentMonthlyDetailDSInvoiceItemView.js) (revision 40690) @@ -14,10 +14,10 @@ var moneyDigitCount = (sstsConfig.moneyDigitCount == 2) ? 2 : 4; var fontSize = '12px'; -if(sstsConfig.theReportFontSizeIncreases && sstsConfig.theReportFontSizeIncreases.length > 0){ +if (sstsConfig.theReportFontSizeIncreases && sstsConfig.theReportFontSizeIncreases.length > 0) { var theReportFontSizeIncreases = sstsConfig.theReportFontSizeIncreases; - for(var i=0;i"; tableHtml += ""; tableHtml += ""; - tableHtml += ""+title+""; + tableHtml += "" + title + ""; tableHtml += ""; tableHtml += ""; - tableHtml += "申请科室"; - tableHtml += "结算科室"; - tableHtml += "类型"; - tableHtml += "物品名称"; - widthArr = [100,100,80,150]; + tableHtml += "申请科室"; + tableHtml += "结算科室"; + tableHtml += "类型"; + tableHtml += "物品名称"; + widthArr = [100, 100, 80, 150]; for (var day in dataAll) { - tableHtml += "" + dataAll[day] + ""; + tableHtml += "" + dataAll[day] + ""; widthArr.push(80); } - tableHtml += "数量"; - tableHtml += "单价"; - tableHtml += "总计(元)"; - tableHtml += "总价(元)"; + tableHtml += "数量"; + tableHtml += "单价"; + tableHtml += "总计(元)"; + tableHtml += "总价(元)"; tableHtml += ""; tableHtml += ""; is2Column = false; @@ -311,15 +311,15 @@ var items = dateAmountMapStr[item] var len = Object.keys(items).length; if (j == 0) { - tableHtml += "" + data[i].depart + ""; - tableHtml += "" + data[i].applicationDepart + ""; + tableHtml += "" + data[i].depart + ""; + tableHtml += "" + data[i].applicationDepart + ""; } var k = 0; for (var goodsName in items) { if (k == 0) { - tableHtml += "" + item + ""; + tableHtml += "" + item + ""; } - tableHtml += "" + goodsName + ""; + tableHtml += "" + goodsName + ""; for (var day in dataAll) { var amount = ''; if (items[goodsName][day]) { @@ -330,13 +330,13 @@ sumInfo[day] = parseInt(amount); } } - tableHtml += "" + amount + ""; + tableHtml += "" + amount + ""; } - tableHtml += "" + items[goodsName]['数量'] + ""; - tableHtml += "" + parseFloat(items[goodsName]['单价'] || 0).toFixed(moneyDigitCount) + ""; - tableHtml += "" + parseFloat(items[goodsName]['总计'] || 0).toFixed(moneyDigitCount) + ""; + tableHtml += "" + items[goodsName]['数量'] + ""; + 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(moneyDigitCount) + ""; + tableHtml += "" + parseFloat(data[i].totalPrice || 0).toFixed(moneyDigitCount) + ""; } tableHtml += ""; sumAmount += parseInt(items[goodsName]['数量'] || 0); @@ -348,61 +348,82 @@ sumTotalPrice += data[i].totalPrice; } tableHtml += ""; - tableHtml += "合计"; - tableHtml += ""; - tableHtml += ""; - tableHtml += ""; + tableHtml += "合计"; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; for (var day in dataAll) { var amount = ''; if (sumInfo[day]) { amount = sumInfo[day] } - tableHtml += "" + amount + ""; + tableHtml += "" + amount + ""; } - tableHtml += "" + sumAmount + ""; - tableHtml += ""; - tableHtml += "" + parseFloat(sumSettlementPrice || 0).toFixed(moneyDigitCount) + ""; - tableHtml += "" + parseFloat(sumTotalPrice || 0).toFixed(moneyDigitCount) + ""; + tableHtml += "" + sumAmount + ""; + tableHtml += ""; + tableHtml += "" + parseFloat(sumSettlementPrice || 0).toFixed(moneyDigitCount) + ""; + tableHtml += "" + parseFloat(sumTotalPrice || 0).toFixed(moneyDigitCount) + ""; tableHtml += ""; tableHtml += ""; tableHtml += ""; return tableHtml; } -function getTableHtml2(data,title) { +function getTableHtml2(data, title) { + var extendedColumnConfigOfDetailedAccountingMonthlyReport = sstsConfig.extendedColumnConfigOfDetailedAccountingMonthlyReport || []; + var isShowTousseGroup = false; + var isShowTechnicalDifficulty = false; + var isShowWeightScore = false; + if (extendedColumnConfigOfDetailedAccountingMonthlyReport.length > 0) { + if (extendedColumnConfigOfDetailedAccountingMonthlyReport.indexOf('tousseGroupName') >= 0) { + isShowTousseGroup = true; + } + if (extendedColumnConfigOfDetailedAccountingMonthlyReport.indexOf('technicalDifficulty') >= 0) { + isShowTechnicalDifficulty = true; + } + if (extendedColumnConfigOfDetailedAccountingMonthlyReport.indexOf('weightScore') >= 0) { + isShowWeightScore = true; + } + } var tableHtml = ''; var tableWidth = 'auto' var sumAmount = 0; var sumPrice = 0; var colspan1 = 1; var colspan2 = 1; var countTd = 12; - if (sstsConfig.extendedColumnConfigOfDetailedAccountingMonthlyReport && sstsConfig.extendedColumnConfigOfDetailedAccountingMonthlyReport.indexOf('tousseGroupName') >= 0) { - countTd+=1; + if (isShowTousseGroup) { + countTd += 1; } tableHtml += ""; tableHtml += ""; tableHtml += ""; - tableHtml += ""; + tableHtml += ""; tableHtml += ""; tableHtml += ""; - tableHtml += ""; - tableHtml += ""; - tableHtml += ""; - tableHtml += ""; - tableHtml += ""; - if (sstsConfig.extendedColumnConfigOfDetailedAccountingMonthlyReport && sstsConfig.extendedColumnConfigOfDetailedAccountingMonthlyReport.indexOf('tousseGroupName') >= 0) { - tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + if (isShowTousseGroup) { + tableHtml += ""; } - tableHtml += ""; - tableHtml += ""; - tableHtml += ""; - if(sstsConfig.showSupplierNameInDetailedAccountingMonthlyReport){ - tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + if (sstsConfig.showSupplierNameInDetailedAccountingMonthlyReport) { + tableHtml += ""; } - tableHtml += ""; - tableHtml += ""; - tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + if (isShowTechnicalDifficulty) { + tableHtml += ""; + } + if (isShowWeightScore) { + tableHtml += ""; + } tableHtml += ""; tableHtml += ""; tableHtml += ""; @@ -411,43 +432,55 @@ for (var j = 0; j < items.length; j++) { tableHtml += ""; if (j == 0) { - tableHtml += ""; - tableHtml += ""; + tableHtml += ""; + tableHtml += ""; } var goodsName = items[j].goodsName.split(" ").join(" "); - tableHtml += ""; - tableHtml += ""; - tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; colspan1 = 4; sumAmount += parseInt(items[j].amount); sumPrice += parseFloat(items[j].settlementPrice); - if (sstsConfig.extendedColumnConfigOfDetailedAccountingMonthlyReport && sstsConfig.extendedColumnConfigOfDetailedAccountingMonthlyReport.indexOf('tousseGroupName') >= 0) { - tableHtml += ""; + if (isShowTousseGroup) { + tableHtml += ""; colspan1++ } - tableHtml += ""; - tableHtml += ""; - tableHtml += ""; - if(sstsConfig.showSupplierNameInDetailedAccountingMonthlyReport){ - tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + if (sstsConfig.showSupplierNameInDetailedAccountingMonthlyReport) { + tableHtml += ""; colspan2 = 5; - }else { + } else { colspan2 = 4; } - tableHtml += ""; - tableHtml += ""; + tableHtml += ""; + tableHtml += ""; if (j == 0) { - tableHtml += ""; + tableHtml += ""; } + if (isShowTechnicalDifficulty) { + tableHtml += ""; + } + if (isShowWeightScore) { + tableHtml += ""; + } tableHtml += ""; } } tableHtml += ""; - tableHtml += ""; - tableHtml += ""; - tableHtml += ""; - tableHtml += ""; - tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + if (isShowTechnicalDifficulty) { + tableHtml += ""; + } + if (isShowWeightScore) { + tableHtml += ""; + } tableHtml += ""; tableHtml += ""; tableHtml += "
"+title+"" + title + "
明细科室结算科室类型外部编码物品名称器械包分组明细科室结算科室类型外部编码物品名称器械包分组数量批次单价(元)生产厂家数量批次单价(元)生产厂家失效日期总价(元)总价(元)失效日期总价(元)总价(元)技术难度权重分
" + data[i].applicationDepart + "" + data[i].depart + "" + data[i].applicationDepart + "" + data[i].depart + "" + items[j].type + "" + items[j].externalCode + "" + goodsName + "" + items[j].type + "" + items[j].externalCode + "" + goodsName + "" + items[j].tousseGroupName + "" + items[j].tousseGroupName + "" + items[j].amount + "" + items[j].batchNumber + "" + parseFloat(items[j].price).toFixed(moneyDigitCount) + "" + items[j].supplierName + "" + items[j].amount + "" + items[j].batchNumber + "" + parseFloat(items[j].price).toFixed(moneyDigitCount) + "" + items[j].supplierName + "" + items[j].expDate + "" + parseFloat(items[j].settlementPrice).toFixed(moneyDigitCount) + "" + items[j].expDate + "" + parseFloat(items[j].settlementPrice).toFixed(moneyDigitCount) + "" + parseFloat(data[i].totalPrice).toFixed(moneyDigitCount) + "" + parseFloat(data[i].totalPrice).toFixed(moneyDigitCount) + "" + (items[j].technicalDifficulty || '') + "" + (items[j].weightScore || '') + "
合计" + sumAmount + "" + parseFloat(sumPrice).toFixed(moneyDigitCount) + "合计" + sumAmount + "" + parseFloat(sumPrice).toFixed(moneyDigitCount) + "
"; @@ -526,7 +559,7 @@ var sterilisation = ''; var instrumentSetTypeIds = ''; - if(sstsConfig.enableInstrumentSetTypeSetting){ + if (sstsConfig.enableInstrumentSetTypeSetting) { instrumentSetTypeIds = Ext.getCmp('instrumentSetTypeIds').getValue(); } @@ -700,8 +733,8 @@ showBatch: showBatch, whetherToCharge: whetherToCharge, departGroup: departGroupValue, - instrumentSetTypeIds:instrumentSetTypeIds, - sterilisations:sterilisation, + instrumentSetTypeIds: instrumentSetTypeIds, + sterilisations: sterilisation, reportName: 'departmentMonthDetail' } return params; @@ -726,8 +759,8 @@ whetherToCharge: whetherToCharge, departGroup: departGroupValue, printByDepart: true, - instrumentSetTypeIds:instrumentSetTypeIds, - sterilisations:sterilisation, + instrumentSetTypeIds: instrumentSetTypeIds, + sterilisations: sterilisation, reportName: 'departmentMonthDetail' } return params; @@ -755,7 +788,7 @@ myMask.hide(); return; } - Ext.Ajax.timeout = 2*60*1000; + Ext.Ajax.timeout = 2 * 60 * 1000; Ext.Ajax.request({ url: url, async: false, @@ -765,7 +798,7 @@ var title = result.parametMap.title; if (result.data && result.data.length > 0) { var tableHtml = ""; - tableHtml += getTableHtml(result.data, dataAll,title) + tableHtml += getTableHtml(result.data, dataAll, title) setTimeout(function () { document.getElementById('thisIframe2').contentWindow.document.getElementById('table').innerHTML = tableHtml; document.getElementById('thisIframe2').contentWindow.document.getElementById('ToolBar').style.display = 'block'; @@ -792,7 +825,7 @@ document.getElementById('thisIframe').style.display = 'none'; document.getElementById('thisIframe2').style.display = 'block'; var url = WWWROOT + "/jasperreports/jasperreportsAction!queryDataSourceList.do"; - Ext.Ajax.timeout = 2*60*1000; + Ext.Ajax.timeout = 2 * 60 * 1000; Ext.Ajax.request({ url: url, async: false, @@ -802,7 +835,7 @@ var title = result.parametMap.title; if (result.data && result.data.length > 0) { var tableHtml = ""; - tableHtml += getTableHtml2(result.data,title) + tableHtml += getTableHtml2(result.data, title) setTimeout(function () { document.getElementById('thisIframe2').contentWindow.document.getElementById('table').innerHTML = tableHtml; document.getElementById('thisIframe2').contentWindow.document.getElementById('ToolBar').style.display = 'block'; @@ -1025,11 +1058,11 @@ var enableExtendedQueryItemsOfDetailedAccountingMonthlyReport = sstsConfig.enableExtendedQueryItemsOfDetailedAccountingMonthlyReport || []; if (enableExtendedQueryItemsOfDetailedAccountingMonthlyReport.length > 0) { - if(enableExtendedQueryItemsOfDetailedAccountingMonthlyReport.indexOf('urgentLevel') >= 0){ + if (enableExtendedQueryItemsOfDetailedAccountingMonthlyReport.indexOf('urgentLevel') >= 0) { urgentLevelBox = true; urgentLevelStore.load(); } - if(enableExtendedQueryItemsOfDetailedAccountingMonthlyReport.indexOf('sterilizationProgram') >= 0){ + if (enableExtendedQueryItemsOfDetailedAccountingMonthlyReport.indexOf('sterilizationProgram') >= 0) { sterilisationBoxShow = true; sterilisationStore.load(); } @@ -1591,12 +1624,12 @@ }, { columnWidth: .25, layout: 'form', - hidden:!sstsConfig.enableInstrumentSetTypeSetting, + hidden: !sstsConfig.enableInstrumentSetTypeSetting, items: [{ - xtype:'hidden', - id:'instrumentSetTypeIds', - name:'instrumentSetTypeIds' - },{ + xtype: 'hidden', + id: 'instrumentSetTypeIds', + name: 'instrumentSetTypeIds' + }, { xtype: 'trigger', fieldLabel: "器械包种类", allowBlank: true, @@ -1626,7 +1659,7 @@ columnWidth: 0.25, layout: 'form', labelWidth: 120, - hidden:!sterilisationBoxShow, + hidden: !sterilisationBoxShow, items: [{ fieldLabel: '灭菌程序', xtype: 'multiSelect', @@ -1714,7 +1747,7 @@ Ext.getCmp('invoicePlanDepartSearch').setDisabled(false); Ext.getCmp('departSearch').setDisabled(false); Ext.getCmp('departGroup').setDisabled(false); - if(sstsConfig.enableInstrumentSetTypeSetting){ + if (sstsConfig.enableInstrumentSetTypeSetting) { Ext.getCmp('instrumentSetTypeIds').setValue(""); Ext.getCmp('tousseSetTypeName').setValue(""); }