Index: ssts-web/src/main/webapp/disinfectsystem/config/kpszxyy/print/printConfig.js =================================================================== diff -u -r23808 -r23817 --- ssts-web/src/main/webapp/disinfectsystem/config/kpszxyy/print/printConfig.js (.../printConfig.js) (revision 23808) +++ ssts-web/src/main/webapp/disinfectsystem/config/kpszxyy/print/printConfig.js (.../printConfig.js) (revision 23817) @@ -1,7 +1,7 @@ -var appropriationInListConfig = { +var appropriationInListConfig = { headerFooter : [ // 页眉名称 - {label : "复大肿瘤医院调拨入库单", dataIndex : '', fontSize : 15, position : ["0.3cm","37%","99%",5]}, + {label : "开平中心医院调拨入库单", dataIndex : '', fontSize : 15, position : ["0.3cm","37%","99%",5]}, {label : "调拨日期:", dataIndex : 'date', fontSize : 9, position : ["1cm","38%","99%",5]}, {label : "仓库：", dataIndex : 'warehouse', fontSize : 9, position : ["1cm","2%","90%",5]} ], @@ -28,7 +28,7 @@ var appropriationOutListConfig = { headerFooter : [ // 页眉名称 - {label : "复大肿瘤医院调拨出库单", dataIndex : '', fontSize : 15, position : ["0.3cm","37%","99%",5]}, + {label : "开平中心医院调拨出库单", dataIndex : '', fontSize : 15, position : ["0.3cm","37%","99%",5]}, {label : "调拨日期:", dataIndex : 'date', fontSize : 9, position : ["1cm","38%","99%",5]}, {label : "仓库：", dataIndex : 'warehouse', fontSize : 9, position : ["1cm","2%","90%",5]} ], @@ -55,7 +55,7 @@ var appropriationListConfig = { headerFooter : [ // 页眉名称 - {label : "复大肿瘤医院调拨单查询", dataIndex : 'depart', fontSize : 15, position : ["0.3cm","30%","99%",5]}, + {label : "开平中心医院调拨单查询", dataIndex : 'depart', fontSize : 15, position : ["0.3cm","30%","99%",5]}, {label : "调拨日期:", dataIndex : 'date', fontSize : 9, position : ["1cm","38%","99%",5]} //{label : "科室：", dataIndex : 'depart', fontSize : 9, position : ["30","2%","90%",5]} ], @@ -82,7 +82,7 @@ var godownEntryOutListConfig = { headerFooter : [ // 页眉名称 - {label : "复大肿瘤医院退库单查询", dataIndex : 'depart', fontSize : 15, position : ["0.3cm","30%","99%",5]}, + {label : "开平中心医院退库单查询", dataIndex : 'depart', fontSize : 15, position : ["0.3cm","30%","99%",5]}, {label : "退库日期:", dataIndex : 'date', fontSize : 9, position : ["1cm","38%","99%",5]} //{label : "科室：", dataIndex : 'depart', fontSize : 9, position : ["30","2%","90%",5]} ], @@ -107,7 +107,7 @@ var godownStockTakeListConfig = { headerFooter : [ // 页眉名称 - {label : "复大肿瘤医院盘盈盘亏单查询", dataIndex : 'depart', fontSize : 15, position : ["0.3cm","30%","99%",5]}, + {label : "开平中心医院盘盈盘亏单查询", dataIndex : 'depart', fontSize : 15, position : ["0.3cm","30%","99%",5]}, {label : "日期:", dataIndex : 'date', fontSize : 9, position : ["1cm","38%","99%",5]} //{label : "科室：", dataIndex : 'depart', fontSize : 9, position : ["30","2%","90%",5]} ], @@ -132,7 +132,7 @@ var godownEntryListPrintConfig = { headerFooter : [ // 页眉名称 - {label : "复大肿瘤医院入库单查询", dataIndex : 'depart', fontSize : 15, position : ["0.3cm","30%","99%",5]}, + {label : "开平中心医院入库单查询", dataIndex : 'depart', fontSize : 15, position : ["0.3cm","30%","99%",5]}, {label : "入库日期:", dataIndex : 'date', fontSize : 9, position : ["1cm","38%","99%",5]} //{label : "科室：", dataIndex : 'depart', fontSize : 9, position : ["30","2%","90%",5]} ], @@ -162,7 +162,6 @@ isPrintDisposableGoods : true, // 打印申请单是否打印一次性物品 isMergePrintTousseAndDisposable : false, // 器械包和一次性物品是否合并打印 printByOriginalApplications : true, //不合并打印情况下是否按原始单据逐份打印 - isMergePrintMultipleSelectedApplications : true, // 是否合并打印在科室申领视图选择的多张申请单 printApplyInfo : false, mergeSameGoods : true, printOrder : 1, // 1:优先打印一次性物品， 2：优先打印器械包 @@ -220,52 +219,58 @@ ] } var batchPrintMaterialInvoicesConfig = { + //9.3cm*21.5cm headerFooter : [ // 页眉名称 - //{label : "广州复大肿瘤医院", dataIndex : '', fontSize : 10, position : ["5","1%","90%",5]}, + {label : "", dataIndex : 'unitName', fontSize : 10, position : ["5","1%","90%",5]}, // 标题 - {label : "广州复大肿瘤医院卫生材料出库单", dataIndex : '', fontSize : 15, position : ["5","32%","99%",5]}, - {label : "科室：", dataIndex : 'depart', fontSize : 11, position : ["30","2%","90%",5]}, - {label : "备注:", dataIndex : 'remark2', fontSize : 11, position : ["30","25%","90%",5]}, - {label : "记账日期:", dataIndex : 'sendTime', fontSize : 11, position : ["30","58%","90%",5]}, - {label : "出库单号:", dataIndex : 'serialNumber2', fontSize : 11, position : ["30","80%","90%",5]}, - //页脚 - {label : "制单日期:", dataIndex : 'printDate', fontSize : 11, position : ["310","2%","90%",5]}, - {label : "制单人:", dataIndex : 'printUser', fontSize : 11, position : ["310","25%","90%",5]}, - {label : "领用人:", dataIndex : '', fontSize : 11, position : ["310","45%","90%",5]}, - {label : "保管人:", dataIndex : '', fontSize : 11, position : ["310","65%","90%",5]}, - {label : "记账人:", dataIndex : 'sender', fontSize : 11, position : ["310","80%","90%",5]} + {label : "材料出库单", dataIndex : '', fontSize : 15, position : ["20","40%","99%",5]}, + {label : "部门：", dataIndex : 'depart', fontSize : 11, position : ["55","2%","90%",5]}, + {label : "仓库:消毒供应中心", dataIndex : '', fontSize : 11, position : ["55","75%","90%",5]}, + {label : "制单人:", dataIndex : 'printUser', fontSize : 11, position : ["55","35%","90%",5]}, + {label : "打印时间:", dataIndex : 'printTime', fontSize : 11, position : ["80","2%","90%",5]}, + {label : "备注:", dataIndex : 'remark2', fontSize : 11, position : ["80","35%","90%",5]}, + {label : "发货人:", dataIndex : 'sender', fontSize : 11, position : ["8.4cm","5%","90%",5]}, + {label : "复核人:", dataIndex : 'assistantSender', fontSize : 11, position : ["8.4cm","40%","90%",5]}, + {label : "签收人:", dataIndex : '', fontSize : 11, position : ["8.4cm","75%","90%",5]}, + {barcodes : [ + {codeType : "128Auto", dataIndex : 'departBarcode', position : ["3mm","74%","40mm","8mm"], + styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: true}, + {itemNameID: 0, styleName: 'FontSize', styleValue: 6}, + {itemNameID: 0, styleName: 'NotOnlyHighPrecision', styleValue: true} + ] + } + ]} ], - currentPageNumber : {label : "第#页", fontSize : 11, position : ["30","45%","90%",5]}, - totalPageAmount : {label : "共&页", fontSize : 11, position : ["30","50%","90%",5]}, - goodsTable :{ - rowHeight : 20, - position : ["50","1%","99%","6.0cm"], - headRepeat : true, - columns : [ - {header : "序号", dataIndex : 'serialNumber', width : '100', align : 'center', fontSize : 11}, - {header : "编码", dataIndex : 'externalCode', width : '150', align : 'center', fontSize : 11}, - {header : "名称", dataIndex : 'name', width : '150', align : 'center', fontSize : 11}, - {header : "规格", dataIndex : 'specification', width : '150', align : 'center', fontSize : 11}, -// {header : "包装规格", dataIndex : 'packageSpec', width : '15%', align : 'center', fontSize : 11}, - {header : "单位", dataIndex : 'unit', width : '100', align : 'center', fontSize : 11}, - {header : "数量", dataIndex : 'amount', width : '100', align : 'center', fontSize : 11} - //{header : "有效日期", dataIndex : 'expireDate', width : 85, align : 'center', fontSize : 11}, - //{header : "批号", dataIndex : 'batchNumber', width : 105, align : 'center', fontSize : 11} -// {header : "单价", dataIndex : 'price', width : '10%', align : 'right', fontSize : 11}, -// {header : "金额", dataIndex : 'totalPrice', width : '10%', align : 'right', fontSize : 11} - ] - } + currentPageNumber : {label : "第#页", fontSize : 11, position : ["8.8cm","75%","90%",5]}, + totalPageAmount : {label : "共&页", fontSize : 11, position : ["8.8cm","81%","90%",5]}, + goodsTable :{ + rowHeight : 25, + position : ["100","1%","97%","5.0cm"], + headRepeat : true, + columns : [ + {header : "序号", dataIndex : 'serialNumber', width : '10%', align : 'center', fontSize : 11}, + {header : "名称", dataIndex : 'name', width : '30%', align : 'left', fontSize : 11}, + {header : "规格", dataIndex : 'specification', width : '15%', align : 'center', fontSize : 11}, + {header : "包装规格", dataIndex : 'packageSpec', width : '15%', align : 'center', fontSize : 11}, + {header : "单位", dataIndex : 'unit', width : '5%', align : 'center', fontSize : 11}, + {header : "数量", dataIndex : 'amount', width : '5%', align : 'right', fontSize : 11}, +// {header : "批次/灭菌日期", dataIndex : 'batchNumber', width : 105, align : 'center', fontSize : 11}, +// {header : "失效日期", dataIndex : 'expireDate', width : 85, align : 'center', fontSize : 11}, + {header : "单价", dataIndex : 'price', width : '10%', align : 'right', fontSize : 11}, + {header : "金额", dataIndex : 'totalPrice', width : '10%', align : 'right', fontSize : 11} + ] + } }; var batchPrintInvoicesConfig = { /*在打印之前调用,可用于排序,合并等操作*/ beforeBatchPrintInvoices:beforeBatchPrintInvoices, headerFooter : [ // 页眉名称 - //{label : "广州复大肿瘤医院", dataIndex : '', fontSize : 10, position : ["5","1%","90%",5]}, + //{label : "开平中心医院", dataIndex : '', fontSize : 10, position : ["5","1%","90%",5]}, // 标题 - {label : "广州复大肿瘤医院卫生材料出库单", dataIndex : '', fontSize : 15, position : ["5","32%","99%",5]}, + {label : "开平中心医院卫生材料出库单", dataIndex : '', fontSize : 15, position : ["5","32%","99%",5]}, {label : "科室:", dataIndex : 'depart', fontSize : 11, position : ["30","2%","90%",5]}, {label : "备注:", dataIndex : 'remark2', fontSize : 11, position : ["30","25%","90%",5]}, {label : "记账日期:", dataIndex : 'sendTime', fontSize : 11, position : ["30","58%","90%",5]}, @@ -303,7 +308,7 @@ var invoiceComboPrintConfig = { headerFooter : [ // 页眉名称 - {label : "广州复大肿瘤医院", dataIndex : '', fontSize : 10, position : ["5","1%","90%",5]}, + {label : "开平中心医院", dataIndex : '', fontSize : 10, position : ["5","1%","90%",5]}, // 标题 {label : "材料出库单", dataIndex : '', fontSize : 15, position : ["20","40%","99%",5]}, {label : "部门：", dataIndex : 'depart', fontSize : 11, position : ["55","2%","90%",5]}, @@ -356,7 +361,7 @@ rowsPerPage : 11, headerContent : [ // 页眉名称 - {label : "广州复大肿瘤医院", dataIndex : '', fontSize : 10, position : ["5","1%","90%",5]}, + {label : "开平中心医院", dataIndex : '', fontSize : 10, position : ["5","1%","90%",5]}, // 标题 {label : "无菌物品申领单", dataIndex : '', fontSize : 15, position : ["20","40%","99%",5]}, {label : "部门：", dataIndex : 'depart', fontSize : 11, position : ["55","2%","90%",5]}, @@ -410,7 +415,7 @@ rowsPerPage : 11, headerContent : [ // 标题 - {label : "广州复大肿瘤医院", dataIndex : '', fontSize : 10, position : ["5","1%","90%",5]}, + {label : "开平中心医院", dataIndex : '', fontSize : 10, position : ["5","1%","90%",5]}, {label : "借物单", dataIndex : '', fontSize : 17, position : ["22","45%","99%",5]}, {label : "去向：", dataIndex : 'depart', fontSize : 10, position : ["55","5%","90%",5]}, {label : "单号：", dataIndex : 'serialNum', fontSize : 10, position : ["55","25%","90%",5]}, @@ -445,7 +450,7 @@ var appropriationConfig = { headerFooter : [ // 标题 - {label : "广州复大肿瘤医院卫生材料调拨单", dataIndex : '', fontSize : 15, position : ["0.2cm","28%","99%",5]}, + {label : "开平中心医院卫生材料调拨单", dataIndex : '', fontSize : 15, position : ["0.2cm","28%","99%",5]}, {label : "调拨类型：手工调拨", dataIndex : '', fontSize : 9, position : ["1cm","2%","90%",5]}, {label : "供应商：", dataIndex : 'supplierName', fontSize : 9, position : ["1.5cm","2%","90%",5]}, {label : "出库仓库：", dataIndex : 'warehouseName', fontSize : 9, position : ["1cm","40%","90%",5]}, @@ -487,7 +492,7 @@ var godownOutEntryConfig = { headerFooter : [ // 标题 - {label : "广州复大肿瘤医院卫生材料退库单", dataIndex : '', fontSize : 15, position : ["0.2cm","28%","99%",5]}, + {label : "开平中心医院卫生材料退库单", dataIndex : '', fontSize : 15, position : ["0.2cm","28%","99%",5]}, {label : "退库类型：手工退库", dataIndex : '', fontSize : 9, position : ["0.5cm","2%","90%",5]}, {label : "供应商：", dataIndex : 'supplierName', fontSize : 9, position : ["1cm","2%","90%",5]}, {label : "退库日期：", dataIndex : 'godownEntryTime', fontSize : 9, position : ["1cm","53%","90%",5]}, @@ -525,7 +530,7 @@ var materialEntryConfig = { headerFooter : [ // 标题 - {label : "广州复大肿瘤医院卫生材料入库单", dataIndex : '', fontSize : 15, position : ["0.2cm","28%","99%",5]}, + {label : "开平中心医院卫生材料入库单", dataIndex : '', fontSize : 15, position : ["0.2cm","28%","99%",5]}, {label : "入库类型：购入入库", dataIndex : '', fontSize : 9, position : ["0.5cm","2%","90%",5]}, {label : "供应商：", dataIndex : 'supplierName', fontSize : 9, position : ["1cm","2%","90%",5]}, {label : "入库日期：", dataIndex : 'godownEntryTime', fontSize : 9, position : ["1cm","53%","90%",5]}, @@ -564,7 +569,7 @@ var godownStockTakeConfig = { headerFooter : [ // 标题 - {label : "广州复大肿瘤医院卫生材料盘盈盘亏单", dataIndex : '', fontSize : 15, position : ["0.2cm","28%","99%",5]}, + {label : "开平中心医院卫生材料盘盈盘亏单", dataIndex : '', fontSize : 15, position : ["0.2cm","28%","99%",5]}, {label : "入库类型：", dataIndex : 'subType', fontSize : 9, position : ["0.5cm","2%","90%",5]}, {label : "供应商：", dataIndex : 'supplierName', fontSize : 9, position : ["1cm","2%","90%",5]}, {label : "日期：", dataIndex : 'godownEntryTime', fontSize : 9, position : ["1cm","53%","90%",5]}, @@ -619,7 +624,7 @@ var godownEntryConfig = { headerFooter : [ // 标题 - {label : "广州复大肿瘤医院卫生材料入库单", dataIndex : '', fontSize : 15, position : ["0.2cm","28%","99%",5]}, + {label : "开平中心医院卫生材料入库单", dataIndex : '', fontSize : 15, position : ["0.2cm","28%","99%",5]}, {label : "入库类型：购入入库", dataIndex : '', fontSize : 9, position : ["0.5cm","2%","90%",5]}, {label : "供应商：", dataIndex : 'supplierName', fontSize : 9, position : ["1cm","2%","90%",5]}, {label : "入库日期：", dataIndex : 'godownEntryTime', fontSize : 9, position : ["1cm","53%","90%",5]}, @@ -672,7 +677,7 @@ var purchasePlanConfig = { headerFooter : [ // 标题 - {label : "广州复大肿瘤医院一次性物品采购计划", dataIndex : '', fontSize : 15, position : ["0.2cm","28%","99%",5]}, + {label : "开平中心医院一次性物品采购计划", dataIndex : '', fontSize : 15, position : ["0.2cm","28%","99%",5]}, //{label : "入库类型：购入入库", dataIndex : '', fontSize : 9, position : ["0.5cm","2%","90%",5]}, //{label : "供应商：", dataIndex : 'supplierName', fontSize : 9, position : ["1cm","2%","90%",5]}, {label : "操作日期：", dataIndex : 'godownEntryTime', fontSize : 9, position : ["1cm","2%","90%",5]}, @@ -1078,8 +1083,8 @@ {label : "手术器械清单：", dataIndex : '', fontSize : 11, position : ["225","4%","90%",10]}, - {label : "公司名称：", dataIndex : 'supplierName', fontSize : 11, position : ["480","4%","90%",5]}, - {label : "联系方式：", dataIndex : '', fontSize : 11, position : ["500","4%","90%",5]} + {label : "签收人：", dataIndex : '', fontSize : 11, position : ["480","4%","90%",5]} + ], goodsTable :{ @@ -1225,37 +1230,35 @@ LODOP.PRINT(); } var idCardSmallLabelConfig = { - customPrint:printIDCardSmallLabel_gzfdzl -} -/** - * 小标签规格：宽：6.5cm 高：3.6cm，器械包名字和条形码都需要竖着打印 - * @param idCardInstance - */ -function printIDCardSmallLabel_gzfdzl(idCardInstance){ + customPrint:printIDCardSmallLabel_gdsy + } +function printIDCardSmallLabel_gdsy(idCardInstance){ if(isUndefinedOrNullOrEmpty(idCardInstance.tousseDefinition)){ alert('包定义不能为空!'); return; } - doGetLodop(); - var name = idCardInstance.tousseDefinition.name; var barcode = idCardInstance.barcode; - var date = idCardInstance.printDate; + var name = idCardInstance.tousseDefinition.name; - name += "(复大肿瘤)"; - - // 打印2个条形码，旋转90度 - LODOP.ADD_PRINT_BARCODE("5mm","5mm","10mm","30mm","128Auto", barcode); - LODOP.SET_PRINT_STYLEA(0,"Angle",-90); + doGetLodop(); + // 设置默认字体 + setDefaultFontNameSizeBold('宋体',12,1); + // 默认条码属性 + LODOP.SET_PRINT_STYLE('ShowBarText', true); + LODOP.SET_PRINT_STYLE('FontSize', 6); + LODOP.SET_PRINT_STYLE('NotOnlyHighPrecision', true); - LODOP.ADD_PRINT_BARCODE("2mm","50mm","10mm","30mm","128Auto", barcode); - LODOP.SET_PRINT_STYLEA(0,"Angle",90); - - // 旋转90度 - LODOP.ADD_PRINT_HTM("5mm","15mm","8mm","36mm", "\n
" + name + "
"); + var fontSize = getFontSizeByStr(name,[ + {maxLen:10,fontSize:20}, + {maxLen:20,fontSize:10}, + {maxLen:30,fontSize:8}, + {maxLen:1000,fontSize:6} + ]); + LODOP.ADD_PRINT_TEXT("1mm","1mm","RightMargin:0mm","12mm", name); + setFontSizeBold(fontSize,1);// 设置字体 + setAlignment('center');// 对齐 - // 另一个方向旋转90度 - LODOP.ADD_PRINT_TEXT("31mm","45mm","40mm","30mm", name); - LODOP.SET_PRINT_STYLEA(0,"Angle",90); + LODOP.ADD_PRINT_BARCODE("18mm","5mm","40mm","10mm","128Auto", barcode);// 条码1 LODOP.PRINT(); } var printConfig = { Index: ssts-web/src/main/webapp/disinfectsystem/config/kpszxyy/config.js =================================================================== diff -u -r23693 -r23817 --- ssts-web/src/main/webapp/disinfectsystem/config/kpszxyy/config.js (.../config.js) (revision 23693) +++ ssts-web/src/main/webapp/disinfectsystem/config/kpszxyy/config.js (.../config.js) (revision 23817) @@ -73,13 +73,20 @@ enableForeignTousseApplyDepartment:true, // 发货计划，是否隐藏未打印的器械包 hideUnprintedTousseItems: true, -printRecyclingConfigFormVersion:2, - -enableInvoicePlanTousseGroupPrint:true, - -isShowTousseGroup:true, - -showRememberRecycleUserButton:true, -//是否显示代理灭菌单isShowPROXYDISINFECTION -isShowProxyDisinfection:true + //打印发货计划设置页的版本 + printRecyclingConfigFormVersion:2, + //发货计划打印是否支持器械包分组打印 + enableInvoicePlanTousseGroupPrint:true, + //是否显示按器械包分组选择框 + isShowTousseGroup:true, + //待回收列表显示记住回收人按钮 + showRememberRecycleUserButton:true, + //申请器械包时是否自动归还待归还物品 + autoReturnTousse:true, + //装配界面显示灭菌员字段 + showSterileField:true, + // 是否启用标识牌跟篮筐绑定。如果启用，在回收的时候，扫描标识牌自动带出跟标识牌绑定的篮筐并将包实例入到篮筐中。 + enableIdCardBasketBinding:true, + //是否显示代理灭菌单isShowPROXYDISINFECTION + isShowProxyDisinfection:true } \ No newline at end of file