Index: ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/config.js =================================================================== diff -u -r34499 -r34639 --- ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/config.js (.../config.js) (revision 34499) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/config.js (.../config.js) (revision 34639) @@ -187,10 +187,12 @@ enableShowForeignTousseApplicationReportSummaryOfMaterials:true, // 是否禁用人员同步 hiddenUserSyncButton: true, - //是否禁用科室同步 + // 是否禁用科室同步 hiddenOrgunitSyncButton:true, //是否禁用使用记录快速回收 disableUseRecordQuickRecycling:true, //启用按科室单独打印明细核算月报 - seperatePrintDetailedAccountingMonthlyReportByDept:true + seperatePrintDetailedAccountingMonthlyReportByDept:true, + // 核算月报的报表类型。该配置项为一个JSON数组,可以定义报表格式下拉框的文本和对应的报表文件名字 + patternOfAccountingMonthlyReport:[{'optionText':'横沥新格式','reportName':'东莞横沥医院的核算月报'}] } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/print/printConfig.js =================================================================== diff -u -r34604 -r34639 --- ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/print/printConfig.js (.../printConfig.js) (revision 34604) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/print/printConfig.js (.../printConfig.js) (revision 34639) @@ -1348,15 +1348,15 @@ goodsTable :{ fontSize: 14, rowHeight: 30, - tableWidth:'19.8cm', + tableWidth:'19cm', tableHeight:'10cm', left:'1cm', top:100, columns: [{ align: "center", dataIndex: "externalCode", header: "物资编码", - width: 85 + width: 80 }, { align: "center", dataIndex: "goodsName",