Index: ssts-web/src/main/webapp/disinfectsystem/config/sznsrmyy/print/printConfig.js
===================================================================
diff -u -r22683 -r23815
--- ssts-web/src/main/webapp/disinfectsystem/config/sznsrmyy/print/printConfig.js (.../printConfig.js) (revision 22683)
+++ ssts-web/src/main/webapp/disinfectsystem/config/sznsrmyy/print/printConfig.js (.../printConfig.js) (revision 23815)
@@ -198,7 +198,7 @@
rowsPerPage : 10,
headerContent : [
// 标题
- {label : "深圳南山人民医院器械仓库领用出库单", dataIndex : 'header', fontSize : 17, position : ["15","1%","99%",5],type: 'html', beforeStr: ""},
+ {label : "深圳南山人民医院回收交接单", dataIndex : 'header', fontSize : 17, position : ["15","1%","99%",5],type: 'html', beforeStr: ""},
{label : "接收科室：", dataIndex : 'depart', fontSize : 10, position : ["55","5%","90%",5]},
{label : "单号：", dataIndex : 'serialNum', fontSize : 10, position : ["55","25%","90%",5]},
{label : "日期:", dataIndex : 'printTime', fontSize : 10, position : ["55","41%","90%",5]},
@@ -223,7 +223,7 @@
{label : "科室接收人: ", dataIndex : ''},
{label : "下送人: ", dataIndex : ''},
{label : "回收人:", dataIndex : 'recyclingUser'},
- {label : " 发货人:", dataIndex : 'printUser'}
+ {label : " 申请人:", dataIndex : 'printUser'}
//{label : "提交时间:", dataIndex : 'applicationTime'}
]
},
@@ -252,11 +252,11 @@
rowsPerPage : 10,
headerContent : [
// 标题
- {label : "深圳市南山人民医院一次性物品领用出库单", dataIndex : 'header', fontSize : 17, position : ["15","1%","99%",5],type: 'html', beforeStr: ""},
+ {label : "深圳市南山人民医院一次性物品领用出库单", dataIndex : 'header', fontSize : 15, position : ["15","1%","99%",5],type: 'html', beforeStr: ""},
{label : "接收科室：", dataIndex : 'depart', fontSize : 10, position : ["55","5%","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 : 'serialNum', fontSize : 10, position : ["55","35%","90%",5]},
+ {label : "日期:", dataIndex : 'printTime', fontSize : 10, position : ["55","55%","90%",5]},
+ {label : "备注:", dataIndex : 'remark', fontSize : 10, position : ["55","80%","90%",5]}
],
goodsTable :{
rowHeight : 9.4,
@@ -282,7 +282,7 @@
]
},
barcodes : [
- {codeType : "128Auto", dataIndex : 'departBarcode', position : ["5","74%","40mm","8mm"],
+ {codeType : "128Auto", dataIndex : 'departBarcode', position : ["4","85%","40mm","8mm"],
styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: true},
{itemNameID: 0, styleName: 'FontSize', styleValue: 6},
{itemNameID: 0, styleName: 'NotOnlyHighPrecision', styleValue: true}
@@ -1658,3 +1658,14 @@
//借还记录
borrowRecord:borrowRecordConfig
};
+","90%",5]},
+ goodsTable :{
+ rowHeight : 25,
+ position : ["100","1%","97%","7cm"],
+ headRepeat : true,
+ columns : [
+ {header : "名称", dataIndex : 'name', width : 220, align : 'left', fontSize : 11},
+ {header : "数量", dataIndex : 'count', width : 40, align : 'right', fontSize : 11},
+ {header : "单位", dataIndex : 'unit', width : 40, align : 'center', fontSize : 11},
+ {header : "规格", dataIndex : 'specification', width : 110, align : 'center', fontSize : 11},
+ {header : "批次/灭菌日期", dataIndex : 'batchNumber', width : 105, align : 'center
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/sznsrmyy/config.js
===================================================================
diff -u -r22724 -r23815
--- ssts-web/src/main/webapp/disinfectsystem/config/sznsrmyy/config.js (.../config.js) (revision 22724)
+++ ssts-web/src/main/webapp/disinfectsystem/config/sznsrmyy/config.js (.../config.js) (revision 23815)
@@ -6,7 +6,7 @@
// 审核器械包必须入篮筐（二级供应室）
mustScanBasketForTousseReviewOf2ndSupplyRoom : false,
// 申请表单的类型：1 ： 通用申请单（组合申请单），2：分开的申请单
- applicationFormType : 2,
+ applicationFormType : 1,
hidePackageSpec : true,
// 申请界面是否显示器械包或消毒物品的的单位
showTousseUnitColumn : false,
@@ -15,6 +15,8 @@
// 申请器械包时是否自动归还待归还物品
autoReturnTousse : false,
// 是否隐藏进入审核列表按钮
+ hideToussePriceColumn:true,
+ hideDisposablePriceColumn:true,
hideEnterReviewListButton : false,
// 是否自动补全用户名
autoFillUserName:false,
@@ -47,6 +49,7 @@
//批量打印发货单,打印消毒物品和器械包是否分开为两个按钮,如果为true,表示分开为两个按钮,如果为false或者没有配置,都是合并为一个按钮
splitTousseAndDisinfectInvoiceBtn:true,
//公司名称 "dingxiang"显示主页显示丁香的logo,不配置或者配为"forgon",显示孚峻的logo
+ printApplyInfo:true,
companyName : "dingxiang",
// 自定义装配后是否保留装配数量,不再使用 2017-3-14
directPackingRetainPackAmount : true,
@@ -57,15 +60,17 @@
// 自定义装配界面,灭菌日期的处理方式,,0或者未定义:清空,1:表示保留当前值,2表示设置回默认值。其他值跟1一样，保留当前值
disinfectionDateProcessTypeInDirectPackingView:1,
//发货计划列表默认选中的物品类型
- invoicePlanView_tousseType_selectedItems: ['一次性物品','普通器械包','敷料包','消毒物品','自定义器械包','外部代理灭菌包'],
+ invoicePlanView_tousseType_selectedItems: ['一次性物品','普通器械包','敷料包','消毒物品','自定义器械包','外部代理灭菌包','外来器械包'],
//对申请单的物品申请数量启用干预功能
enableInterfereApplyAmount:true,
//打印发货计划设置页的版本2
printRecyclingConfigFormVersion:2,
//允许回收数量减小的部分超过待装配数
allowDecreaseRecyclingAmountGreatUnPackingAmount:true,
- //回收时，申请数量与回收数量不一致，是否要确认
- confirmRecyclingAmount:false,
//只有装配完成才能使用清洗篮筐回收
+ enableStatisticWorkLoad:true,
+ //外来器械拆分小包名称带总拆包数量
+ nameIncludeSplitTotalAmountForSplitForeignTousse:true,
+ //清洗筐是否装配完成才能回收，false:未装配完成也可以回收
recycleClassifyBasketAfterPacked:false
}
\ No newline at end of file