Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js =================================================================== diff -u -r13927 -r14354 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 13927) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 14354) @@ -745,6 +745,20 @@ }] },{ layout : 'form', + labelWidth : 70, + columnWidth : .5, + items : [{ + xtype : 'textfield', + fieldLabel : '住院号', + maxLength : '41', + id : 'hospitalNumber', + name : 'hospitalNumber', + readOnly : true, + anchor : '99%', + cls : 'x-item-disabled' + }] + },{ + layout : 'form', columnWidth : 1, labelWidth : 70, items : [{ @@ -991,8 +1005,9 @@ var serialNumber = top.Ext.getCmp("serialNumber").getValue(); var sender = top.Ext.getCmp("sender").getValue(); var remark = top.Ext.getCmp("remark2").getValue(); + var hospitalNumber = top.Ext.getCmp("hospitalNumber").getValue(); var applicationTime2 = top.Ext.getCmp("applicationTime2").getValue(); - batchPrintInvoices(id, depart, printType,sendTime,sender,serialNumber,remark,applicationTime2); + batchPrintInvoices(id, depart, printType,sendTime,sender,serialNumber,remark,applicationTime2,hospitalNumber); } // 统计总价 @@ -1305,7 +1320,7 @@ } -function batchPrintInvoices(ids, depart, printType,sendTime,sender,serialNumber,remark,applicationTime){ +function batchPrintInvoices(ids, depart, printType,sendTime,sender,serialNumber,remark,applicationTime,hospitalNumber){ if(ids == null) return; var departBarcode = getDepartBarcodeByDepart(depart); @@ -1330,6 +1345,7 @@ result.serialNumber2 = serialNumber; result.remark2 = remark; result.applicationTime = applicationTime; + result.hospitalNumber = hospitalNumber; var dt = new Date(); var printDate = dt.getFullYear() + "-" + (dt.getMonth() + 1) + "-"+dt.getDate(); result.printDate = printDate; @@ -1710,6 +1726,7 @@ {header : "类型",width : 110,dataIndex : 'invoicePlan.type',sortable:false}, {header : "已打印",width : 70,dataIndex : 'isPrint',renderer : renderPrintColor}, {id : 'remark',header : "备注",width : 110,dataIndex : 'remark'}, + {header : "住院号",width : 70,dataIndex : 'hospitalNumber'}, {header : "签收人",width : 70,dataIndex : 'receiptor'}, {header : "签收时间",width : 120,dataIndex : 'receiptingTime',renderer : myDateFormatByMinute}, {header : "结算科室",width : 100,dataIndex : 'settleAccountsDepart'}, @@ -1732,6 +1749,7 @@ {name : 'status'}, {name : 'totalPrice'}, {name : 'remark'}, + {name : 'hospitalNumber'}, {name : 'invoicePlan.type'}, {name : 'receiptor'}, {name : 'receiptingTime'}, @@ -1751,6 +1769,7 @@ {type : 'date',dataIndex : 'applicationTime'}, {type : 'string',dataIndex : 'invoicePlan.type'}, {type : 'numeric',dataIndex : 'totalPrice'}, + {type : 'string',dataIndex : 'hospitalNumber'}, {type : 'string',dataIndex : 'remark'} ] });