Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
===================================================================
diff -u -r38961 -r39659
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 38961)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 39659)
@@ -1828,6 +1828,202 @@
}
return false;
}
+
+//GZFDZL-157：显示查询周期
+function showQueryTime(tousseDefinitionID,rowIndex){
+ var form = new top.Ext4.Panel({
+ id:'configForm',
+ region: 'north',
+ buttonAlign: 'center',
+ border: 0,
+ frame: true,
+ bodyStyle: 'padding:0px auto;margin:0px',
+ height: 120,
+ fieldDefaults: {
+ labelAlign: 'right',
+ labelWidth: 70
+ },
+ items: [{
+ layout: 'column',
+ border:0,
+ style:'background:none',
+ items: [{
+ layout: 'form',
+ columnWidth: 0.18,
+ border: 0,
+ style: 'margin-bottom:10px',
+ height:21,
+ items: [{
+ xtype: 'displayfield',
+ fieldLabel: '查询周期',
+ labelWidth: 90,
+ labelAlign: 'right',
+ anchor: '100%'
+ }]
+ }, {
+ layout: 'form',
+ columnWidth: 0.4,
+ border: 0,
+ style: 'margin-bottom:10px',
+ items: [{
+ xtype: 'datefield',
+ fieldLabel: '开始时间',
+ labelWidth: 90,
+ labelAlign: 'right',
+ id: 'startDate',
+ name: 'startDate',
+ format: 'Y-m-d H:i',
+ 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',
+ allowBlank: false,
+ anchor: '95%'
+ }]
+ }, {
+ layout: 'form',
+ columnWidth: 0.4,
+ border: 0,
+ style: 'margin-bottom:10px',
+ items: [{
+ xtype: 'datefield',
+ fieldLabel: '结束时间',
+ labelWidth: 90,
+ labelAlign: 'right',
+ id: 'endDate',
+ name: 'endDate',
+ format: 'Y-m-d H:i',
+ 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',
+ allowBlank: false,
+ anchor: '95%'
+ }]
+ },{
+ layout: 'form',
+ columnWidth: 0.18,
+ border: 0,
+ style: 'margin-bottom:10px',
+ items: [{
+ xtype: 'displayfield',
+ fieldLabel: '快速查询',
+ labelWidth: 90,
+ labelAlign: 'right',
+ anchor: '100%'
+ }]
+ },{
+ layout: 'form',
+ columnWidth: 0.15,
+ border: 0,
+ style: 'margin-bottom:10px',
+ items: [{
+ xtype: 'button',
+ text: '近1天',
+ handler: function () {
+ var startDate = getDefaultDate(newDate, 1) + dayStartTime;
+ var endDate = getDefaultDate(newDate) + dayStartTime;
+ top.Ext4.getCmp('startDate').setRawValue(startDate);
+ top.Ext4.getCmp('endDate').setRawValue(endDate);
+ }
+ }]
+ },{
+ layout: 'form',
+ columnWidth: 0.15,
+ border: 0,
+ style: 'margin-bottom:10px',
+ items: [{
+ xtype: 'button',
+ text: '近1周',
+ handler: function () {
+ var startDate = getDefaultDate(newDate, 7) + dayStartTime;
+ var endDate = getDefaultDate(newDate) + dayStartTime;
+ top.Ext4.getCmp('startDate').setRawValue(startDate);
+ top.Ext4.getCmp('endDate').setRawValue(endDate);
+ }
+ }]
+ },{
+ layout: 'form',
+ columnWidth: 0.15,
+ border: 0,
+ style: 'margin-bottom:10px',
+ items: [{
+ xtype: 'button',
+ text: '近1月',
+ handler: function () {
+ var startDate = getDefaultDate(newDate, 30) + dayStartTime;
+ var endDate = getDefaultDate(newDate) + dayStartTime;
+ top.Ext4.getCmp('startDate').setRawValue(startDate);
+ top.Ext4.getCmp('endDate').setRawValue(endDate);
+ }
+ }]
+ }]
+ }],
+ buttons: [{
+ xtype: 'button',
+ text: '查询',
+ handler: function () {
+ var startDate = top.Ext4.getCmp('startDate').getRawValue();
+ var endDate = top.Ext4.getCmp('endDate').getRawValue();
+ if(startDate || endDate){
+ if(!compareDate(startDate,endDate)){
+ showResult("开始时间不能大于结束时间");
+ return;
+ }
+ }
+ getDisposableGoodsUseAmountByDiposableGoodsIds(startDate,endDate,tousseDefinitionID,rowIndex);
+ }
+ }, {
+ xtype: 'button',
+ text: '重置',
+ handler: function () {
+ var startDate = getDefaultDate(newDate, 1) + dayStartTime;
+ var endDate = getDefaultDate(newDate) + dayStartTime;
+ top.Ext4.getCmp('startDate').setRawValue(startDate);
+ top.Ext4.getCmp('endDate').setRawValue(endDate);
+ }
+ }]
+ });
+
+ var window = new top.Ext4.Window({
+ id:'queryTime',
+ autoHeight:true,
+ title : '查询周期设置',
+ width:600,
+ draggable:true,
+ modal:true,
+ items: [form]
+ });
+ window.show();
+
+ var startDate = getDefaultDate(newDate,1) + dayStartTime;
+ var endDate = getDefaultDate(newDate) + dayStartTime;
+ top.Ext4.getCmp('startDate').setRawValue(startDate);
+ top.Ext4.getCmp('endDate').setRawValue(endDate);
+}
+
+//GZFDZL-157：获取历史使用量
+function getDisposableGoodsUseAmountByDiposableGoodsIds(startDate,endDate,tousseDefinitionID,rowIndex){
+ var departCode = top.Ext.getCmp("orgUnitCoding").getValue();
+ if(departCode !== ''){
+ showResult('请选择申请科室');
+ return
+ }
+ var params = {
+ departCode:departCode,
+ startDate:startDate,
+ endDate:endDate,
+ diposableGoodsIds:tousseDefinitionID
+ }
+ Ext.Ajax.request({
+ url : WWWROOT + '/disinfectSystem/diposablegoods/disposableGoodsController/getDisposableGoodsUseAmountByDiposableGoodsIds.mhtml',
+ params : params,
+ success : function(response, options) {
+ if(result.success){
+ var record = recyclingapplicationStore1.getAt(rowIndex);
+ record.set('useAmount',result.rows[0].useAmount);
+ top.Ext4.getCmp('queryTime').close();
+ }else {
+ showResult(result.message);
+ }
+ }
+ });
+}
+
/**
* 发货单窗口
* @param orgUnitCoding 科室编码
@@ -1901,6 +2097,7 @@
{ name: 'showTousseName' },
{ name: 'fullCaseApplicationAmount' },
{ name: 'count' },//待发数量
+ { name: 'useAmount' },
{ name: 'middlePackageAmount' },
{ name: 'diposable' },
{ name: 'disposableGoodsId' },
@@ -2092,6 +2289,21 @@
}
},
{
+ header: "历史使用量", dataIndex: 'useAmount', align: 'center', width: 90, menuDisabled: true,hidden:!sstsConfig.enableTheHistoricalUsageStatisticsFeature, renderer: function (v, p, record, rowIndex) {
+ var disposableGoodsId = record.data.disposableGoodsId;
+ if(disposableGoodsId !== '' && disposableGoodsId !== 0){
+ var html = '';
+ html += '
'+ (v || '') +'
'
+ html += '
'
+ html += '