Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js =================================================================== diff -u -r30264 -r30413 --- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 30264) +++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 30413) @@ -116,6 +116,10 @@ barcode = ''; barcodes = ''; } + + if($Id('department').value == ''){ + Ext.getCmp('department').setValue(""); + } barcodeForExport = barcode; @@ -131,7 +135,7 @@ $Id('parm_s_operationEnd').value = $Id('operationEnd').value; //装配结束时间 $Id('parm_s_invoiceStart').value = $Id('invoiceStart').value; //发货开始时间 $Id('parm_s_invoiceEnd').value = $Id('invoiceEnd').value; //发货结束时间 - + $Id('parm_s_department').value = Ext.getCmp('department').getValue(); //科室编号 $Id('parm_s_tousseStatus').value = $Id('tousseStatus').value; //器械包状态 $Id('parm_s_tousseGroupName').value = $Id('tousseGroupName').value; //器械包分组 @@ -184,21 +188,25 @@ barcode = ''; barcodes = ''; } - - queryCondition['barcodeSearch'] = barcode; //条码 - queryCondition['barcodes'] = (barcodes); //多次扫描模式下的条码 - queryCondition['idNumberSearch'] = $Id('idNumberSearch').value; //标识牌编号 + //条码 + queryCondition['barcodeSearch'] = ($Id('id_barcodeSearch').value == '')?barcode:$Id('id_barcodeSearch').value; + //多次扫描模式下的条码 + queryCondition['barcodes'] = (barcodes) + //标识牌编号 + queryCondition['idNumberSearch'] = ($Id('id_idNumberSearch').value == '')?$Id('idNumberSearch').value:$Id('id_idNumberSearch').value; queryCondition['sterilizationTransitionStart'] = $Id('sterilizationTransitionStart').value; //灭菌交接开始时间 queryCondition['sterilizationTransitionEnd'] = $Id('sterilizationTransitionEnd').value; //灭菌交接结束时间 - queryCondition['taskGroup'] = encodeURI($Id('taskGroup').value); //装配任务组 + //装配任务组 + queryCondition['taskGroup'] = ($Id('id_taskGroup').value == '')?encodeURI($Id('taskGroup').value):encodeURI($Id('id_taskGroup').value); queryCondition['operationStart'] = $Id('operationStart').value; //装配开始时间 queryCondition['operationEnd'] = $Id('operationEnd').value; //装配结束时间 queryCondition['invoiceStart'] = $Id('invoiceStart').value; //发货开始时间 queryCondition['invoiceEnd'] = $Id('invoiceEnd').value; //发货结束时间 queryCondition['department'] = encodeURI(Ext.getCmp('department').getValue()); //科室编号 - queryCondition['tousseStatus'] = encodeURI($Id('tousseStatus').value); //器械包状态 + //器械包状态 + queryCondition['tousseStatus'] = ($Id('id_tousseStatus').value == '')?encodeURI($Id('tousseStatus').value):encodeURI($Id('id_tousseStatus').value); queryCondition['tousseGroupName'] = encodeURI($Id('tousseGroupName').value); //器械包分组 if(preciseQuery == Ext.getCmp('queryMode').getRawValue()){ //器械包名称(根据查询模式设置不同) queryCondition['tousseName'] = encodeURI(Ext.getCmp('tousseName').getRawValue()); @@ -218,6 +226,23 @@ queryCondition['patientName'] = encodeURI(Ext.getCmp('patientName').getValue()); //病人姓名 queryCondition['hospitalNum'] = Ext.getCmp('hospitalNum').getValue(); //住院号 queryCondition['treatmentNum'] = Ext.getCmp('treatmentNum').getValue(); //诊疗号 + + //位置 + queryCondition['locationForDisplay'] = encodeURI($Id('id_locationForDisplay').value); + //回收人 + queryCondition['recyclingUser'] = encodeURI($Id('id_recyclingUser').value); + //回收清点人 + queryCondition['recyclingOperator'] = encodeURI($Id('id_recyclingOperator').value); + //清洗人 + queryCondition['washOperator'] = encodeURI($Id('id_washOperator').value); + //装配人 + queryCondition['operator'] = encodeURI($Id('id_operator').value); + //审核人 + queryCondition['reviewer'] = encodeURI($Id('id_reviewer').value); + //包装类型 + queryCondition['packageType'] = encodeURI($Id('id_packageType').value); + //灭菌篮筐 + queryCondition['sterilizationBasket'] = encodeURI($Id('id_sterilizationBasket').value); return queryCondition; } @@ -666,13 +691,9 @@ {type : 'string',dataIndex : 'idCardInstanceBarcode'}, {type : 'string',dataIndex : 'taskGroup'}, {type : 'string',dataIndex : 'operator'}, - {type : 'date',dataIndex : 'operationTime'}, {type : 'list',dataIndex : 'status',options : [statusPacked, statusReviewed, statusSterileding,statusSteriled, statusShipped,statusSigned, statusUsed,statusPrerecycled,statusWaitForRecall,statusRecalled, statusDiscard, statusDisinfected,statusDelayConfirm],phpMode : true}, {type : 'string',dataIndex : 'sterilingType'}, {type : 'numeric',dataIndex : 'useAmount'}, -// {type : 'string',dataIndex : 'idNumber'}, - {type : 'date',dataIndex : 'validUntil'}, - {type : 'date',dataIndex : 'reviewTime'}, {type : 'string',dataIndex : 'packageType'}, {type : 'string',dataIndex : 'recyclingUser'}, {type : 'string',dataIndex : 'recyclingOperator'}, @@ -681,14 +702,43 @@ {type : 'string',dataIndex : 'sterilizationBasket'}, {type : 'string',dataIndex : 'locationForDisplay'}, {type : 'string',dataIndex : 'orgUnitName'}, - {type : 'date',dataIndex : 'invoiceSendTime'}, {type : 'string',dataIndex : 'patientName'}, {type : 'string',dataIndex : 'doctorName'}, - {type : 'date',dateIndex : 'useTime'}, {type : 'string',dataIndex : 'handover'}, - {type : 'string',dataIndex : 'takeover'}, - {type : 'date',dataIndex : 'transitionTime'} - ] + {type : 'string',dataIndex : 'takeover'} + ], + saveState:function(store, options){ + if(filters.getMenuFilter()){ + var active = filters.getMenuFilter().active; + var dataIndex = filters.getMenuFilter().dataIndex; + var value = filters.getMenuFilter().getValue(); + if(active == 'true' || active == true){ + if(dataIndex == 'barcode'){ + $Id('id_barcodeSearch').value = value; + }else if(dataIndex == 'status'){ + $Id('id_tousseStatus').value = value.join(','); + }else if(dataIndex == 'tousseDefinition.name'){ + $Id('id_tousseName').value = value; + }else { + if($Id('id_'+dataIndex)){ + $Id('id_'+dataIndex).value = value; + } + } + }else { + if(dataIndex == 'barcode'){ + $Id('id_barcodeSearch').value = ''; + }else if(dataIndex == 'status'){ + $Id('id_tousseStatus').value = ''; + }else if(dataIndex == 'tousseDefinition.name'){ + $Id('id_tousseName').value = ''; + }else { + if($Id('id_'+dataIndex)){ + $Id('id_'+dataIndex).value = ''; + } + } + } + } + } }); var dt = new Date(); var v = dt.getMonth()+1; @@ -1315,6 +1365,15 @@ $Id('sterilizerGroup').value = ""; //灭菌炉分组 $Id('sterilizerName').value = ""; //灭菌炉 $Id('frequency').value = ""; //炉次 + + $Id('id_locationForDisplay').value = ""; + $Id('id_recyclingUser').value = ""; + $Id('id_recyclingOperator').value = ""; + $Id('id_washOperator').value = ""; + $Id('id_operator').value = ""; + $Id('id_reviewer').value = ""; + $Id('id_packageType').value = ""; + $Id('id_sterilizationBasket').value = ""; //重置gridFilters的过滤条件 var plugins = grid.plugins; @@ -1399,22 +1458,6 @@ showResult("结果数量最大为65535,请缩小查询数据的范围"); return; } - /*var barcodeSearch = $Id('barcodeSearch').value; - var sterilizationStartDate = $Id('sterilizationStart').value;//灭菌开始时间 - var sterilizationEndDate = $Id('sterilizationEnd').value;//灭菌结束时间 - var sterilizerName = $Id('sterilizerName').value; - var frequency = $Id('frequency').value; - var tousseName = $Id('tousseName').value; - location.href = WWWROOT - + "/disinfectSystem/baseData/tousseDefinitionAction!exportTousseInstanceInfo.do?barcode=" - + barcodeSearch + "&sterilizationDate=" - + sterilizationStartDate - + "&sterilizationEndDate=" - + sterilizationEndDate + "&sterilizerName=" - + sterilizerName + "&frequency=" - + frequency + "&tousseName=" - + tousseName;*/ - //因为参数较多,所以改为表单的post提交 var queryCondition = getQueryCondition(); //表单元素的id前缀 var idPrefix = "id_"; Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp =================================================================== diff -u -r30407 -r30413 --- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp (.../tousseInstanceView.jsp) (revision 30407) +++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp (.../tousseInstanceView.jsp) (revision 30413) @@ -374,6 +374,22 @@ + + + + + + + + + + + + + + + +