Index: ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.js
===================================================================
diff -u -r21549 -r23339
--- ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.js (.../historyPackingView.js) (revision 21549)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.js (.../historyPackingView.js) (revision 23339)
@@ -168,6 +168,40 @@
var s = JSON.stringify(params);
location.href = WWWROOT + "/disinfectsystem/packing/exportPackingRecord.jsp?params="+encodeURI(s);
}
+ },{
+ xtype:'button',
+ text : '打印',
+ hidden: !sstsConfig.packingView_currentTaskGroup_showPrintBtn,
+ id:"printPackingRecords",
+ handler: function(){
+ var params = getParamsJsonObj();
+ var s = JSON.stringify(params);
+ var url = WWWROOT + '/disinfectSystem/packingAction!loadPackingRecordForPrint.do';
+// var myMask = new Ext.LoadMask({msg:,target:});
+ var myMask = new Ext.LoadMask(Ext.getBody(), {
+ msg : "正在打印,请稍候..."
+ });
+ myMask.show();
+ Ext.Ajax.request({
+ url : url,
+ params : params,
+ success : function(result){
+
+ var jsonObj = JSON.parse(result.responseText);
+ var rows = jsonObj.rows;
+ if(!jsonObj.rows || jsonObj.rows.length == 0){
+ showResult('没有要打印的记录' , null , sstsConfig.messagePauseTimeOnPackingPage);
+ myMask.hide();
+ return;
+ }
+ jsonObj.goods = jsonObj.rows;
+ jsonObj.printType = 0;
+ defaultprintPackingRecords(jsonObj);
+ myMask.hide();
+ },
+ failure : function(){myMask.hide();}
+ });
+ }
}],
frame : false,
border : false
@@ -179,10 +213,16 @@
var forPanelWidth = document.body.offsetWidth;
- var dt = new Date();
- var startDayofMonth = dt.getFullYear() + "/" + (dt.getMonth() + 1) + "/01";
+ var dt_start = new Date();
+ dt_start.setDate(1);
+ dt_start.setHours(0);
+ dt_start.setMinutes(0);
+ dt_start.setSeconds(0);
+ dt_start.setMilliseconds(0);
+ var startDayofMonth = dt_start.getFullYear() + "/" + (dt_start.getMonth() + 1) + "/01";
var form = new Ext.form.FormPanel({
+ id:'form_historyPacking',
title : '历史装配记录',
region : 'north',
labelAlign : 'right',
@@ -203,30 +243,30 @@
layout : 'form',
labelWidth : 80,
items : [{
- xtype : 'datefield',
+ xtype : 'datefieldWithMin',
id : 'startDateSearch',
name : 'startDateSearch',
fieldLabel : '开始时间',
altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
readOnly : false,
width : 130,
- format : 'Y-m-d',
- value : new Date(startDayofMonth)
+ format : 'Y-m-d H:i',
+ value : dt_start
}]
}, {
width : 220,
layout : 'form',
labelWidth : 80,
items : [{
- xtype : 'datefield',
+ xtype : 'datefieldWithMin',
id : 'endDateSearch',
name : 'endDateSearch',
fieldLabel : '结束时间',
altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
readOnly : false,
width : 130,
value : new Date(),
- format : 'Y-m-d'
+ format : 'Y-m-d H:i'
}]
}, {
width : 250,
@@ -445,6 +485,39 @@
}]
});
+ function getParamsJsonObj(){
+ var startDate = $Id('startDateSearch').value;
+ var endDate = $Id('endDateSearch').value;
+ var packer = Ext.getCmp('packer').getValue();
+ var packerNumber = Ext.getCmp('packerNumber').getValue();
+ var tousseName = $Id('tousseName').value;
+ var barcode = Ext.getCmp('scanTousseBarcode').getValue();
+ var orgUnit = $Id('orgUnit').value;
+ if(startDate || endDate){
+ if(!startDate){
+ showResult("请录入开始时间");
+ return false;
+ }else if(!endDate){
+ showResult("请录入结束时间");
+ return false;
+ }else if(!compareDate(startDate,endDate)){
+ showResult("开始时间不能大于结束时间");
+ return false;
+ }
+ }
+
+ var params = {
+ tousseName: tousseName,
+ orgUnit: orgUnit,
+ tousseBarcode: barcode,
+ packer: packer,
+ packerNumber: packerNumber,
+ startTimeSearch: startDate,
+ endTimeSearch: endDate
+ }
+ return params;
+ }
+
function setParamsToHiddenFieled(){
var startDate = $Id('startDateSearch').value;
var endDate = $Id('endDateSearch').value;
Index: ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.jsp
===================================================================
diff -u -r21332 -r23339
--- ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.jsp (.../historyPackingView.jsp) (revision 21332)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.jsp (.../historyPackingView.jsp) (revision 23339)
@@ -80,6 +80,11 @@
<%@ include file="/disinfectsystem/print/print.jsp"%>
+
+
+
+
+