Index: ssts-web/src/main/webapp/disinfectsystem/config/bjdxzlyy/print/printConfig.js
===================================================================
diff -u -r27163 -r27370
--- ssts-web/src/main/webapp/disinfectsystem/config/bjdxzlyy/print/printConfig.js (.../printConfig.js) (revision 27163)
+++ ssts-web/src/main/webapp/disinfectsystem/config/bjdxzlyy/print/printConfig.js (.../printConfig.js) (revision 27370)
@@ -1077,6 +1077,54 @@
}
]
}
+
+var recyclingInvoiceTotalConfig_bjdxzlyy = {
+ customPrint:printRecyclingInvoiceTotalConfig_bjdxzlyy
+}
+
+function printRecyclingInvoiceTotalConfig_bjdxzlyy(time,obj){
+ if(obj.data.length > 0){
+ var headHtml = "
科室申领物品汇总单
";
+ var tableHtml ="";
+ tableHtml += "";
+ tableHtml += "名称 | ";
+ tableHtml += "数量 | ";
+ tableHtml += "名称 | ";
+ tableHtml += "数量 | ";
+ tableHtml += "
";
+ for(var i=0;i < obj.data.length;){
+ var num = obj.data[i+1];
+ var tosseName;
+ var amount;
+ if(num == "" || num == undefined || num == null){
+ tosseName = "";
+ amount = "";
+ }else{
+ tosseName = num.tosseName;
+ amount = num.amount;
+ }
+
+ tableHtml += "";
+ tableHtml += ""+obj.data[i].tosseName+" | ";
+ tableHtml += ""+obj.data[i].amount+" | ";
+ tableHtml += ""+tosseName+" | ";
+ tableHtml += ""+amount+" | ";
+ tableHtml += "
";
+ i = i+2;
+ }
+ tableHtml += "
";
+ var printTimeHtml = "打印日期: "+time+"
";
+ //打印设置
+ var LODOP = getLodop(document.getElementById('LODOP'),document.getElementById('LODOP_EM'));
+ //打印日期
+ LODOP.ADD_PRINT_HTM(80,"5%","90%","100%",printTimeHtml);
+ //项目内容
+ LODOP.ADD_PRINT_TABLE(106,"5%","90%","100%",tableHtml);
+ //标题
+ LODOP.ADD_PRINT_HTM(20,20,"95%",30,headHtml);
+ LODOP.PRINT();
+ }
+}
/**
* 器械包管理界面的包定义材料清单
*/
@@ -1174,5 +1222,8 @@
//调拨出库单
appropriationOutList : appropriationOutListConfig,
//打印器械包明细单
- tousseDefinitionMaterials:tousseDefinitionMaterialsConfig_qifuyy
+ tousseDefinitionMaterials:tousseDefinitionMaterialsConfig_qifuyy,
+ //待回收申请单,是否打印回收汇总单
+ recyclingInvoiceTotal:recyclingInvoiceTotalConfig_bjdxzlyy
+
};
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/bjdxzlyy/config.js
===================================================================
diff -u -r27362 -r27370
--- ssts-web/src/main/webapp/disinfectsystem/config/bjdxzlyy/config.js (.../config.js) (revision 27362)
+++ ssts-web/src/main/webapp/disinfectsystem/config/bjdxzlyy/config.js (.../config.js) (revision 27370)
@@ -94,5 +94,7 @@
//通用申请单的默认回收数量是否为0,值为true:默认值为0;值为false或者没有设置:默认值与申请数量相同
defaultRecycleAmountOfComboFormIsZero:true,
// 器械包申请单的默认回收数量是否为0, 值为true:默认值为0;值为false或者没有设置:默认值与申请数量相同
- defaultRecycleAmountOfTousseFormIsZero:true
+ defaultRecycleAmountOfTousseFormIsZero:true,
+ //待回收申请单,是否打印回收汇总单
+ printWaitRecyclingInvoicePlanSummary:true
}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
===================================================================
diff -u -r27290 -r27370
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 27290)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 27370)
@@ -2386,6 +2386,52 @@
}
+function printRecyclingInvoiceTotal(){
+ var records = grid.getSelectionModel().getSelections();
+ var invoicePlanIds = null;
+ for (var i = 0; i < records.length; i++) {
+ if (invoicePlanIds == null) {
+ invoicePlanIds = records[i].data['id'];
+ } else {
+ invoicePlanIds = invoicePlanIds + ',' + records[i].data['id'];
+ }
+ }
+
+ var recyclingInvoiceTotalPrint = "recyclingInvoiceTotal";
+ var myObj = printConfig[recyclingInvoiceTotalPrint];
+ if(isUndefinedOrNullOrEmpty(myObj)){
+ var msg = '未找到('+recyclingInvoiceTotalPrint+')的打印配置';
+ alert(msg);
+ return;
+ }
+ // 自定义打印
+ if (!isUndefinedOrNullOrEmpty(myObj.customPrint)) {
+ Ext.Ajax.request({
+ url : WWWROOT + '/disinfectSystem/recyclingRecordAction!printInvoicePlanSummary.do',
+ params : {recyclingRecordIds : invoicePlanIds},
+ success : function(response, options) {
+ var obj = Ext.decode(response.responseText);
+ if(obj.success){
+ myObj.customPrint(Ext4.Date.format(new Date(),'Y-m-d H:i:s'),obj);
+ }else{
+ showResult(obj.message);
+ }
+ },
+ failure : function(response, options) {
+ var result = Ext.decode(response.responseText);
+ if(result && result.message){
+ showResult(result.message);
+ }else{
+ showResult('打印失败');
+ }
+ }
+ })
+
+ }
+}
+
+
+
function printAllGoodsWithToSendGoods(isPrintToSendGood,isAllGoodsOrToSendGoods){
var records = grid.getSelectionModel().getSelections();
var invoicePlanIds = null;
@@ -2627,7 +2673,12 @@
}
},500);
}
- }
+ }else{//北京大学肿瘤医院BJDXZLYY-4 科室申领中打印回收汇总单增加打印格式(此部分打印没有任何限制条件,直接打印勾选的)
+ var ids = getSelectedIds();
+ if (ids != null && ids != false) {
+ printRecyclingInvoiceTotal();
+ }
+ }
}
});
}