|
|
@@ -501,7 +501,10 @@ function initDetailTable() {
|
|
|
{name: 'bedNo', index: 'bedNo',align:'center',width:30,hidden:pageClass=='A'?true:false},
|
|
|
{name: 'admissTimes', index: 'admissTimes',align:'center',width:30},
|
|
|
{name: 'name', index: 'name',align:'center',width:30},
|
|
|
- {name: 'drugName', index: 'drugName',align:'left',width:60},
|
|
|
+ {name: 'drugName', index: 'drugName',align:'left',width:60,
|
|
|
+ formatter:function(cellvalue, options, rowObject){
|
|
|
+ return rowObject.drugName+"("+rowObject.manufactory+")"
|
|
|
+ }},
|
|
|
{name: 'specification', index: 'specification',align:'center',width:40},
|
|
|
{name: 'amount', index: 'amount',align:'center',width:30},
|
|
|
{name: 'oldAmount', index: 'oldAmount',align:'center',width:30,hidden:true,
|
|
|
@@ -774,6 +777,8 @@ function printDetailHtml(datas,flag) {
|
|
|
}
|
|
|
if(flag == 1 && datas[0].byjFlag == 1){
|
|
|
title += '(摆药机)'
|
|
|
+ }else if(flag == 0){
|
|
|
+ title += '(重打)'
|
|
|
}
|
|
|
$(".title").text(title);
|
|
|
$(".groupName").text(groupNo==71?'门诊西药房':'住院药房');
|
|
|
@@ -789,7 +794,11 @@ function printDetailHtml(datas,flag) {
|
|
|
html += '<td colspan="2" class="xtd" style="text-align: left;border: transparent !important;">年龄：' + getBirthSlot(data.birthDate,new Date()) + '</td>';
|
|
|
html += '<td colspan="2" class="xtd" style="text-align: left;border: transparent !important;">性别：' + getSex(data.sex) + '</td>';
|
|
|
html += '<td colspan="2" class="xtd" style="text-align: left;border: transparent !important;">身份：' + data.responceName + '</td>';
|
|
|
- html += '<td colspan="7" class="xtd" style="text-align: left;border: transparent !important;">诊断：' + data.admissDiagStr + '</td>';
|
|
|
+ html += '<td colspan="7" class="xtd" style="text-align: left;border: transparent !important;">诊断：' ;
|
|
|
+ if(data.admissDiagStr!=null){
|
|
|
+ html += data.admissDiagStr
|
|
|
+ }
|
|
|
+ html += '</td>';
|
|
|
html += '</tr>';
|
|
|
}
|
|
|
oldInpatientNo = data.inpatientNo;
|
|
|
@@ -802,7 +811,11 @@ function printDetailHtml(datas,flag) {
|
|
|
}
|
|
|
html += '<td class="xtd" style="text-align: center;">' + data.name + '</td>';
|
|
|
html += '<td class="xtd" style="text-align: center;">' + data.bedNo + '</td>';
|
|
|
- html += '<td class="xtd" style="text-align: left;">' + data.drugName + '</td>';
|
|
|
+ html += '<td class="xtd" style="text-align: left;">' + data.drugName;
|
|
|
+ if(pageClass == '5' || pageClass == '6'){
|
|
|
+ html += '('+data.manufactory+')'
|
|
|
+ }
|
|
|
+ + '</td>';
|
|
|
html += '<td class="xtd" style="text-align: center;">' + data.specification + '</td>';
|
|
|
html += '<td class="xtd" style="text-align: center;">' + data.oldAmount + '</td>';
|
|
|
html += '<td class="xtd" style="text-align: center;">' + data.amount + '</td>';
|
|
|
@@ -910,7 +923,7 @@ function printLabel(datas,isMx) {
|
|
|
LODOP.SET_PRINT_STYLEA(0,"ItemType",2);
|
|
|
LODOP.SET_PRINT_STYLEA(0,"ItemType",2);
|
|
|
var strStyle="<style>table,td,th {border-width: 1px;" +
|
|
|
- "border-style: solid;border-collapse: collapse;table-layout:fixed;word-wrap:break-word;font-size: 11px}.xtd{border: 1px solid black;}</style>";
|
|
|
+ "border-style: solid;border-collapse: collapse;table-layout:fixed;word-wrap:break-word;font-size: 13px}.xtd{border: 1px solid black;}</style>";
|
|
|
let html = '';
|
|
|
let flag = true;//新的一张标签
|
|
|
let number = 0;//计数，一张标签只存放五种药品
|
|
|
@@ -983,15 +996,15 @@ function printLabel(datas,isMx) {
|
|
|
function print(div_id) {
|
|
|
setDefaultPrint();
|
|
|
LODOP = getLodop();
|
|
|
- LODOP.PRINT_INITA(6, 0, "241mm", "93mm", "请领单打印");
|
|
|
- LODOP.SET_PRINT_PAGESIZE(1, "241mm", "93mm","");
|
|
|
+ LODOP.PRINT_INITA(6, 0, "221mm", "93mm", "请领单打印");
|
|
|
+ LODOP.SET_PRINT_PAGESIZE(1, "221mm", "93mm","");
|
|
|
//设置默认打印机
|
|
|
LODOP.SET_PRINTER_INDEX(defaultPrintIndex);
|
|
|
LODOP.SET_PRINT_STYLE("FontSize", 11); //字体大小
|
|
|
LODOP.SET_PRINT_STYLEA(0,"ItemType",2);
|
|
|
- var strStyle="<style>table,td,th {border-width: 1px;" +
|
|
|
- "border-style: solid;border-collapse: collapse;table-layout:fixed;word-wrap:break-word;font-size: 11}.xtd{border: 1px solid black;}</style>";
|
|
|
- LODOP.ADD_PRINT_HTM("0mm", "4mm", "RightMargin:4mm", "BottomMargin:0mm",strStyle+ document.getElementById(div_id).innerHTML);
|
|
|
+ var strStyle="<style>table,td,th {border-width: 1px;padding-bottom:0px;" +
|
|
|
+ "border-style: solid;border-collapse: collapse;table-layout:fixed;word-wrap:break-word;font-size: 13}.xtd{border: 1px solid black;}</style>";
|
|
|
+ LODOP.ADD_PRINT_HTM("0mm", "0mm", "RightMargin:0mm", "BottomMargin:0mm",strStyle+ document.getElementById(div_id).innerHTML);
|
|
|
LODOP.PRINT();
|
|
|
//LODOP.PREVIEW();
|
|
|
//LODOP.PRINT_DESIGN();
|
WANGJIALIANG