Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.jsp =================================================================== diff -u -r26923 -r29005 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.jsp (.../invoiceView.jsp) (revision 26923) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.jsp (.../invoiceView.jsp) (revision 29005) @@ -119,6 +119,17 @@
+ + + + + + + + + + +
\ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js =================================================================== diff -u -r28558 -r29005 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 28558) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 29005) @@ -703,13 +703,14 @@ labelWidth : 70, columnWidth : .5, items : [{ - xtype : 'textfield', - fieldLabel : '申请时间', - id : 'applicationTime2', - name : 'applicationTime', - readOnly : true, - anchor : '99%', - cls : 'fieldReadOnlyNoRemove' + xtype : 'datefieldWithMin', + fieldLabel : '发货时间', + id : 'sendTime', + name : 'sendTime', + allowBlank : false, + 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', + format : 'Y-m-d H:i', + anchor : '99%' }] },{ layout : 'form', @@ -784,14 +785,13 @@ labelWidth : 70, columnWidth : .5, items : [{ - xtype : 'datefieldWithMin', - fieldLabel : '发货时间', - id : 'sendTime', - name : 'sendTime', - allowBlank : false, - 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', - format : 'Y-m-d H:i', - anchor : '99%' + xtype : 'textfield', + fieldLabel : '申请时间', + id : 'applicationTime2', + name : 'applicationTime', + readOnly : true, + anchor : '99%', + cls : 'fieldReadOnlyNoRemove' }] },{ layout : 'form', @@ -1821,6 +1821,560 @@ } }); } +var searchTbar1 = []; //第1行过滤tbar +var searchTbar1Width = 0; //第1行过滤tbar的宽度 +var searchTbar2 = []; //第2行过滤tbar +var searchTbar2Width = 0; //第2行过滤tbar的宽度 +var searchTbar3 = []; //第3行过滤tbar +var searchTbar3Width = 0; //第3行过滤tbar的宽度 +var searchTbar4 = []; //第4行过滤tbar +var searchTbar4Width = 0; //第4行过滤tbar的宽度 +var searchTbarMaxWidth = top.screen.width - 30; //每一行搜索的工具栏的最大宽度 +var searchTbarWidth = 0; //过滤tbar的总宽度 +/** + * 把过滤的tbar加到对应的组内（自适应各个分辨率）. + * @param searchTbarArr 需要添加的过滤的tbar + * @param width + */ +function addSearchTbar(searchTbarArr, width) { + var tempWidth = searchTbarWidth + width; + var flag1 = false; + var flag2 = false; + var flag3 = false; + var flag4 = false; + if (0 < tempWidth && tempWidth <= searchTbarMaxWidth) { + if (width <= (searchTbarMaxWidth - searchTbar1Width)) { + searchTbar1 = searchTbar1.concat(searchTbarArr); + searchTbar1Width += width; + } else if (width <= (searchTbarMaxWidth - searchTbar2Width)) { + searchTbar2 = searchTbar2.concat(searchTbarArr); + searchTbar2Width += width; + } + } else if (flag1 || (searchTbarMaxWidth < tempWidth && tempWidth <= searchTbarMaxWidth * 2)) { + if (width <= (searchTbarMaxWidth - searchTbar2Width)) { + searchTbar2 = searchTbar2.concat(searchTbarArr); + searchTbar2Width += width; + } else if (width <= (searchTbarMaxWidth - searchTbar3Width)) { + searchTbar3 = searchTbar3.concat(searchTbarArr); + searchTbar3Width += width; + } + } else if (flag2 || (2 * searchTbarMaxWidth < tempWidth && tempWidth <= searchTbarMaxWidth * 3)) { + if (width <= (searchTbarMaxWidth - searchTbar3Width)) { + searchTbar3 = searchTbar3.concat(searchTbarArr); + searchTbar3Width += width; + } else if (width <= (searchTbarMaxWidth - searchTbar4Width)) { + searchTbar4 = searchTbar4.concat(searchTbarArr); + searchTbar4Width += width; + } + } else if (flag3 || (3 * searchTbarMaxWidth < tempWidth && tempWidth <= searchTbarMaxWidth * 4)) { + if (width <= (searchTbarMaxWidth - searchTbar4Width)) { + searchTbar4 = searchTbar4.concat(searchTbarArr); + searchTbar4Width += width; + } + } + searchTbarWidth = tempWidth; +} +function reloadTimeField(){ + var startDate = Ext.getCmp("startDate").getValue(); + var endDate = Ext.getCmp("endDate").getValue(); + if (isUndefinedOrNullOrEmpty(startDate) || isUndefinedOrNullOrEmpty(endDate)){ + Ext.Msg.alert('警告', '时间不能为空!'); + return; + } + var value1 = Date.parse(startDate); + var value2 = Date.parse(endDate); + if (value1 > value2) { + Ext.Msg.alert('警告', '开始时间不能大于结束时间!'); + return; + } + document.getElementById('parm_s_startTime').value = value1; + document.getElementById('parm_s_endTime').value = value2; + grid.dwrReload(); +} +/** + * 创建下拉选项统一方法(xtype可以是combo或者multiSelect,如果要使用multiSelect则要引入multiSelect的js和css) + * @param comboConfig 下拉选项的配置 + * @returns + */ +function createCombo(comboConfig) { + var storeConfig = comboConfig.storeConfig; + return { + xtype: comboConfig.xtype || 'combo', + id: comboConfig.id, + name: comboConfig.name, + fieldLabel: comboConfig.fieldLabel, + store: new Ext.data.Store({ + proxy: new Ext.data.HttpProxy({ + url: storeConfig.url, + method: 'POST' + }), + reader: new Ext.data.JsonReader({ + root: 'data', + totalProperty: 'totalCount' + }, storeConfig.model + ) + }), + width: comboConfig.width || 150, + mode: comboConfig.mode || 'remote', + triggerAction: 'all', + listWidth: comboConfig.listWidth || 150, + displayField: comboConfig.displayField, + valueField: comboConfig.valueField, + forceSelection: Ext.isEmpty(comboConfig.forceSelection) ? true : comboConfig.forceSelection, + value: (comboConfig.value == null ? '' : comboConfig.value), + editable: comboConfig.editable, + queryParam : comboConfig.queryParam ? comboConfig.queryParam : 'spell', + minChars : comboConfig.minChars ? comboConfig.minChars : 0, + listeners: comboConfig.listeners + }; +} +/** + * 创建申请科室的过滤条件. + * @returns + */ +function createApplyDepartmentCombo() { + var applyDepartmentConfig = { + url : WWWROOT + '/systemmanage/orgUnit/searchApplyDepartmentByKeyWord.do?onlyOneself=false', + model : [ + {name: 'departmentCode', mapping: 'departmentCode'}, + {name: 'departmentName', mapping: 'departmentName'} + ] + } + return createCombo({ + id: 'applyDepartment', + name: 'applyDepartment', + xtype: 'combo', + storeConfig : applyDepartmentConfig, + editable: true, + fieldLabel: '按申请科室', + displayField: 'departmentName', + valueField: 'departmentCode', + listWidth: 200, + forceSelection : true, + queryParam : 'spell', + value: '', + minChars : 0, + listeners: { + select: function (combo, record, index) { + reloadConditionPara(combo.getValue(), 'parm_s_applyDepartmentCode'); + } + } + }); +} + +/** + * 创建结算科室的过滤条件. + * @returns + */ +function createSettleAccountsDepartmentCombo() { + var settleAccountsDepartmentConfig = { + url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getSettleAccountsDepartJson.do', + model : [ + {name: 'departmentCode', mapping: 'id'}, + {name: 'departmentName', mapping: 'name'} + ] + } + return createCombo({ + id: 'settleAccountsDepartment', + name: 'settleAccountsDepartment', + xtype: 'combo', + storeConfig : settleAccountsDepartmentConfig, + editable: true, + fieldLabel: '按结算科室', + displayField: 'departmentName', + valueField: 'departmentCode', + listWidth: 200, + forceSelection : true, + queryParam : 'spell', + value: '', + minChars : 0, + listeners: { + select: function (combo, record, index) { + reloadConditionPara(combo.getValue(), 'parm_s_settleAccountsDepartmentCode'); + } + } + }); +} +/** + * 创建按物品的过滤条件. + * @returns + */ +function createGoodsCombo() { + var goodsConfig = { + url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!searchInsideTousseAndDiposableGoods.do', + model : [ + {name: 'id', mapping: 'id'}, + {name: 'name', mapping: 'name'}, + {name: 'type', mapping: 'type'} + ] + } + return createCombo({ + id: 'goods', + name: 'goods', + xtype: 'combo', + storeConfig : goodsConfig, + editable: true, + displayField: 'name', + valueField: 'id', + listWidth: 300, + forceSelection : true, + queryParam : 'spell', + value: '', + minChars : 0, + listeners: { + select: function (combo, record, index) { + var parm_s_goodsType = document.getElementById('parm_s_goodsType'); + parm_s_goodsType.value = record.get('type'); + reloadConditionPara(record.get('id'), 'parm_s_goodsId'); + } + } + }); +} + + +/** + * 创建按器械包类型下拉选项 + * @returns + */ +function createTousseTypeCombo() { + var touseTypeStoreConfig = { + url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getAllTousseType.do', + model : [{name: 'tousseType', mapping: 'tousseType'}] + } + return createCombo({ + id: 'touseType', + name: 'touseType', + xtype : 'multiSelect', + fieldLabel : '按器械包类型', + valueField : 'tousseType', + displayField : 'tousseType', + storeConfig : touseTypeStoreConfig, + triggerAction : 'all', +// id : 'tousseType', +// name : 'tousseType', + allowBlank : false, + //这个要设置成false,不然多选鼠标离开之后,combo上面的值不会显示 + forceSelection : false, + readOnly:true, + listeners: { + select: function (combo, record, index) { + //1、如果选中“全部”的项，则把所有的项选中，反之全部取消选择 + if (record.get('tousseType') == '全部') { + if (record.get('checked')) { + combo.selectAll() + } else { + combo.deselectAll() + } + } + + //2、如果已经选中所有的项，则把“全部”项选中，反之把“全部”项取消选择 + var selectAll = true; + combo.store.each(function(record) { + if (record.get('tousseType') != '全部' && !record.get(this.checkField)) { + selectAll = false; + return; + } + }, combo); + + var all = combo.store.getAt(0); + if (selectAll) { + all.set(combo.checkField, true); + } else { + all.set(combo.checkField, false); + } + combo.setValue(combo.getCheckedValue()); + reloadConditionPara(combo.getValue(), 'parm_s_tousseTypes'); + } + } + }); +} + +/* + 可以获取当天时间的，可以获取到当天的00:00和23:59 + dateformat 日期格式 + extObj Ext对象 + fieldId 要设置时间区域的id + */ + function getServerCurTime(dateformat,extObj,fieldId){ + Ext.Ajax.request({ + url: WWWROOT + '/system/serverTimeAction!getTodayDataTime.do', + params: {dateformat: dateformat}, + success: function(response, options) { + var result = Ext.decode(response.responseText); + if (result.success) { + if(extObj && fieldId && extObj.getCmp(fieldId)){ + extObj.getCmp(fieldId).setValue(result.data.startDateTime); + } + } else { + showResult(result.message); + } + }, + failure : function(response, options) { + showResult('获取服务器时间失败!'); + } + }); +} +/* + 可以获取每月第一天的00:00和每月当天的23:59 + dateformat 日期格式 + extObj Ext对象 + fieldId 要设置时间区域的id + */ + function getServerTime2(dateformat,extObj,fieldId){ + Ext.Ajax.request({ + url: WWWROOT + '/system/serverTimeAction!getDateTimeOfFirstDay.do', + params: {dateformat: dateformat}, + success: function(response, options) { + var result = Ext.decode(response.responseText); + if (result.success) { + if(extObj && fieldId && extObj.getCmp(fieldId)){ + if(fieldId == "startDate"){ + extObj.getCmp("startDate").setValue(result.data.startDateTime); + }else if(fieldId == "endDate"){ + extObj.getCmp("endDate").setValue(result.data.endDateTime); + } + reloadTimeField(); + } + } else { + showResult(result.message); + } + }, + failure : function(response, options) { + showResult('获取服务器时间失败!'); + } + }); +} + +/** + * 创建打印状态过滤的下拉选项 + */ +function createPrintCombo() { + var printStatus = new Ext.data.SimpleStore({ + fields: ['key', 'val'], + data: [ + ['all', '全部'], + ['是', '是'], + ['否', '否'], + ['部分打印', '部分打印'] + ] + }); + + var printCombo = { + id: 'print', + name: 'print', + xtype: 'combo', + fieldLabel: '打印筛选', + store: printStatus, + width: 80, + mode: 'local', + triggerAction: 'all', + displayField: 'val', + forceSelection: true, + editable: false, + listeners : { + select : function(combo, record, index){ + var key = record.get('key'); + reloadConditionPara(key, 'parm_s_print'); + } + } + }; + return printCombo; +} + +/** + * 根据传过来的值来重新加载grid的dwr数据 + * @param fieldValue 传过来的值 + * @param domId dom节点的id + */ +function reloadConditionPara(fieldValue, domId) { + var dom = document.getElementById(domId); + dom.value = fieldValue; + + var applyDepartment = Ext.getCmp('applyDepartment').getRawValue(); + var settleAccountsDepartment = Ext.getCmp('settleAccountsDepartment').getRawValue(); + var goods = Ext.getCmp('goods').getRawValue(); + + if (!applyDepartment) { + var parm_s_applyDepartmentCode = document.getElementById('parm_s_applyDepartmentCode'); + parm_s_applyDepartmentCode.value = ''; + } + if (!settleAccountsDepartment) { + var parm_s_settleAccountsDepartmentCode = document.getElementById('parm_s_settleAccountsDepartmentCode'); + parm_s_settleAccountsDepartmentCode.value = ''; + } + if (!goods) { + var parm_s_goodsType = document.getElementById('parm_s_goodsType'); + var parm_s_goodsId = document.getElementById('parm_s_goodsId'); + parm_s_goodsType.value = ''; + parm_s_goodsId.value = ''; + } + grid.dwrReload(); +} + +//simon-add +function refresh(){ + grid.dwrReload(); +} +//simon-add +function reset(){ + document.getElementById('parm_s_invoiceType').value =''; + document.getElementById('parm_s_applyType').value =''; + + //document.getElementById('invoiceDepartGroup').value =''; + //document.getElementById('parm_s_selectedDepartCodes').value =''; + + document.getElementById('touseType').value =''; + document.getElementById('parm_s_selectedTousseType').value =''; + + if(sstsConfig.invoicePlanExtractedView_showDisposableGoodsType){ + document.getElementById('disposableGoodsType').value =''; + document.getElementById('parm_s_disposableGoodsType').value =''; + } + + //先将所有的过滤条件恢复默认，然后再刷新 + if(!sstsConfig.notShowGoodsSearchTbar){ + //按物品 + document.getElementById('parm_s_goodsType').value =''; + document.getElementById('parm_s_goodsId').value =''; + document.getElementById('goods').value =''; + } + + if(!sstsConfig.notShowTousseTypeSearchTbar){ + //按器械包类型分组 + document.getElementById('touseType').value = ''; + document.getElementById('parm_s_tousseTypes').value = ''; + } + + if(!sstsConfig.notShowApplyDepartmentSearchTbar){ + //按申请科室 + document.getElementById('applyDepartment').value = ''; + document.getElementById('parm_s_applyDepartmentCode').value = ''; + } + + if(!sstsConfig.notShowSettleAccountsDepartmentSearchTbar){ + //按结算科室 + document.getElementById('settleAccountsDepartment').value = ''; + document.getElementById('parm_s_settleAccountsDepartmentCode').value = ''; + } + + if(!sstsConfig.notShowPrintSearchTbar){ + //是否已打印 + document.getElementById('print').value = ''; + document.getElementById('parm_s_print').value = ''; + } + + //开始时间 + document.getElementById('parm_s_startTime').value = ''; + document.getElementById('startDate').value = ''; +// //结束时间 + document.getElementById('parm_s_endTime').value = ''; + document.getElementById('endDate').value = ''; + + grid.dwrReload(); + +} + +/** + * 创建过滤的tbar（自适应各个分辨率）. + */ +function createSearchTbar() { + //2、按时间过滤(width=415) + var time = [{text: '开始日期:'},{ + //xtype: sstsConfig.timeSearchFmt ? 'datefieldWithMin' : 'datefield', + xtype: 'datefieldWithMin', + fieldLabel: '开始日期', + name: 'startDate', + //format: sstsConfig.timeSearchFmt || 'Y-m-d', + format : 'Y-m-d H:i', + id: 'startDate', + readOnly: false, + editable: false, + theHours : 0, + theMinutes : 0, + //width: sstsConfig.timeSearchFmt ? 120 : 90, + width: 120 + },{ text: '结束日期:'},{ + //xtype: sstsConfig.timeSearchFmt ? 'datefieldWithMin' : 'datefield', + xtype: 'datefieldWithMin', + fieldLabel: '结束日期', + name: 'endDate', + id: 'endDate', + readOnly: false, + editable: false, + // format: sstsConfig.timeSearchFmt || 'Y-m-d', + format : 'Y-m-d H:i', + theHours : 23, + theMinutes : 59, + // width: sstsConfig.timeSearchFmt ? 120 : 90, + width: 120 + },{ + xtype: 'button', + text: '查询', + iconCls: 'icon_search', + handler: reloadTimeField + }]; + addSearchTbar(time, 415); + + //3、按申请科室过滤(width=230) + if(!sstsConfig.notShowApplyDepartmentSearchTbar){ + var applyDepartmentSearchTbarArr = []; + applyDepartmentSearchTbarArr.push({text: '按申请科室:'}); + applyDepartmentSearchTbarArr.push(createApplyDepartmentCombo()); + addSearchTbar(applyDepartmentSearchTbarArr, 230); + } + + //4、按结算科室过滤(width=230) + if(!sstsConfig.notShowSettleAccountsDepartmentSearchTbar){ + var settleAccountsDepartmentSearchTbarArr = []; + settleAccountsDepartmentSearchTbarArr.push({text: '按结算科室:'}); + settleAccountsDepartmentSearchTbarArr.push(createSettleAccountsDepartmentCombo()); + addSearchTbar(settleAccountsDepartmentSearchTbarArr, 230); + } + + //5、按物品过滤(width=200) + if(!sstsConfig.notShowGoodsSearchTbar){ + var goodsSearchTbarArr = []; + goodsSearchTbarArr.push({text: '按物品:'}); + goodsSearchTbarArr.push(createGoodsCombo()); + addSearchTbar(goodsSearchTbarArr, 200); + } + + //6、按器械包类型(width=235) + if(!sstsConfig.notShowTousseTypeSearchTbar){ + var tousseTypeSearchTbarArr = []; + tousseTypeSearchTbarArr.push({text: '按器械包类型:'}); + tousseTypeSearchTbarArr.push(createTousseTypeCombo()); + addSearchTbar(tousseTypeSearchTbarArr, 235); + } + + //7、是否已打印(width=150) + if(!sstsConfig.notShowPrintSearchTbar){ + var printSearchTbarArr = []; + printSearchTbarArr.push({text: '是否已打印:'}); + printSearchTbarArr.push(createPrintCombo()); + addSearchTbar(printSearchTbarArr, 150); + } + + //simon-update + //刷新按钮 + var refreshBtn={ + xtype: 'button', + text: '刷新', + iconCls: 'btn_ext_refresh1', + handler: refresh + }; + addSearchTbar(refreshBtn, 200); + + //重置按钮 + var resetBtn={ + xtype: 'button', + text: '重置', + iconCls: 'icon_set', + handler: reset + }; + addSearchTbar(resetBtn, 200); + +} var invoicePrintModule; Ext.onReady(function() { Ext.QuickTips.init(); @@ -1859,19 +2413,19 @@ {header : "流水号",width : 100,dataIndex : 'serialNumber',renderer : renderCallModifyFunction}, {header : "状态",width : 70,dataIndex : 'status',renderer : renderColor}, {header : "已打印",width : 50,dataIndex : 'isPrint',renderer : renderPrintColor}, - {header : "申请科室",width : 120,dataIndex : 'depart'}, - {header : "申请时间",width : 120,dataIndex : 'applicationTime',renderer : myDateFormatByMinute}, + {header : "申请科室",width : 120,dataIndex : 'depart'}, + {header : "发货时间",width : 120,dataIndex : 'sendTime',renderer : myDateFormatByMinute}, {header : "回收时间",width : 120,dataIndex : 'recyclingTime',renderer : myDateFormatByMinute}, {header : "发货员",width : 70,dataIndex : 'sender'}, {header : "拼音码",width : 100,dataIndex : 'spelling',hidden:true}, {header : "五笔码",width : 100,dataIndex : 'wbCode',hidden:true}, {header : "核对员",width : 70,dataIndex : 'assistantSender'}, {header : "责任人",width : 70,dataIndex : 'personInCharge'}, - {header : "发货时间",width : 120,dataIndex : 'sendTime',renderer : myDateFormatByMinute}, + {header : "申请时间",width : 120,dataIndex : 'applicationTime',renderer : myDateFormatByMinute}, {header : "类型",width : 110,dataIndex : 'invoicePlanType',sortable:false}, {id : 'remark',header : "备注",width : 110,dataIndex : 'remark'}, - {header : "打印时间",width : 120,dataIndex : 'printTime',sortable:false,renderer : myDateFormatByMinute}, + {header : "打印时间",width : 120,dataIndex : 'printTime',renderer : myDateFormatByMinute}, {header : "住院号",width : 70,dataIndex : 'hospitalNumber'}, {header : "签收人",width : 70,dataIndex : 'receiptor'}, @@ -1930,8 +2484,9 @@ ] }); + //搜索的tbar + createSearchTbar(); - var tbar = [{ text : '查看', hidden : SSTS_Invoice_Update, @@ -2007,7 +2562,7 @@ triggerAction : 'all', listeners : { select : function(combo, record, index){ - refreshList(); + reloadConditionPara(combo.getValue(), 'parm_s_selectedDepartCodes'); } }, anchor : '95%' @@ -2065,7 +2620,7 @@ triggerAction : 'all', listeners : { select : function(combo, record, index){ - grid.dwrReload(); + reloadConditionPara(combo.getValue(), 'parm_s_disposableGoodsType'); }, beforeselect:function(combo, record, index){ // var c = record.get(combo.checkField); @@ -2302,6 +2857,30 @@ autoExpandColumn : 'warehouseName', renderTo : 'gridDiv', frame : false, + listeners:{ + 'render' : function(){ + // tbar分行 + if (top.screen.width < 1280){ + new Ext.Toolbar({items: operationTbar}).render(this.tbar); + } + //搜索的工具栏另开一行,当工具栏的数组长度大于0才渲染到grid上 +// if (searchTbar.length > 0){ +// new Ext.Toolbar({items: searchTbar}).render(this.tbar); +// } + if (searchTbar1.length > 0){ + new Ext.Toolbar({items: searchTbar1}).render(this.tbar); + } + if (searchTbar2.length > 0){ + new Ext.Toolbar({items: searchTbar2}).render(this.tbar); + } + if (searchTbar3.length > 0){ + new Ext.Toolbar({items: searchTbar3}).render(this.tbar); + } + if (searchTbar4.length > 0){ + new Ext.Toolbar({items: searchTbar4}).render(this.tbar); + } + } + }/*, getGridParameterMap: function(){ var selectedTousseTypeCmp = Ext.getCmp('tousseType'); var invoiceDepartGroupsCmp = Ext.getCmp('invoiceDepartGroup'); @@ -2319,7 +2898,7 @@ 'parm_s_disposableGoodsType': [selectedDisposableGoodsType] }; return obj; - } + }*/ }, readerDetail, InvoiceTableManager.findInvoiceTableList, null @@ -2449,7 +3028,10 @@ } } } - + + getServerCurTime('yyyy-MM-dd HH:mm', Ext, 'startDate') + getServerTime2('yyyy-MM-dd HH:mm' ,Ext,'endDate'); + var viewport = new Ext.Viewport({ layout : 'border', items : [ {