Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js =================================================================== diff -u -r23447 -r23463 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 23447) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 23463) @@ -300,6 +300,8 @@ var doctor = top.Ext4.getCmp('doctor').getValue(); var surgery = top.Ext4.getCmp('surgery').getValue(); var operationTime = new Date(top.Ext4.getCmp('operationTime').getValue()).Format("yyyy-MM-dd hh:mm"); + var supplierContactName = top.Ext4.getCmp('supplierContactName').getValue(); + var supplierPhoneNumber = top.Ext4.getCmp('supplierPhoneNumber').getValue(); var supplierName = getSupplierName(); var goodsDetail = getPrintGoodsInfo(); @@ -336,14 +338,15 @@ summary.operationTime = operationTime; summary.doctor = doctor; summary.supplierName = supplierName; + summary.supplierContactName = supplierContactName; + summary.supplierPhoneNumber = supplierPhoneNumber; summary.goodsDetail = goodsDetail; summary.tousses = tousses; doPrintForeignTousseApplication(printType, summary); var isSupplyRoomUser = validateIsSupplyRoomUser(); if (isSupplyRoomUser && printType == 0){ - RecyclingApplicationTableManager.updatePrintStatus(applicationId,function(result){ //更新完打印状态之后,及时刷新页面 grid.dwrReload(); Index: ssts-web/src/main/webapp/disinfectsystem/config/dgskhyy/print/printConfig.js =================================================================== diff -u -r23017 -r23463 --- ssts-web/src/main/webapp/disinfectsystem/config/dgskhyy/print/printConfig.js (.../printConfig.js) (revision 23017) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgskhyy/print/printConfig.js (.../printConfig.js) (revision 23463) @@ -1063,42 +1063,36 @@ // 标题 {label : "东莞康华医院外来器械接收单", dataIndex : 'header', fontSize : 17, position : ["30","8%","99%",22]}, - {label : "姓名：", dataIndex : 'patient', fontSize : 11, position : ["90","4%","90%",5]}, - {label : "性别：", dataIndex : 'patientSex', fontSize : 11, position : ["90","80mm","90%",5]}, - {label : "年龄：", dataIndex : 'patientAge', fontSize : 11, position : ["90","130mm","90%",5]}, + {label : "住院号：", dataIndex : 'hospitalNumber', fontSize : 11, position : ["70","4%","90%",5]}, + {label : "姓名：", dataIndex : 'patient', fontSize : 11, position : ["70","24%","90%",5]}, + {label : "性别：", dataIndex : 'patientSex', fontSize : 11, position : ["70","44%","90%",5]}, + {label : "年龄：", dataIndex : 'patientAge', fontSize : 11, position : ["70","64%","90%",5]}, + {label : "床号：", dataIndex : 'bedNumber', fontSize : 11, position : ["70","79%","90%",5]}, - {label : "床号：", dataIndex : 'bedNumber', fontSize : 11, position : ["120","4%","90%",5]}, - {label : "住院号：", dataIndex : 'hospitalNumber', fontSize : 11, position : ["120","80mm","90%",5]}, - - {label : "单号：", dataIndex : 'serialNum', fontSize : 11, position : ["150","4%","90%",10]}, - {label : "申请科室：", dataIndex : 'depart', fontSize : 11, position : ["150","80mm","90%",5]}, - {label : "结算科室：", dataIndex : 'settleAccountsDepart', fontSize : 11, position : ["150","130mm","90%",10]}, + {label : "医生：", dataIndex : 'doctor', fontSize : 11, position : ["90","4%","90%",10]}, + {label : "供应商：", dataIndex : 'supplierName', fontSize : 11, position : ["90","24%","90%",5]}, + {label : "送货人：", dataIndex : 'supplierContactName', fontSize : 11, position : ["90","64%","90%",5]}, + {label : "联系方式：", dataIndex : 'supplierPhoneNumber', fontSize : 11, position : ["90","79%","90%",5]}, - {label : "申请人：", dataIndex : 'applicant', fontSize : 11, position : ["180","4%","90%",10]}, - {label : "打印时间:", dataIndex : 'printTime', fontSize : 11, position : ["180","80mm","90%",10]}, + {label : "单号：", dataIndex : 'serialNum', fontSize : 11, position : ["110","4%","90%",10]}, + {label : "申请科室：", dataIndex : 'depart', fontSize : 11, position : ["110","24%","90%",5]}, + {label : "申请人：", dataIndex : 'applicant', fontSize : 11, position : ["110","44%","90%",10]}, + {label : "打印时间:", dataIndex : 'printTime', fontSize : 11, position : ["110","64%","90%",10]}, - {label : "备注:", dataIndex : 'remark', fontSize : 11, position : ["210","4%","90%",5]}, + {label : "备注:", dataIndex : 'remark', fontSize : 11, position : ["130","4%","90%",5]}, + {label : "手术名称：", dataIndex : 'surgery', fontSize : 11, position : ["150","4%","90%",10]}, - {label : "手术名称：", dataIndex : 'surgery', fontSize : 11, position : ["280","4%","90%",10]}, - {label : "手术医生：", dataIndex : 'doctor', fontSize : 11, position : ["320","4%","90%",10]}, - {label : "手术时间：", dataIndex : 'operationTime', fontSize : 11, position : ["360","4%","90%",10]}, + {label : "手术器械清单：", dataIndex : '', fontSize : 11, position : ["170","4%","90%",10]}, - {label : "手术器械清单：", dataIndex : '', fontSize : 11, position : ["400","4%","90%",10]}, + {label : "发货日期及时间：", dataIndex : '', fontSize : 11, position : ["88mm","4%","90%",5]}, + {label : "发货人：", dataIndex : '', fontSize : 11, position : ["88mm","40%","90%",5]}, + {label : "接收人：", dataIndex : '', fontSize : 11, position : ["88mm","76%","90%",5]} - - {label : "清洗注意事项：", dataIndex : '', fontSize : 11, position : ["680","4%","90%",5]}, - {label : "灭菌方式：", dataIndex : '', fontSize : 11, position : ["720","4%","90%",5]}, - {label : "公司名称：", dataIndex : 'supplierName', fontSize : 11, position : ["760","4%","90%",5]}, - {label : "联系方式：", dataIndex : '', fontSize : 11, position : ["800","4%","90%",5]}, - {label : "送包日期及时间：", dataIndex : '', fontSize : 11, position : ["840","4%","90%",5]}, - {label : "送包者签名：", dataIndex : '', fontSize : 11, position : ["880","4%","90%",5]}, - {label : "回收者签名：", dataIndex : '', fontSize : 11, position : ["920","4%","90%",5]} - ], goodsTable :{ rowHeight : 25, - position : ["430","8%","170mm","1000"], + position : ["190","8%","183mm","1000"], content : [ {header : "序号", dataIndex : 'serialNumber', width : 60, align : 'center', fontSize : 11}, {header : "名称", dataIndex : 'goodsName', width : 300, align : 'left', fontSize : 11},