Index: ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/print/printConfig.js =================================================================== diff -u -r30545 -r30558 --- ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/print/printConfig.js (.../printConfig.js) (revision 30545) +++ ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/print/printConfig.js (.../printConfig.js) (revision 30558) @@ -534,23 +534,23 @@ rowsPerPage : 9, headerContent : [ // 标题 - {label : "广东省中医院", dataIndex : '', fontSize : 10, position : ["5","1%","90%",5]}, + {label : "广东省中医院", dataIndex : '', fontSize : 10, position : ["5","2%","90%",5]}, {label : "借物单", dataIndex : '', fontSize : 17, position : ["22","45%","99%",5]}, - {label : "去向：", dataIndex : 'depart', fontSize : 10, position : ["55","5%","90%",5]}, + {label : "去向：", dataIndex : 'depart', fontSize : 10, position : ["55","2%","90%",5]}, {label : "单号：", dataIndex : 'serialNum', fontSize : 10, position : ["55","25%","90%",5]}, {label : "日期:", dataIndex : 'printTime', fontSize : 10, position : ["55","41%","90%",5]}, - {label : "备注:", dataIndex : 'remark', fontSize : 10, position : ["55","65%","90%",5]} + {label : "备注:", dataIndex : 'remark', fontSize : 10, position : ["75","2%","90%",5]} ], goodsTable :{ rowHeight : 25, - position : ["75","2%","97%","2000"], + position : ["90","2%","97%","2000"], content : [ {header : "序号", dataIndex : 'serialNumber', width : 60, align : 'center', fontSize : 11}, - {header : "名称", dataIndex : 'goodsNameAndSp', width : 525, align : 'center', fontSize : 11}, + {header : "名称", dataIndex : 'goodsNameAndSp', width : 200, align : 'center', fontSize : 11}, {header : "单位", dataIndex : 'unit', width : 60, align : 'center', fontSize : 11}, - {header : "数量", dataIndex : 'goodsAmount', width : 60, align : 'right', fontSize : 11}, - {header : "单价", dataIndex : 'price', width : 60, align : 'right', fontSize : 11}, - {header : "金额", dataIndex : 'rowPrice', width : 75, align : 'right', fontSize : 11} + {header : "数量", dataIndex : 'goodsAmount', width : 60, align : 'right', fontSize : 11} + //{header : "单价", dataIndex : 'price', width : 60, align : 'right', fontSize : 11}, + //{header : "金额", dataIndex : 'rowPrice', width : 75, align : 'right', fontSize : 11} ] }, footer: { @@ -562,7 +562,15 @@ {label : " 验收: ", dataIndex : ''}, {label : "提交时间:", dataIndex : 'applicationTime'} ] - } + }, + barcodes : [ + {codeType : "128Auto", dataIndex : 'serialNum', position : ["3mm","73%","40mm","8mm"], + styles :[{itemNameID: 0, styleName: 'ShowBarText', styleValue: true}, + {itemNameID: 0, styleName: 'FontSize', styleValue: 6}, + {itemNameID: 0, styleName: 'NotOnlyHighPrecision', styleValue: true} + ] + } + ] } var appropriationConfig = { Index: ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js =================================================================== diff -u -r30555 -r30558 --- ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js (.../config.js) (revision 30555) +++ ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js (.../config.js) (revision 30558) @@ -80,7 +80,7 @@ //在灭菌视图界面是否显示“生物监测的状态”属性 showBiologicalMonitoringStatus : true, //是否显示辅助发货按钮 - showAuxiliaryInvoiceBtn : false, + showAuxiliaryInvoiceBtn : true, //公司名称 "dingxiang"显示主页显示丁香的logo companyName : "dingxiang", //是否显示包实例科室(待灭菌与待灭菌装载的表格) @@ -144,7 +144,7 @@ // 发货计划模块隐藏未打印的一次性物品申请单，默认为false hideUnprintedDisposableGoodsInvoicePlan: true, // 批量打印发货计划时，询问用户是否重复打印今天的发货计划单 - reprintTodayPrintedTousseItem:false, + reprintTodayPrintedTousseItem:true, // 一次性物品库存不足时，是否允许申领 allowApplyDisposableGoodsWhenUnderstock:false, // 一次性物品库存数量依据是否使用库存数量减去待发货数量 @@ -177,6 +177,10 @@ enableSciProjectDisposableGoodsApply:true, //启用科研项目明细核算月报 enableSciProjectAccountingMonthlyReport:true, + // 隐藏多院区报表数量列 + hideAmountColumnOfAccountingMonthlyReportForMultipleBranchesHospital:false, + // 金额的小数位数 + moneyDigitCount:2, //排除属于科研项目的一次性物品申请单的发货数据 enableExcludeInvoiceItemOfDisposableGoodsApplicationBelongToSciProject:true } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/print/recyclingDetailPrintConfig.js =================================================================== diff -u -r30029 -r30558 --- ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/print/recyclingDetailPrintConfig.js (.../recyclingDetailPrintConfig.js) (revision 30029) +++ ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/print/recyclingDetailPrintConfig.js (.../recyclingDetailPrintConfig.js) (revision 30558) @@ -8,29 +8,137 @@ ], "tables": [ // 表格定义，数组类型，支持可以定义多个表格 { - "tableName": "表格1：大院及二沙分院的物品", // 表格名称 + "tableName": "表格1：大院门诊", // 表格名称 "rowHeight" : 24, "tableLayout": "showTousseColumns", // 表格布局，noTousseColumns表示不带列头的布局 "departGroupsConfig": { // 科室分组配置 "showDepartGroupColumn": true, // 是否显示科室分组的表格列 "columnName": "科室分组名称", // 列的标题 - "columnWidth": "200px", // 列的宽度 + "columnWidth": "100px", // 列的宽度 "departGroups": [ // 科室分组定义，可以定义多个科室分组 { - "id": 39784, // 科室分组的id，控制面板--参数设置--科室分组设置中定义的id - "departGroupName": "大院", // 科室分组的名称 - "showDepartGroupName": "大德路总院" // 科室分组列中，需要显示的分组的名称，可以与实际分组的名称不同 - }, + "id": 1511031, // 科室分组的id，控制面板--参数设置--科室分组设置中定义的id + "departGroupName": "大院门诊", // 科室分组的名称 + "showDepartGroupName": "大院门诊" // 科室分组列中，需要显示的分组的名称，可以与实际分组的名称不同 + } + ] + }, + "departConfig": { // 科室配置 + "columnName": "科室", + "columnWidth": "150px" // 科室列的宽度 + }, + "tousseColumnsConfig": [ // 表格的器械包列的设置 + { + "columnName": "治疗包", + "includeTousse": [ // 要统计的器械包，支持统计多个包 + { + "id": 39784, + "tousseName": "治疗包" + } + ] + }, + { + "columnName": "治疗包（长效）", + "includeTousse": [ // 要统计的器械包，支持统计多个包 + { + "id": 131500, + "tousseName": "治疗包（长效）" + } + ] + }, + { + "columnName": "缝合包", + "includeTousse": [ + { + "id": 39764, + "tousseName": "缝合包" + } + ] + }, + { + "columnName": "静切包", + "includeTousse": [ + { + "id": 39756, + "tousseName": "静切包" + } + ] + }, + { + "columnName": "气切包", + "includeTousse": [ + { + "id": 39753, + "tousseName": "气切包" + } + ] + }, + { + "columnName": "切开包", + "includeTousse": [ + { + "id": 39760, + "tousseName": "切开包" + } + ] + }, + { + "columnName": "骨穿包（成人）", + "includeTousse": [ + { + "id": 39776, + "tousseName": "骨穿包（成人）" + } + ] + }, + { + "columnName": "骨穿包（小儿）", + "includeTousse": [ + { + "id": 1499151, + "tousseName": "骨穿包（小儿）" + } + ] + }, + { + "columnName": "骨髓包", + "includeTousse": [ + { + "id": 39780, + "tousseName": "骨髓包" + } + ] + }, + { + "columnName": "胸穿包", + "includeTousse": [ + { + "id": 39832, + "tousseName": "胸穿包" + } + ] + } + ] + }, + { + "tableName": "表格2：大院住院部", // 表格名称 + "rowHeight" : 24, + "tableLayout": "showTousseColumns", // 表格布局，noTousseColumns表示不带列头的布局 + "departGroupsConfig": { // 科室分组配置 + "showDepartGroupColumn": true, // 是否显示科室分组的表格列 + "columnName": "科室分组名称", // 列的标题 + "columnWidth": "100px", // 列的宽度 + "departGroups": [ // 科室分组定义，可以定义多个科室分组 { - "id": 39784, - "departGroupName": "二沙分院", - "showDepartGroupName": "二沙医院" + "id": 1511687, // 科室分组的id，控制面板--参数设置--科室分组设置中定义的id + "departGroupName": "大院住院部", // 科室分组的名称 + "showDepartGroupName": "大院住院部" // 科室分组列中，需要显示的分组的名称，可以与实际分组的名称不同 } ] }, "departConfig": { // 科室配置 "columnName": "科室", - "columnWidth": "200px" // 科室列的宽度 + "columnWidth": "150px" // 科室列的宽度 }, "tousseColumnsConfig": [ // 表格的器械包列的设置 { @@ -43,63 +151,665 @@ ] }, { - "columnName": "止血钳", + "columnName": "治疗包（长效）", + "includeTousse": [ // 要统计的器械包，支持统计多个包 + { + "id": 131500, + "tousseName": "治疗包（长效）" + } + ] + }, + { + "columnName": "缝合包", "includeTousse": [ { - "id": 39876, - "tousseName": "止血钳" + "id": 39764, + "tousseName": "缝合包" } ] }, { - "columnName": "湿化瓶+芯（绿色）", + "columnName": "静切包", "includeTousse": [ { - "id": 120503, - "tousseName": "湿化瓶+芯（绿色）" + "id": 39756, + "tousseName": "静切包" } ] }, { - "columnName": "拆线剪", + "columnName": "气切包", "includeTousse": [ { - "id": 2657, - "tousseName": "拆线剪" - }, + "id": 39753, + "tousseName": "气切包" + } + ] + }, + { + "columnName": "切开包", + "includeTousse": [ { - "id": 903, - "tousseName": "拆线剪（妇科）" - }, + "id": 39760, + "tousseName": "切开包" + } + ] + }, + { + "columnName": "骨穿包（成人）", + "includeTousse": [ { - "id": 904, - "tousseName": "拆线剪（14cm）" + "id": 39776, + "tousseName": "骨穿包（成人）" } ] }, { - "columnName": "其它器械", - "includeOtherTousses": true // 是否包含其它的器械包。值为true，表示要显示出其它表格列中没指定的所有其它的器械，用【名字 数量】方式展现 + "columnName": "骨穿包（小儿）", + "includeTousse": [ + { + "id": 1499151, + "tousseName": "骨穿包（小儿）" + } + ] + }, + { + "columnName": "骨髓包", + "includeTousse": [ + { + "id": 39780, + "tousseName": "骨髓包" + } + ] + }, + { + "columnName": "胸穿包", + "includeTousse": [ + { + "id": 39832, + "tousseName": "胸穿包" + } + ] } ] }, { - "tableName": "表格2：大学城分院的物品", - "tableLayout": "noTousseColumns", + "tableName": "表格3：二沙", // 表格名称 "rowHeight" : 24, - "showDepartGroupColumn": true, - "departGroups": [ + "tableLayout": "showTousseColumns", // 表格布局，noTousseColumns表示不带列头的布局 + "departGroupsConfig": { // 科室分组配置 + "showDepartGroupColumn": true, // 是否显示科室分组的表格列 + "columnName": "科室分组名称", // 列的标题 + "columnWidth": "100px", // 列的宽度 + "departGroups": [ // 科室分组定义，可以定义多个科室分组 + { + "id": 1511738, // 科室分组的id，控制面板--参数设置--科室分组设置中定义的id + "departGroupName": "二沙分院", // 科室分组的名称 + "showDepartGroupName": "二沙岛分院" // 科室分组列中，需要显示的分组的名称，可以与实际分组的名称不同 + } + ] + }, + "departConfig": { // 科室配置 + "columnName": "科室", + "columnWidth": "150px" // 科室列的宽度 + }, + "tousseColumnsConfig": [ // 表格的器械包列的设置 { - "id": 39784, - "departGroupName": "大学城分院", - "showDepartGroupName": "大学城医院" + "columnName": "治疗包", + "includeTousse": [ // 要统计的器械包，支持统计多个包 + { + "id": 39784, + "tousseName": "治疗包" + } + ] }, { - "id": 39784, - "departGroupName": "芳村分院", - "showDepartGroupName": "芳村医院" + "columnName": "治疗包（长效）", + "includeTousse": [ // 要统计的器械包，支持统计多个包 + { + "id": 131500, + "tousseName": "治疗包（长效）" + } + ] + }, + { + "columnName": "缝合包", + "includeTousse": [ + { + "id": 39764, + "tousseName": "缝合包" + } + ] + }, + { + "columnName": "静切包", + "includeTousse": [ + { + "id": 39756, + "tousseName": "静切包" + } + ] + }, + { + "columnName": "气切包", + "includeTousse": [ + { + "id": 39753, + "tousseName": "气切包" + } + ] + }, + { + "columnName": "切开包", + "includeTousse": [ + { + "id": 39760, + "tousseName": "切开包" + } + ] + }, + { + "columnName": "骨穿包（成人）", + "includeTousse": [ + { + "id": 39776, + "tousseName": "骨穿包（成人）" + } + ] + }, + { + "columnName": "骨穿包（小儿）", + "includeTousse": [ + { + "id": 1499151, + "tousseName": "骨穿包（小儿）" + } + ] + }, + { + "columnName": "骨髓包", + "includeTousse": [ + { + "id": 39780, + "tousseName": "骨髓包" + } + ] + }, + { + "columnName": "胸穿包", + "includeTousse": [ + { + "id": 39832, + "tousseName": "胸穿包" + } + ] } ] + }, + { + "tableName": "表格4：芳村", // 表格名称 + "rowHeight" : 24, + "tableLayout": "showTousseColumns", // 表格布局，noTousseColumns表示不带列头的布局 + "departGroupsConfig": { // 科室分组配置 + "showDepartGroupColumn": true, // 是否显示科室分组的表格列 + "columnName": "科室分组名称", // 列的标题 + "columnWidth": "100px", // 列的宽度 + "departGroups": [ // 科室分组定义，可以定义多个科室分组 + { + "id": 1511819, // 科室分组的id，控制面板--参数设置--科室分组设置中定义的id + "departGroupName": "芳村分院", // 科室分组的名称 + "showDepartGroupName": "芳村分院" // 科室分组列中，需要显示的分组的名称，可以与实际分组的名称不同 + } + ] + }, + "departConfig": { // 科室配置 + "columnName": "科室", + "columnWidth": "150px" // 科室列的宽度 + }, + "tousseColumnsConfig": [ // 表格的器械包列的设置 + { + "columnName": "治疗包", + "includeTousse": [ // 要统计的器械包，支持统计多个包 + { + "id": 39784, + "tousseName": "治疗包" + } + ] + }, + { + "columnName": "治疗包（长效）", + "includeTousse": [ // 要统计的器械包，支持统计多个包 + { + "id": 131500, + "tousseName": "治疗包（长效）" + } + ] + }, + { + "columnName": "缝合包", + "includeTousse": [ + { + "id": 39764, + "tousseName": "缝合包" + } + ] + }, + { + "columnName": "静切包", + "includeTousse": [ + { + "id": 39756, + "tousseName": "静切包" + } + ] + }, + { + "columnName": "气切包", + "includeTousse": [ + { + "id": 39753, + "tousseName": "气切包" + } + ] + }, + { + "columnName": "切开包", + "includeTousse": [ + { + "id": 39760, + "tousseName": "切开包" + } + ] + }, + { + "columnName": "骨穿包（成人）", + "includeTousse": [ + { + "id": 39776, + "tousseName": "骨穿包（成人）" + } + ] + }, + { + "columnName": "骨穿包（小儿）", + "includeTousse": [ + { + "id": 1499151, + "tousseName": "骨穿包（小儿）" + } + ] + }, + { + "columnName": "骨髓包", + "includeTousse": [ + { + "id": 39780, + "tousseName": "骨髓包" + } + ] + }, + { + "columnName": "胸穿包", + "includeTousse": [ + { + "id": 39832, + "tousseName": "胸穿包" + } + ] + } + ] + }, + { + "tableName": "表格5：大学城门诊", // 表格名称 + "rowHeight" : 24, + "tableLayout": "showTousseColumns", // 表格布局，noTousseColumns表示不带列头的布局 + "departGroupsConfig": { // 科室分组配置 + "showDepartGroupColumn": true, // 是否显示科室分组的表格列 + "columnName": "科室分组名称", // 列的标题 + "columnWidth": "100px", // 列的宽度 + "departGroups": [ // 科室分组定义，可以定义多个科室分组 + { + "id": 1512289, // 科室分组的id，控制面板--参数设置--科室分组设置中定义的id + "departGroupName": "大学城门诊", // 科室分组的名称 + "showDepartGroupName": "大学城门诊" // 科室分组列中，需要显示的分组的名称，可以与实际分组的名称不同 + } + ] + }, + "departConfig": { // 科室配置 + "columnName": "科室", + "columnWidth": "150px" // 科室列的宽度 + }, + "tousseColumnsConfig": [ // 表格的器械包列的设置 + { + "columnName": "治疗包", + "includeTousse": [ // 要统计的器械包，支持统计多个包 + { + "id": 39784, + "tousseName": "治疗包" + } + ] + }, + { + "columnName": "治疗包（长效）", + "includeTousse": [ // 要统计的器械包，支持统计多个包 + { + "id": 131500, + "tousseName": "治疗包（长效）" + } + ] + }, + { + "columnName": "缝合包", + "includeTousse": [ + { + "id": 39764, + "tousseName": "缝合包" + } + ] + }, + { + "columnName": "静切包", + "includeTousse": [ + { + "id": 39756, + "tousseName": "静切包" + } + ] + }, + { + "columnName": "气切包", + "includeTousse": [ + { + "id": 39753, + "tousseName": "气切包" + } + ] + }, + { + "columnName": "切开包", + "includeTousse": [ + { + "id": 39760, + "tousseName": "切开包" + } + ] + }, + { + "columnName": "骨穿包（成人）", + "includeTousse": [ + { + "id": 39776, + "tousseName": "骨穿包（成人）" + } + ] + }, + { + "columnName": "骨穿包（小儿）", + "includeTousse": [ + { + "id": 1499151, + "tousseName": "骨穿包（小儿）" + } + ] + }, + { + "columnName": "骨髓包", + "includeTousse": [ + { + "id": 39780, + "tousseName": "骨髓包" + } + ] + }, + { + "columnName": "胸穿包", + "includeTousse": [ + { + "id": 39832, + "tousseName": "胸穿包" + } + ] + } + ] + }, + { + "tableName": "表格6：大学城住院部", // 表格名称 + "rowHeight" : 24, + "tableLayout": "showTousseColumns", // 表格布局，noTousseColumns表示不带列头的布局 + "departGroupsConfig": { // 科室分组配置 + "showDepartGroupColumn": true, // 是否显示科室分组的表格列 + "columnName": "科室分组名称", // 列的标题 + "columnWidth": "100px", // 列的宽度 + "departGroups": [ // 科室分组定义，可以定义多个科室分组 + { + "id": 1512916, // 科室分组的id，控制面板--参数设置--科室分组设置中定义的id + "departGroupName": "大院住院部", // 科室分组的名称 + "showDepartGroupName": "大院住院部" // 科室分组列中，需要显示的分组的名称，可以与实际分组的名称不同 + } + ] + }, + "departConfig": { // 科室配置 + "columnName": "科室", + "columnWidth": "150px" // 科室列的宽度 + }, + "tousseColumnsConfig": [ // 表格的器械包列的设置 + { + "columnName": "治疗包", + "includeTousse": [ // 要统计的器械包，支持统计多个包 + { + "id": 39784, + "tousseName": "治疗包" + } + ] + }, + { + "columnName": "治疗包（长效）", + "includeTousse": [ // 要统计的器械包，支持统计多个包 + { + "id": 131500, + "tousseName": "治疗包（长效）" + } + ] + }, + { + "columnName": "缝合包", + "includeTousse": [ + { + "id": 39764, + "tousseName": "缝合包" + } + ] + }, + { + "columnName": "静切包", + "includeTousse": [ + { + "id": 39756, + "tousseName": "静切包" + } + ] + }, + { + "columnName": "气切包", + "includeTousse": [ + { + "id": 39753, + "tousseName": "气切包" + } + ] + }, + { + "columnName": "切开包", + "includeTousse": [ + { + "id": 39760, + "tousseName": "切开包" + } + ] + }, + { + "columnName": "骨穿包（成人）", + "includeTousse": [ + { + "id": 39776, + "tousseName": "骨穿包（成人）" + } + ] + }, + { + "columnName": "骨穿包（小儿）", + "includeTousse": [ + { + "id": 1499151, + "tousseName": "骨穿包（小儿）" + } + ] + }, + { + "columnName": "骨髓包", + "includeTousse": [ + { + "id": 39780, + "tousseName": "骨髓包" + } + ] + }, + { + "columnName": "胸穿包", + "includeTousse": [ + { + "id": 39832, + "tousseName": "胸穿包" + } + ] + } + ] + },{ + "tableName": "表格7：分门诊", // 表格名称 + "rowHeight" : 24, + "tableLayout": "showTousseColumns", // 表格布局，noTousseColumns表示不带列头的布局 + "departGroupsConfig": { // 科室分组配置 + "showDepartGroupColumn": true, // 是否显示科室分组的表格列 + "columnName": "科室分组名称", // 列的标题 + "columnWidth": "100px", // 列的宽度 + "departGroups": [ // 科室分组定义，可以定义多个科室分组 + { + "id": 1513394, // 科室分组的id，控制面板--参数设置--科室分组设置中定义的id + "departGroupName": "分门诊", // 科室分组的名称 + "showDepartGroupName": "分门诊" // 科室分组列中，需要显示的分组的名称，可以与实际分组的名称不同 + } + ] + }, + "departConfig": { // 科室配置 + "columnName": "科室", + "columnWidth": "150px" // 科室列的宽度 + }, + "tousseColumnsConfig": [ // 表格的器械包列的设置 + { + "columnName": "治疗包", + "includeTousse": [ // 要统计的器械包，支持统计多个包 + { + "id": 39784, + "tousseName": "治疗包" + } + ] + }, + { + "columnName": "治疗包（长效）", + "includeTousse": [ // 要统计的器械包，支持统计多个包 + { + "id": 131500, + "tousseName": "治疗包（长效）" + } + ] + }, + { + "columnName": "缝合包", + "includeTousse": [ + { + "id": 39764, + "tousseName": "缝合包" + } + ] + }, + { + "columnName": "静切包", + "includeTousse": [ + { + "id": 39756, + "tousseName": "静切包" + } + ] + }, + { + "columnName": "气切包", + "includeTousse": [ + { + "id": 39753, + "tousseName": "气切包" + } + ] + }, + { + "columnName": "切开包", + "includeTousse": [ + { + "id": 39760, + "tousseName": "切开包" + } + ] + }, + { + "columnName": "骨穿包（成人）", + "includeTousse": [ + { + "id": 39776, + "tousseName": "骨穿包（成人）" + } + ] + }, + { + "columnName": "骨穿包（小儿）", + "includeTousse": [ + { + "id": 1499151, + "tousseName": "骨穿包（小儿）" + } + ] + }, + { + "columnName": "骨髓包", + "includeTousse": [ + { + "id": 39780, + "tousseName": "骨髓包" + } + ] + }, + { + "columnName": "胸穿包", + "includeTousse": [ + { + "id": 39832, + "tousseName": "胸穿包" + } + ] + } + ] } + + /* { + "tableName": "表格2：二沙岛分院", + "rowHeight" : 24, + "tableLayout": "noTousseColumns", + "showDepartGroupColumn": true, + "departGroups": [ + { + "id": 1390928, + "departGroupName": "二沙分院", + "showDepartGroupName": "二沙岛分院" + } + ] + }*/ ] } \ No newline at end of file