Index: ssts-web/src/main/webapp/disinfectsystem/config/hdqrmyy/print/printConfig.js =================================================================== diff -u -r18319 -r29436 --- ssts-web/src/main/webapp/disinfectsystem/config/hdqrmyy/print/printConfig.js (.../printConfig.js) (revision 18319) +++ ssts-web/src/main/webapp/disinfectsystem/config/hdqrmyy/print/printConfig.js (.../printConfig.js) (revision 29436) @@ -745,13 +745,13 @@ printDiposableGoods:true, headerContent : [ // 器械包名称,水平居中 - {label : "", dataIndex : 'name', position : ["1mm","0mm","RightMargin:0mm","BottomMargin:0mm"], type: 'html', beforeStr: "
", afterStr: "
"}, - {label : "装配员:", dataIndex : 'operator', fontSize : 10, bold: 1, position : ["6mm","5mm","50mm","10px"]}, - {label : "审核员:", dataIndex : 'reviewer', fontSize : 10, bold: 1, position : ["6mm","55mm","50mm","10px"]}, - {label : "灭菌日期:", dataIndex : 'sterilizationDate', fontSize : 10, bold: 1, position : ["10mm","5mm","50mm","10px"]}, - {label : "失效日期:", dataIndex : 'validDate', fontSize : 10, bold: 1, position : ["10mm","55mm","50mm","10px"]}, + {label : "", dataIndex : 'name', position : ["3mm","0mm","RightMargin:0mm","BottomMargin:0mm"], type: 'html', beforeStr: "
", afterStr: "
"}, + {label : "装配员:", dataIndex : 'operator', fontSize : 10, bold: 1, position : ["8mm","5mm","50mm","10px"]}, + {label : "审核员:", dataIndex : 'reviewer', fontSize : 10, bold: 1, position : ["8mm","55mm","50mm","10px"]}, + {label : "灭菌日期:", dataIndex : 'sterilizationDate', fontSize : 10, bold: 1, position : ["12mm","5mm","50mm","10px"]}, + {label : "失效日期:", dataIndex : 'validDate', fontSize : 10, bold: 1, position : ["12mm","55mm","50mm","10px"]}, - {label : "", dataIndex : 'materials', position : ["14mm","0mm","RightMargin:0mm","BottomMargin:20mm"], type: 'html', beforeStr: "
", afterStr: "
"}, + {label : "", dataIndex : 'materials', position : ["16mm","0mm","RightMargin:0mm","BottomMargin:20mm"], type: 'html', beforeStr: "
", afterStr: "
"}, {label : "灭菌程序:", dataIndex : 'sterilingType', position : ["78mm","0mm","RightMargin:50mm","BottomMargin:0mm"], type: 'html', beforeStr: "
", afterStr: "
"}, @@ -760,12 +760,7 @@ ], barcodes : [ - {codeType : "128Auto", dataIndex : 'barcode', position : ["77mm","55mm","40mm","8mm"], - styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: true}, - {itemNameID: 0, styleName: 'FontSize', styleValue: 6}, - {itemNameID: 0, styleName: 'NotOnlyHighPrecision', styleValue: true} - ] - }, + {codeType : "128Auto", dataIndex : 'barcode', position : ["91mm","5mm","40mm","8mm"], styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: true}, {itemNameID: 0, styleName: 'FontSize', styleValue: 6}, @@ -958,7 +953,7 @@ var fontSize = getFontSizeByStr(obj.name,[ {maxLen:10,fontSize:10}, - {maxLen:20,fontSize:6}, + {maxLen:20,fontSize:8}, {maxLen:1000,fontSize:4} ]); LODOP.ADD_PRINT_TEXT("1mm","0mm","RightMargin:0mm","5mm", obj.name); Index: ssts-web/src/main/webapp/disinfectsystem/config/hdqrmyy/config.js =================================================================== diff -u -r27538 -r29436 --- ssts-web/src/main/webapp/disinfectsystem/config/hdqrmyy/config.js (.../config.js) (revision 27538) +++ ssts-web/src/main/webapp/disinfectsystem/config/hdqrmyy/config.js (.../config.js) (revision 29436) @@ -76,14 +76,18 @@ foreignProxyDisinfectionView_showPrintTousseBtn:true, // 打印器械包标签时,是否打印一次性物品材料 tousseLabelPrintDisposableGoods:true, - //回收时,申请数量与回收数量不一致,是否要确认 - confirmRecyclingAmount:false, - //只有装配完成才能使用清洗篮筐回收 - recycleClassifyBasketAfterPacked:false, - //使用记录页面隐藏列名配置,如数组值为:['状态','身份证号码'],代表要隐藏状态和身份证号码这2列 + showInvoiceAssistantSender:false, + //是否显示核对人 + showInvoicePersonInCharge:false, + //是否显示发货计划下送责任人。 + recycleClassifyBasketAfterPacked:false, + //清洗篮筐内的物品是否必须装配完成后,篮筐才能在回收时进行入筐。 + confirmRecyclingAmount:false, + hiddSyncHisMaterialDefinitionMenu:false, + //使用记录页面隐藏列名配置,如数组值为:['状态','身份证号码'],代表要隐藏状态和身份证号码这2列 hiddenColumnsOfUseRecordListView:['状态'], //临床科室用户点击科室申领图标的链接地址,值为1或者没有配置:指向待处理申请单视图,值为2:指向全部申请单视图列表 departApplicationIconURLOfClinicUser:2, - //禁用基数限制 - disableCardinalNumLimit:true + //第一次登陆需要强制修改密码 + needForceModifyPwdWhenFirstTime:true } \ No newline at end of file