Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/config.js =================================================================== diff -u -r14505 -r14510 --- ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/config.js (.../config.js) (revision 14505) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/config.js (.../config.js) (revision 14510) @@ -1,8 +1,8 @@ var sstsConfig = { // 禁用标识牌功能 - disableIdCard : true, + disableIdCard : false, // 审核器械包必须入篮筐（一级供应室） - mustScanBasketForTousseReview : true, + mustScanBasketForTousseReview : false, // 审核器械包必须入篮筐（二级供应室） mustScanBasketForTousseReviewOf2ndSupplyRoom : false, // 申请表单的类型：1 ： 通用申请单（组合申请单），2：分开的申请单 @@ -15,13 +15,13 @@ // 申请器械包时是否自动归还待归还物品 autoReturnTousse : false, // 是否隐藏进入审核列表按钮 - hideEnterReviewListButton : true, + hideEnterReviewListButton : false, // 是否自动补全用户名 autoFillUserName:false, // 自动补全用户名的长度 autoFillUserNameLength:6, // 是否支持部分终止申请单中的物品 - enableTerminatePartOfApplication : false, + enableTerminatePartOfApplication : true, //限制入库单填写的一次性物品为能申领的物品 restrictGodownEntryDiposableGoods : false, //提交申请单前显示申请的物品清单 @@ -35,5 +35,7 @@ //是否禁用科室同步 hiddenOrgunitSyncButton : true, //是否禁用人员同步 - hiddenUserSyncButton : true + hiddenUserSyncButton : true, + //发货单是否合并打印，如果为true,则把一次性物品、消毒物品、器械包打印到一张单,false或者不配置，都是分三张单打印 + mergePrintInvoiceGoods:false } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrint.js =================================================================== diff -u -r13898 -r14510 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrint.js (.../invoicePrint.js) (revision 13898) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePrint.js (.../invoicePrint.js) (revision 14510) @@ -441,21 +441,36 @@ invoicesInfo.goods = goods; printInvoiceInfo_local(invoicesInfo, printType); - }else{ + }else{ // 器械包 if(invoicesInfo.tousse.length > 0){ + invoicesInfo.formTypeOfPrinted = 'batchPrintInvoices'; + var tousseObj = printConfig['batchPrintInvoice_Tousse']; + if(!isUndefinedOrNullOrEmpty(tousseObj)){ + invoicesInfo.formTypeOfPrinted = 'batchPrintInvoice_Tousse'; + } invoicesInfo.goods = invoicesInfo.tousse; printInvoiceInfo_local(invoicesInfo, printType); } // 一次性物品 if(invoicesInfo.diposableGoods.length > 0){ //invoicesInfo.applicationType = "一次性物品申请单"; + invoicesInfo.formTypeOfPrinted = 'batchPrintInvoices'; + var tousseObj = printConfig['batchPrintInvoice_disposable']; + if(!isUndefinedOrNullOrEmpty(tousseObj)){ + invoicesInfo.formTypeOfPrinted = 'batchPrintInvoice_disposable'; + } invoicesInfo.goods = invoicesInfo.diposableGoods; printInvoiceInfo_local(invoicesInfo, printType); } // 消毒物品 if(invoicesInfo.disinfectGoods.length > 0){ //invoicesInfo.applicationType = "消毒物品申请单"; + invoicesInfo.formTypeOfPrinted = 'batchPrintInvoices'; + var tousseObj = printConfig['batchPrintInvoice_disinfect']; + if(!isUndefinedOrNullOrEmpty(tousseObj)){ + invoicesInfo.formTypeOfPrinted = 'batchPrintInvoice_disinfect'; + } invoicesInfo.goods = invoicesInfo.disinfectGoods; printInvoiceInfo_local(invoicesInfo, printType); } Index: ssts-web/src/main/resources/config/dgsdhyy/dataSyncConfig.json =================================================================== diff -u -r14403 -r14510 --- ssts-web/src/main/resources/config/dgsdhyy/dataSyncConfig.json (.../dataSyncConfig.json) (revision 14403) +++ ssts-web/src/main/resources/config/dgsdhyy/dataSyncConfig.json (.../dataSyncConfig.json) (revision 14510) @@ -9,7 +9,7 @@ "更新交集数据" : true, "移除差集数据" : true, "默认角色ID":[ - "sly" + "ROLE_sly_0" ] } } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/print/printConfig.js =================================================================== diff -u -r14447 -r14510 --- ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/print/printConfig.js (.../printConfig.js) (revision 14447) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgsdhyy/print/printConfig.js (.../printConfig.js) (revision 14510) @@ -282,21 +282,21 @@ // 页眉名称 //{label : "", dataIndex : 'unitName', fontSize : 10, position : ["5","1%","90%",5]}, // 标题 - {label : "东莞东华医院 供应室器械仓库领用出库单", dataIndex : '', fontSize : 15, position : ["15","25%","99%",5]}, + {label : "东莞东华医院 供应室器械仓库领用出库单", dataIndex : '', fontSize : 15, position : ["15","10%","99%",5]}, {label : "接收科室：", dataIndex : 'depart', fontSize : 11, position : ["57","2%","90%",5]}, {label : "日期:", dataIndex : 'printDate', fontSize : 11, position : ["57","33%","90%",5]}, //{label : "仓库:供应室器械仓库", dataIndex : '', fontSize : 11, position : ["42","75%","90%",5]}, //{label : "制单人:", dataIndex : 'printUser', fontSize : 11, position : ["42","35%","90%",5]}, {label : "备注:", dataIndex : 'remark2', fontSize : 11, position : ["57","75%","90%",5]}, - {label : "打印时间:", dataIndex : 'printTime', fontSize : 11, position : ["8.9cm","5%","90%",5]}, - {label : "发货人:", dataIndex : 'sender', fontSize : 11, position : ["8.9cm","35%","90%",5]}, - {label : "下送人:", dataIndex : '', fontSize : 11, position : ["8.9cm","50%","90%",5]}, - {label : "领用人:", dataIndex : '', fontSize : 11, position : ["8.9cm","65%","90%",5]}, + {label : "打印时间:", dataIndex : 'printTime', fontSize : 11, position : ["12.4cm","2%","90%",5]}, + {label : "发货人:", dataIndex : 'sender', fontSize : 11, position : ["12.4cm","32%","90%",5]}, + {label : "下送人:", dataIndex : '', fontSize : 11, position : ["12.4cm","50%","90%",5]}, + {label : "领用人:", dataIndex : '', fontSize : 11, position : ["12.4cm","65%","90%",5]}, //{label : "复核人:", dataIndex : '', fontSize : 11, position : ["11cm","5%","90%",5]}, - {label : "审核人:", dataIndex : '', fontSize : 11, position : ["8.9cm","80%","90%",5]}, + {label : "审核人:", dataIndex : '', fontSize : 11, position : ["12.4cm","80%","90%",5]}, {barcodes : [ - {codeType : "128Auto", dataIndex : 'departBarcode', position : ["15","74%","40mm","8mm"], + {codeType : "128Auto", dataIndex : 'departBarcode', position : ["15","70%","40mm","8mm"], styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: true}, {itemNameID: 0, styleName: 'FontSize', styleValue: 6}, {itemNameID: 0, styleName: 'NotOnlyHighPrecision', styleValue: true} @@ -308,26 +308,75 @@ totalPageAmount : {label : "&", fontSize : 11, position : ["57","63%","90%",5]}, goodsTable :{ rowHeight : 25, - position : ["85","0.2cm","20.4cm","6.5cm"], + position : ["85","0.2cm","16.7cm","9.6cm"], headRepeat : true, fontSize:11, style:'"border-left:0px;border-right:0px;border-top:#000000 1px solid;border-bottom:#000000 1px solid;"', columns : [ {header : "序号", dataIndex : 'serialNumber', width : '5%', align : 'center', fontSize : 11}, - {header : "名称", dataIndex : 'name', width : 145, align : 'left', fontSize : 11}, - {header : "规格", dataIndex : 'specification', width : '9%', align : 'center', fontSize : 11}, - {header : "包装规格", dataIndex : 'packageSpec', width : '9%', align : 'center', fontSize : 11}, - {header : "单位", dataIndex : 'unit', width : '4%', align : 'center', fontSize : 11}, - {header : "数量", dataIndex : 'amount', width : '4%', align : 'right', fontSize : 11}, - {header : "批次/灭菌日期", dataIndex : 'batchNumber', width : '10%', align : 'center', fontSize : 11}, - {header : "失效日期", dataIndex : 'expireDate', width : '8%', align : 'center', fontSize : 11}, - {header : "单价", dataIndex : 'price', width : '6%', align : 'center', fontSize : 11}, - {header : "金额", dataIndex : 'totalPrice', width : '9%', align : 'center', fontSize : 11}, - {header : "生产厂家", dataIndex : 'manufacturer', width : '17%', align : 'center', fontSize : 11} + {header : "名称", dataIndex : 'name', width : '235', align : 'center', fontSize : 11}, + //{header : "规格", dataIndex : 'specification', width : '9%', align : 'center', fontSize : 11}, + //{header : "包装规格", dataIndex : 'packageSpec', width : '9%', align : 'center', fontSize : 11}, + {header : "单位", dataIndex : 'unit', width : '8%', align : 'center', fontSize : 11}, + {header : "数量", dataIndex : 'amount', width : '5%', align : 'right', fontSize : 11}, + {header : "灭菌日期", dataIndex : 'batchNumber', width : '12%', align : 'center', fontSize : 11}, + {header : "失效日期", dataIndex : 'expireDate', width : '12%', align : 'center', fontSize : 11}, + {header : "单价", dataIndex : 'price', width : '8%', align : 'center', fontSize : 11}, + {header : "金额", dataIndex : 'totalPrice', width : '10%', align : 'center', fontSize : 11} + //{header : "生产厂家", dataIndex : 'manufacturer', width : '17%', align : 'center', fontSize : 11} ] } } - +var batchPrintInvoicesConfig_disposable = { + headerFooter : [ + // 页眉名称 + //{label : "", dataIndex : 'unitName', fontSize : 10, position : ["5","1%","90%",5]}, + // 标题 + {label : "东莞东华医院 供应室器械仓库领用出库单", dataIndex : '', fontSize : 15, position : ["15","25%","99%",5]}, + {label : "接收科室：", dataIndex : 'depart', fontSize : 11, position : ["57","2%","90%",5]}, + {label : "日期:", dataIndex : 'printDate', fontSize : 11, position : ["57","33%","90%",5]}, + //{label : "仓库:供应室器械仓库", dataIndex : '', fontSize : 11, position : ["42","75%","90%",5]}, + //{label : "制单人:", dataIndex : 'printUser', fontSize : 11, position : ["42","35%","90%",5]}, + + {label : "备注:", dataIndex : 'remark2', fontSize : 11, position : ["57","75%","90%",5]}, + {label : "打印时间:", dataIndex : 'printTime', fontSize : 11, position : ["8.4cm","5%","90%",5]}, + {label : "发货人:", dataIndex : 'sender', fontSize : 11, position : ["8.4cm","35%","90%",5]}, + {label : "下送人:", dataIndex : '', fontSize : 11, position : ["8.4cm","50%","90%",5]}, + {label : "领用人:", dataIndex : '', fontSize : 11, position : ["8.4cm","65%","90%",5]}, + //{label : "复核人:", dataIndex : '', fontSize : 11, position : ["11cm","5%","90%",5]}, + {label : "审核人:", dataIndex : '', fontSize : 11, position : ["8.4cm","80%","90%",5]}, + {barcodes : [ + {codeType : "128Auto", dataIndex : 'departBarcode', position : ["15","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 : ["57","55%","90%",5]}, + totalPageAmount : {label : "&", fontSize : 11, position : ["57","63%","90%",5]}, + goodsTable :{ + rowHeight : 25, + position : ["85","0.2cm","20.4cm","5.6cm"], + headRepeat : true, + fontSize:11, + style:'"border-left:0px;border-right:0px;border-top:#000000 1px solid;border-bottom:#000000 1px solid;"', + columns : [ + {header : "序号", dataIndex : 'serialNumber', width : '5%', align : 'center', fontSize : 11}, + {header : "名称", dataIndex : 'name', width : 145, align : 'center', fontSize : 11}, + {header : "规格", dataIndex : 'specification', width : '9%', align : 'center', fontSize : 11}, + {header : "包装规格", dataIndex : 'packageSpec', width : '9%', align : 'center', fontSize : 11}, + {header : "单位", dataIndex : 'unit', width : '4%', align : 'center', fontSize : 11}, + {header : "数量", dataIndex : 'amount', width : '4%', align : 'right', fontSize : 11}, + {header : "批次", dataIndex : 'batchNumber', width : '10%', align : 'center', fontSize : 11}, + {header : "失效日期", dataIndex : 'expireDate', width : '8%', align : 'center', fontSize : 11}, + {header : "单价", dataIndex : 'price', width : '6%', align : 'center', fontSize : 11}, + {header : "金额", dataIndex : 'totalPrice', width : '9%', align : 'center', fontSize : 11}, + {header : "生产厂家", dataIndex : 'manufacturer', width : '17%', align : 'center', fontSize : 11} + ] + } +} var invoiceComboPrintConfig = { headerFooter : [ // 页眉名称 @@ -1492,6 +1541,12 @@ //发货计划单 invoicePlan : invoicePlanPrintConfig, batchPrintInvoices:batchPrintInvoicesConfig, + // 批量打印发货单(器械包),如果没有配置,则跟batchPrintInvoices一样 + //batchPrintInvoice_Tousse:batchPrintInvoicesConfig, + // 批量打印发货单(一次性物品),如果没有配置,则跟batchPrintInvoices一样 + batchPrintInvoice_disposable:batchPrintInvoicesConfig_disposable, + // 批量打印发货单(消毒物品),如果没有配置,则跟batchPrintInvoices一样 + //batchPrintInvoice_disinfect:batchPrintInvoicesConfig, batchPrintMaterialInvoices:batchPrintMaterialInvoicesConfig, // 发货单（通用发货单） invoiceCombo : invoiceComboPrintConfig,