Index: ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js =================================================================== diff -u -r24808 -r25185 --- ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js (.../printConfig.js) (revision 24808) +++ ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js (.../printConfig.js) (revision 25185) @@ -1361,31 +1361,31 @@ var operationTime = printSummaryObj.operationTime?new Date(printSummaryObj.operationTime.time).Format('yyyy-MM-dd hh:mm'):""; var firstPrintTime = printSummaryObj.firstPrintTime?new Date(printSummaryObj.firstPrintTime.time).Format('yyyy-MM-dd hh:mm'):""; var tableHtml =""; - tableHtml += "
高值（单价千元以上）耗材、植入性耗材采购申请流程
" + tableHtml += "
高值（单价千元以上）耗材、植入性耗材采购申请流程
" tableHtml +=""; tableHtml += ""; - tableHtml += ""; + tableHtml += ""; tableHtml += ""; tableHtml += ""; tableHtml += ""; - tableHtml += ""; + tableHtml += ""; tableHtml += ""; tableHtml += ""; //打印病人信息 - tableHtml += "" + tableHtml += "" tableHtml += ""; tableHtml += "" tableHtml += "" - tableHtml += "" + tableHtml += "" tableHtml += ""; tableHtml += ""; - tableHtml += "" + tableHtml += "" tableHtml += "" tableHtml += ""; //审批流程表头 - tableHtml += "" + tableHtml += "" tableHtml += ""; - tableHtml += "" + tableHtml += "" tableHtml += ""; var isProvinceProductStr = ""; var isHospitalProductStr = ""; @@ -1394,7 +1394,7 @@ var task = printSummaryObj.workFlowApprovalTasks[i]; tableHtml += ""; tableHtml += ""; - tableHtml += ""; + tableHtml += ""; tableHtml += ""; tableHtml += ""; tableHtml += ""; @@ -1405,11 +1405,11 @@ isHospitalProductStr = getDefaultString(task.isHospitalProductStr,' '); isPlatformAuthorizedEnterpriseStr = getDefaultString(task.isPlatformAuthorizedEnterpriseStr,' '); } - tableHtml += ""; //验收表 - tableHtml += "" + tableHtml += "" //供应商 for(var i = 0; i < suppliers.length;++i){ if(i > 0){ @@ -1419,7 +1419,7 @@ var printHtml = tableHtml; var goods = supplierGoods[supplier]; //printHtml += ""; - printHtml += ""; + printHtml += ""; for(var j = 0; j < goods.length; ++j){ var gds = goods[j]; @@ -1429,8 +1429,8 @@ printHtml += ""; printHtml += ""; printHtml += ""; - printHtml += ""; - printHtml += ""; + printHtml += ""; + printHtml += ""; printHtml += ""; } //simon-add:对应JR--GZSZYYGZHC-17需求 @@ -1442,21 +1442,21 @@ printHtml += ""; printHtml += ""; printHtml += ""; + printHtml += ""; printHtml += ""; - printHtml += ""; printHtml += ""; } } printHtml += ""; printHtml += ""; printHtml += ""; - printHtml += ""; + printHtml += ""; printHtml += ""; printHtml += ""; printHtml += ""; printHtml += ""; - printHtml += ""; + printHtml += ""; printHtml += ""; printHtml += "
申请科室："+printSummaryObj.depart + "申请科室："+printSummaryObj.depart + "申请人："+printSummaryObj.applicant + "
申请时间："+applicationTime + "申请时间："+applicationTime + "打印时间："+firstPrintTime + "
病人信息
病人信息
病人姓名："+printSummaryObj.patient+"住院号："+printSummaryObj.hospitalNumber+"医生："+printSummaryObj.doctor+"医生："+printSummaryObj.doctor+"
手术时间："+operationTime+"手术时间："+operationTime+"手术名称："+printSummaryObj.surgery+"
审批流程
审批流程
序号审批环节处理人处理结果处理时间处理意见序号审批环节处理人处理结果处理时间处理意见
" + (i + 1) + "" + getDefaultString(task.taskName,' ') + "" + getDefaultString(task.taskName,' ') + "" + getDefaultString(task.handler,' ') + "" + approvalResult(task.approvalResult)+ "" + (task.handleTime?new Date(task.handleTime.time).Format('yyyy-MM-dd hh:mm'):" ") + "
省平台产品："+isProvinceProductStr + tableHtml += "
省平台产品："+isProvinceProductStr +"院内目录产品："+isHospitalProductStr +"平台授权配送企业："+isPlatformAuthorizedEnterpriseStr+"
验收表
验收表
供应商"+getDefaultString(supplier,' ')+"
物品名称生产厂家规格型号数量生产批号注册证号失效日期
物品名称生产厂家规格型号数量生产批号注册证号失效日期
" + getDefaultString(gds.expensiveGoodsModelName,' ') + "" + getDefaultString(gds.amount,' ') + "" + getDefaultString(gds.batchNumber,' ') + "" + getDefaultString(gds.registration,' ') + "" + (gds.invalidDate?new Date(gds.invalidDate.time).Format('yyyy-MM-dd hh:mm'):" ") + "" + getDefaultString(gds.registration,' ') + "" + (gds.invalidDate?new Date(gds.invalidDate.time).Format('yyyy-MM-dd hh:mm'):" ") + "
验收结论：科室验收日期：设备科验收日期：设备科验收日期：
送货人：科室验收人：设备验收人：设备验收人：
";