Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/ReAppTableSqlHandler.java
===================================================================
diff -u -r22079 -r22523
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/ReAppTableSqlHandler.java	(.../ReAppTableSqlHandler.java)	(revision 22079)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/ReAppTableSqlHandler.java	(.../ReAppTableSqlHandler.java)	(revision 22523)
@@ -1,16 +1,22 @@
 package com.forgon.disinfectsystem.recyclingapplication.service;
 
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 
 import com.forgon.Constants;
 import com.forgon.databaseadapter.service.DateQueryAdapter;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
+import com.forgon.disinfectsystem.entity.tousseitem.TousseItem;
 import com.forgon.tools.SqlBuilder;
+import com.forgon.tools.db.DatabaseUtil;
+import com.forgon.tools.string.StringTools;
 
 /**
  * Created by zhonghaowen on 2017/1/4.
@@ -52,9 +58,61 @@
         this.createTousseGroupFilterSql(sqlWhereParamMap, sqlBuilder);
         this.createTousseTypeFilterSql(sqlWhereParamMap, sqlBuilder);
         this.createApplyTypeFilterSql(sqlWhereParamMap, sqlBuilder);
+        this.createApplyDepartmentFilterSql(sqlWhereParamMap, sqlBuilder);
+        this.createSettleAccountsDepartmentFilterSql(sqlWhereParamMap, sqlBuilder);
+        this.createGoodsFilterSql(sqlWhereParamMap, sqlBuilder);
     }
 
     /**
+     * 创建按物品过滤
+     * @param sqlWhereParamMap 页面的参数
+     * @param sqlBuilder       原来的sql
+     */
+    private void createGoodsFilterSql(Map<String, String> sqlWhereParamMap,
+			StringBuilder sqlBuilder) {
+    	String goodsType = sqlWhereParamMap.get("goodsType");
+    	String goodsId = sqlWhereParamMap.get("goodsId");
+    	
+    	if (StringUtils.isNotBlank(goodsType) && DatabaseUtil.isPoIdValid(goodsId)) {
+    		String idSql = "";
+    		if (TousseItem.TYPE_DIPOSABLE_GOODS.equals(goodsType)) {
+    			idSql = String.format("ti.disposableGoodsId=%s", goodsId);
+    		} else {
+    			idSql = String.format("ti.tousseDefinitionId=%s", goodsId);
+    		}
+    		String sql = String.format(" and po.id in(select ti.invoicePlan.id from TousseItem ti where %s) ", idSql);
+    		sqlBuilder.append(sql);
+    	}
+		
+	}
+
+	/**
+     * 创建按申请科室过滤
+     * @param sqlWhereParamMap 页面的参数
+     * @param sqlBuilder       原来的sql
+     */
+    private void createApplyDepartmentFilterSql(
+			Map<String, String> sqlWhereParamMap, StringBuilder sqlBuilder) {
+    	String applyDepartmentCode = sqlWhereParamMap.get("applyDepartmentCode");
+        if (StringUtils.isNotBlank(applyDepartmentCode)) {
+            sqlBuilder.append(String.format(" and departCoding='%s' ", applyDepartmentCode));
+        }
+	}
+    
+    /**
+     * 创建按结算科室过滤
+     * @param sqlWhereParamMap 页面的参数
+     * @param sqlBuilder       原来的sql
+     */
+    private void createSettleAccountsDepartmentFilterSql(
+    		Map<String, String> sqlWhereParamMap, StringBuilder sqlBuilder) {
+    	String settleAccountsDepartmentCode = sqlWhereParamMap.get("settleAccountsDepartmentCode");
+    	if (StringUtils.isNotBlank(settleAccountsDepartmentCode)) {
+    		sqlBuilder.append(String.format(" and settleAccountsDepartCoding='%s' ", settleAccountsDepartmentCode));
+    	}
+    }
+
+	/**
      * 创建按器械包类型过滤
      *
      * @param sqlWhereParamMap 页面的参数
@@ -98,21 +156,64 @@
     }
 
     /**
-     * 查看申请单时过滤未完成或者已完成状态
-     *
+     * 状态筛选过滤.
      * @param sqlBuilder       原来的sql
      * @param sqlWhereParamMap 页面的参数
      */
     private void createStatusFilterSql(Map<String, String> sqlWhereParamMap, StringBuilder sqlBuilder) {
         String status = sqlWhereParamMap.get("status");
-        if (StringUtils.isNotBlank(status)) {
-            // if (StringUtils.isNotEmpty(status)  && "todoList".equals(listType)){
-            if ("unFinish".equals(status)) {
-                this.createUnFinishFilterSql(sqlBuilder);
-            }
-            else if ("finish".equals(status)) {
-                this.createFinishFilterSql(sqlBuilder);
-            }
+        if (StringUtils.isNotBlank(status) && status.indexOf("全部") == -1) {
+        	String statusFilterSql = "";
+        	List<String> list = new ArrayList<String>();
+        	
+        	//1、未完成
+        	if (status.indexOf("未完成") != -1) {
+        		list.add(createUnFinishFilterSql());
+        	}
+        	
+        	//2、已完成
+        	if (status.indexOf("已完成") != -1) {
+        		list.add(createFinishFilterSql());
+        	}
+        	
+        	//3、部分回收
+        	if (status.indexOf(InvoicePlan.RECYCLINGSTATUS_PARTRECYCLE) != -1) {
+        		list.add(String.format("(recyclingStatus='%s')", InvoicePlan.RECYCLINGSTATUS_PARTRECYCLE));
+        	}
+        	
+        	//4、已回收
+        	if (status.indexOf(InvoicePlan.RECYCLINGSTATUS_RECYCLED) != -1) {
+        		list.add(String.format("(recyclingStatus='%s')", InvoicePlan.RECYCLINGSTATUS_RECYCLED));
+        	}
+        	
+        	//5、部分发货
+        	if (status.indexOf(InvoicePlan.DELIVERSTATUS_PARTDELIVERED) != -1) {
+        		list.add(String.format("(deliverStatus='%s')", InvoicePlan.DELIVERSTATUS_PARTDELIVERED));
+        	}
+        	
+        	//6、已发货
+        	if (status.indexOf(InvoicePlan.DELIVERSTATUS_DELIVERED) != -1) {
+        		list.add(String.format("(deliverStatus='%s')", InvoicePlan.DELIVERSTATUS_DELIVERED));
+        	}
+        	
+        	//7、已终止
+        	if (status.indexOf(InvoicePlan.STATUS_END) != -1) {
+        		list.add(String.format("(endStatus='%s')", InvoicePlan.STATUS_END));
+        	}
+        	
+        	if (CollectionUtils.isNotEmpty(list)) {
+        		for (String string : list) {
+					if (StringTools.isBlank(statusFilterSql)) {
+						statusFilterSql = string;
+					} else {
+						statusFilterSql = String.format(" %s or %s ", statusFilterSql, string);
+					}
+				}
+        		if (StringTools.isNotBlank(statusFilterSql)) {
+        			statusFilterSql = String.format(" and (%s) ", statusFilterSql);
+					sqlBuilder.append(statusFilterSql); 
+        		}
+        	}
         }
     }
 
@@ -166,74 +267,42 @@
 
 
     /**
-     * 创建未完成条件过滤
-     * (新加发货状态为null是也属于未完成,处理临床添加外部代理单而供应室未装配时的情况)
-     *
+     * 创建未完成条件过滤.
+     * <li>回收状态:待回收,部分回收（针对哪一些不需要发货的）</li>
+     * <li>发货状态:待发货,部分发货,(空:临床添加外部代理单而供应室未装配时的情况发货状态为空)</li>
+     * <li>归还状态:未归还,部分归还,归还待确认</li>
+     * <li>提交状态:committedStatus等于0</li>
      * @param sqlBuilder 原来的sql
      */
-    private void createUnFinishFilterSql(StringBuilder sqlBuilder) {
-        //回收状态:待回收,部分回收
-        String recyclingStatusSql = SqlBuilder.createStatus("recyclingStatus", InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE, InvoicePlan.RECYCLINGSTATUS_PARTRECYCLE);
-        //发货状态:待发货,部分发货
-        String deliverStatusSql = SqlBuilder.createStatus("deliverStatus", InvoicePlan.DELIVERSTATUS_AWAITDELIVER, InvoicePlan.DELIVERSTATUS_PARTDELIVERED);
-        //归还状态:未归还,部分归还,归还待确认
-        String returnStatusSql = SqlBuilder.createStatus("returnStatus", InvoicePlan.RETURN_STATUS_UNRETURNED, InvoicePlan.RETURN_STATUS_PARTIALLY_RETURNED, InvoicePlan.RETURN_STATUS_AWAITCONFIRM);
-        //提交状态:committedStatus等于0
-        String commitSql = "po.committedStatus = 0 ";
-        sqlBuilder.append(String.format(" AND (%s or %s or %s or %s or %s) ", deliverStatusSql, "deliverStatus is null", recyclingStatusSql, returnStatusSql, commitSql));
+    private String createUnFinishFilterSql() {
+		//回收状态:待回收,部分回收（针对哪一些不需要发货的）
+		String recyclingStatusSql = SqlBuilder.createStatus("recyclingStatus", InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE, InvoicePlan.RECYCLINGSTATUS_PARTRECYCLE);
+		recyclingStatusSql = String.format("((deliverStatus='' or deliverStatus is null) and %s)", recyclingStatusSql);
+		
+		//发货状态:待发货,部分发货,(空:临床添加外部代理单而供应室未装配时的情况发货状态为空)
+		String deliverStatusSql = SqlBuilder.createStatus("deliverStatus", InvoicePlan.DELIVERSTATUS_AWAITDELIVER, InvoicePlan.DELIVERSTATUS_PARTDELIVERED);
+		deliverStatusSql = String.format("(((deliverStatus='' or deliverStatus is null) and type='%s') or %s)", InvoicePlan.TYPE_FOREIGNPROXYDISINFECTION, deliverStatusSql);
+		
+		//归还状态:未归还,部分归还,归还待确认
+		String returnStatusSql = SqlBuilder.createStatus("returnStatus", InvoicePlan.RETURN_STATUS_UNRETURNED, InvoicePlan.RETURN_STATUS_PARTIALLY_RETURNED, InvoicePlan.RETURN_STATUS_AWAITCONFIRM);
+		
+		//提交状态:committedStatus等于0
+		String commitSql = "po.committedStatus = 0 ";
+		return String.format(" (%s or %s or %s or %s) ", recyclingStatusSql, deliverStatusSql, returnStatusSql, commitSql);
     }
 
 
     /**
-     * 创建已完成条件过滤
-     *
+     * 创建已完成条件过滤（已终止、已发货、不发货的单只要已回收）.
      * @param sqlBuilder 原来的sql
      */
-    private void createFinishFilterSql(StringBuilder sqlBuilder) {
-    	//已终止、已终止、不发货的单只要已回收即可
-    	String finishSql = String.format(" AND (endStatus='%s' "
-    			+ "or deliverStatus='%s' "
-    			+ "or ((deliverStatus='' or deliverStatus is null) and recyclingStatus='%s') ) ",
+    private String createFinishFilterSql() {
+    	String finishSql = String.format(" (endStatus='%s' or deliverStatus='%s' or ((deliverStatus='' or deliverStatus is null) and recyclingStatus='%s')) ",
         		InvoicePlan.STATUS_END, InvoicePlan.DELIVERSTATUS_DELIVERED, InvoicePlan.RECYCLINGSTATUS_RECYCLED);
-		sqlBuilder.append(finishSql);
+    	return finishSql;
     }
 
     /**
-     * 创建申请单申请时间过滤条件(近三天、近一周、近三个月”)
-     *
-     * @param sqlBuilder     原来的sql
-     * @param showSubmitTime 前端传过来的条件
-     * @deprecated 此功能暂时没有地方用到
-     */
-    @Deprecated
-    private void createSubmitTimeFilterSql(StringBuilder sqlBuilder, String showSubmitTime) {
-        Date now = new Date();
-        String today = dateQueryAdapter.dateAdapter(now);
-        String condition = null;
-        switch (showSubmitTime) {
-            case "threeDay": {
-                condition = dateQueryAdapter.dateAdapter(DateUtils.addDays(now, -3));
-                break;
-            }
-            case "oneWeek": {
-                condition = dateQueryAdapter.dateAdapter(DateUtils.addWeeks(now, -1));
-                break;
-            }
-            case "threeMonth": {
-                condition = dateQueryAdapter.dateAdapter(DateUtils.addMonths(now, -3));
-                break;
-            }
-            //default默认是全部
-            default: {
-            }
-        }
-        if (condition != null) {
-            sqlBuilder.append(String.format(" AND (po.submitTime between %s and %s OR po.recyclingTime between %s and %s) ", condition, today, condition, today));
-        }
-    }
-
-
-    /**
      * 省医GDSRMYY-100需求:
      * 创建临床科室的科室申领过滤的sql
      * 今天提交或者没提交的,今天之前提交的且回收状态处于待回收,部分回收;发货状态处于待发货,部分发货;归还状态处于未归还,部分归还,归还待确认;
Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
===================================================================
diff -u -r22443 -r22523
--- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js	(.../config.js)	(revision 22443)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js	(.../config.js)	(revision 22523)
@@ -24,7 +24,12 @@
   // 申请界面是否隐藏器械包价格
   hideToussePriceColumn : false,
   // 申请界面是否隐藏一次性物品价格
-  hideDisposablePriceColumn : false,  
+  hideDisposablePriceColumn : false,
+  //科室申领状态筛选过滤条件的项（items：需要筛选的项，defaultValue：筛选的默认值）
+  quickQueryForApply: {
+	  items: [['全部'],['未完成'],['已完成']],
+	  defaultValue: '未完成'
+  },
   // 条码类型：1：一维码， 2：二维码
   barcodeType : 1,
   // 申请器械包时是否自动归还待归还物品
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
===================================================================
diff -u -r22371 -r22523
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 22371)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 22523)
@@ -156,12 +156,16 @@
     <input type="hidden" id="parm_s_startTime" name="parm_s_startTime" >
     <input type="hidden" id="parm_s_endTime" name="parm_s_endTime" >
     <input type="hidden" id="parm_s_timeSearchFmt" name="parm_s_timeSearchFmt" >
-    <input type="hidden" id="parm_s_status" name="parm_s_status" value="all">
-    <input type="hidden" id="parm_s_departCodes" name="parm_s_departCodes" value="all">
-    <input type="hidden" id="parm_s_tousseGroupId" name="parm_s_tousseGroupId" value="all">
+    <input type="hidden" id="parm_s_status" name="parm_s_status">
+    <input type="hidden" id="parm_s_departCodes" name="parm_s_departCodes">
+    <input type="hidden" id="parm_s_tousseGroupId" name="parm_s_tousseGroupId">
     <input type="hidden" id="parm_s_tousseTypes" name="parm_s_tousseTypes">
     <input type="hidden" id="parm_s_applyType" name="parm_s_applyType">
-    <input type="hidden" id="parm_s_print" name="parm_s_print" value="all">
+    <input type="hidden" id="parm_s_applyDepartmentCode" name="parm_s_applyDepartmentCode">
+    <input type="hidden" id="parm_s_settleAccountsDepartmentCode" name="parm_s_settleAccountsDepartmentCode">
+    <input type="hidden" id="parm_s_goodsType" name="parm_s_goodsType">
+    <input type="hidden" id="parm_s_goodsId" name="parm_s_goodsId">
+    <input type="hidden" id="parm_s_print" name="parm_s_print">
 </form>
 </body>
 
@@ -171,6 +175,17 @@
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
 <script type="text/javascript" src="${ctx}/js/Ext2CompUtil.js"></script>
 <script type="text/javascript">
+var ALL = '全部';
+//设置状态筛选的默认值
+var quickQueryDefaultValue = ALL;
+var quickQueryForApply = sstsConfig.quickQueryForApply;
+if (quickQueryForApply && quickQueryForApply.defaultValue) {
+	quickQueryDefaultValue = quickQueryForApply.defaultValue;
+}
+var parm_s_status = document.getElementById('parm_s_status');
+parm_s_status.value = quickQueryDefaultValue;
+
+
 var curUserName = '${userName}';       //登录用户的全名
 var userCode = '${userCode}';  		   //登录用户的登录名
 var currentOrgUnitName = '${depart}';  //登录用户的当前科室名称
@@ -227,7 +242,6 @@
 }
 var TYPE_SUPPLIER = encodeURIComponent('<%=Supplier.SUPPLIER_TYPE_RENTTOUSSE%>');
 
-var ALL = '全部';
 var tousseType_tousse = '<%=TousseDefinition.PACKAGE_TYPE_INSIDE%>';  //器械包
 var PACKAGE_TYPE_DRESSING = '<%=TousseDefinition.PACKAGE_TYPE_DRESSING%>';  //敷料包
 var tousseType_disinfectGoods = '<%=TousseDefinition.PACKAGE_TYPE_DISINFECTION%>';  //消毒物品
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
===================================================================
diff -u -r22314 -r22523
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 22314)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 22523)
@@ -1894,40 +1894,35 @@
 }
 
 /**
- * 设置自定义过滤条件,用于下拉选择框的筛选
- * @param checkValue 选中的值
- * @param fieldName 页面对应的filedName
- */
-function reloadFilterPara(checkValue, fieldName) {
-    var parm_s_field = document.getElementById('parm_s_' + fieldName)
-	if (parm_s_field){
-        parm_s_field.value = checkValue === 'all' ? '' : checkValue;
-        // grid.getStore().reload();
-        grid.dwrReload();
-	}
-}
-
-/**
  * 根据传过来的值来重新加载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();
 }
 
-/**
- * 设置隐藏域里的时间筛选过滤
- * @param val 要设定的值
- */
-function reloadHiddenField(val) {
-    var submitTime = document.getElementById('parm_s_showSubmitTime');
-    submitTime.value = val;
-    grid.dwrReload();
-}
-
 function reloadTimeField(){
     var startDate = Ext.getCmp("startDate").getValue();
     var endDate = Ext.getCmp("endDate").getValue();
@@ -1947,72 +1942,151 @@
     grid.dwrReload();
 }
 
+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的总宽度
+
 /**
- * 创建搜索的工具栏
- * @param searchComboConfig
- * @returns {[*,*,*,*,*,*,*,string,*]}
+ * 把过滤的tbar加到对应的组内（自适应各个分辨率）.
+ * @param searchTbarArr	需要添加的过滤的tbar
+ * @param width
  */
-function createSearchTbar(searchComboConfig) {
-	var tbar2 = [];
-    if (sstsConfig.recyclingApplicationVersion == 2 || sstsConfig.recyclingApplicationVersion == 3){
-    // if (sstsConfig.recyclingApplicationVersion == 2){
-        tbar2.push({text: '状态筛选:'});
-        tbar2.push(searchComboConfig.quickScreenCombo);
-    }
-    if (sstsConfig.showTimeSearch){
-        var time = [
-            {text: '开始日期:'},
-            {
-                xtype: sstsConfig.timeSearchFmt ? 'datefieldWithMin' : 'datefield',
-                fieldLabel: '开始日期',
-                name: 'startDate',
-                format: sstsConfig.timeSearchFmt || 'Y-m-d',
-                id: 'startDate',
-                readOnly: false,
-                editable: false,
-                width: sstsConfig.timeSearchFmt ? 130 : 100
-            },
-            { text: '结束日期:'},
-            {
-                xtype: sstsConfig.timeSearchFmt ? 'datefieldWithMin' : 'datefield',
-                fieldLabel: '结束日期',
-                name: 'endDate',
-                id: 'endDate',
-                readOnly: false,
-                editable: 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: sstsConfig.timeSearchFmt || 'Y-m-d',
-                width: sstsConfig.timeSearchFmt ? 130 : 100
-            },
-            {
-                xtype: 'button',
-                text: '查询',
-                iconCls: 'icon_search',
-                handler: reloadTimeField
-            }];
-        tbar2 = tbar2.concat(time);
-    }
+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;
+}
 
-    if (sstsConfig.isShowDeptGroup){
-        tbar2.push({text: '按科室分组过滤:'});
-        tbar2.push(searchComboConfig.departmentGroupCombo);
+/**
+ * 创建过滤的tbar（自适应各个分辨率）.
+ */
+function createSearchTbar() {
+	//1、状态筛选(width=165)
+	if (sstsConfig.quickQueryForApply && sstsConfig.quickQueryForApply.items.length > 0) {
+		var quickQuerySearchTbarArr = [];
+		quickQuerySearchTbarArr.push({text: '状态筛选:'});
+		quickQuerySearchTbarArr.push(createQuickQueryCombo());
+		addSearchTbar(quickQuerySearchTbarArr, 165);
 	}
-	if (sstsConfig.isShowTousseGroup){
-        tbar2.push({text: '按器械包分组:'});
-        tbar2.push(searchComboConfig.tousseGroupCombo);
+
+	//2、按时间过滤(width=415)
+	var time = [{text: '开始日期:'},{
+		xtype: sstsConfig.timeSearchFmt ? 'datefieldWithMin' : 'datefield',
+		fieldLabel: '开始日期',
+		name: 'startDate',
+		format: sstsConfig.timeSearchFmt || 'Y-m-d',
+		id: 'startDate',
+	    readOnly: false,
+	    editable: false,
+	    width: sstsConfig.timeSearchFmt ? 120 : 90
+	},{ text: '结束日期:'},{
+		xtype: sstsConfig.timeSearchFmt ? 'datefieldWithMin' : 'datefield',
+		fieldLabel: '结束日期',
+		name: 'endDate',
+		id: 'endDate',
+		readOnly: false,
+		editable: false,
+		format: sstsConfig.timeSearchFmt || 'Y-m-d',
+		    width: sstsConfig.timeSearchFmt ? 120 : 90
+	},{
+		xtype: 'button',
+		text: '查询',
+		iconCls: 'icon_search',
+        handler: reloadTimeField
+	}];
+	addSearchTbar(time, 415);
+	
+	//3、按物品过滤(width=200)
+	var goodsSearchTbarArr = [];
+	goodsSearchTbarArr.push({text: '按物品:'});
+	goodsSearchTbarArr.push(createGoodsCombo());
+	addSearchTbar(goodsSearchTbarArr, 200);
+	
+	//4、按科室分组(width=220)
+	if (sstsConfig.isShowDeptGroup) {
+		var deptGroupSearchTbarArr = [];
+		deptGroupSearchTbarArr.push({text: '按科室分组:'});
+		deptGroupSearchTbarArr.push(createDeptGroupCombo());
+		addSearchTbar(deptGroupSearchTbarArr, 220);
 	}
-	tbar2.push({text: '按器械包类型:'});
-	tbar2.push(searchComboConfig.tousseTypeCombo);
-	if (sstsConfig.accordingToApplyTypeFilter){
-		tbar2.push({text: '按申请单类型:'});
-		tbar2.push(searchComboConfig.applyTypeCombo);
+	
+	//5、按器械包分组(width=235)
+	if (sstsConfig.isShowTousseGroup) {
+		var tousseGroupSearchTbarArr = [];
+		tousseGroupSearchTbarArr.push({text: '按器械包分组:'});
+		tousseGroupSearchTbarArr.push(createTousseGroupCombo());
+		addSearchTbar(tousseGroupSearchTbarArr, 235);
 	}
-	if (sstsConfig.showPrintFilter){
-        tbar2.push({text: '是否已打印过滤:'});
-        tbar2.push(searchComboConfig.printCombo);
-	}
-
-    return tbar2;
+	
+	//6、按器械包类型(width=235)
+	var tousseTypeSearchTbarArr = [];
+	tousseTypeSearchTbarArr.push({text: '按器械包类型:'});
+	tousseTypeSearchTbarArr.push(createTousseTypeCombo());
+	addSearchTbar(tousseTypeSearchTbarArr, 235);
+	
+	//7、按申请单类型(width=235)
+	var applyTypeSearchTbarArr = [];
+	applyTypeSearchTbarArr.push({text: '按申请单类型:'});
+	applyTypeSearchTbarArr.push(createApplyTypeCombo());
+	addSearchTbar(applyTypeSearchTbarArr, 235);
+	
+	//8、按申请科室过滤(width=230)
+	var applyDepartmentSearchTbarArr = [];
+	applyDepartmentSearchTbarArr.push({text: '按申请科室:'});
+	applyDepartmentSearchTbarArr.push(createApplyDepartmentCombo());
+	addSearchTbar(applyDepartmentSearchTbarArr, 230);
+	
+	//9、按结算科室过滤(width=230)
+	var settleAccountsDepartmentSearchTbarArr = [];
+	settleAccountsDepartmentSearchTbarArr.push({text: '按结算科室:'});
+	settleAccountsDepartmentSearchTbarArr.push(createSettleAccountsDepartmentCombo());
+	addSearchTbar(settleAccountsDepartmentSearchTbarArr, 230);
+	
+	//10、是否已打印(width=150)
+	var printSearchTbarArr = [];
+	printSearchTbarArr.push({text: '是否已打印:'});
+	printSearchTbarArr.push(createPrintCombo());
+	addSearchTbar(printSearchTbarArr, 150);
 }
 
 /**
@@ -2021,15 +2095,14 @@
  * @returns {[*,*,*,*,*]}
  */
 function createOperationTbar(isFirstSupplyRoomUser) {
-    return [
-        {
-            text: '借物',
-            iconCls: 'btn_ext_add_tousse',
-            hidden: SSTS_borrow_Create || (sstsConfig.hideClinicalDepartmentApplyButton && !isFirstSupplyRoomUser),
-            handler: function () {
-                addAndEditTousseLease('');
-            }
-        }, {
+    return [{
+	        text: '借物',
+	        iconCls: 'btn_ext_add_tousse',
+	        hidden: SSTS_borrow_Create || (sstsConfig.hideClinicalDepartmentApplyButton && !isFirstSupplyRoomUser),
+	        handler: function () {
+	            addAndEditTousseLease('');
+	        }
+    	},{
             text: '删除',
             id : 'deleteBtn',
             iconCls: 'btn_ext_application_del',
@@ -2205,29 +2278,88 @@
 }
 
 /**
+ * 创建状态筛选的combo.
+ * @returns
+ */
+function createQuickQueryCombo() {
+	return  {
+		xtype: 'multiSelect',
+		store: new Ext.data.SimpleStore({
+		    fields: ['value'],
+		    data: sstsConfig.quickQueryForApply.items
+		}),
+		width: 100,
+		listWidth: 100,
+		mode: 'local',
+		triggerAction: 'all',
+		valueField: 'value',
+		displayField: 'value',
+		id: 'quickQueryCombo',
+		name: 'quickQueryCombo',
+		forceSelection: false,
+		readOnly: true,
+		value: sstsConfig.quickQueryForApply.defaultValue,
+		listeners : {
+			select: function (combo, record, index) {
+				//1、如果选中“全部”的项，则把所有的项选中，反之全部取消选择
+				if (record.get('value') == ALL) {
+					if (record.get(this.checkField)) {
+						combo.selectAll()
+					} else {
+						combo.deselectAll()
+					}
+				}
+				
+				//2、如果已经选中所有的项，则把“全部”项选中，反之把“全部”项取消选择
+				var selectAll = true;
+				combo.store.each(function(record) {
+					if (record.get('value') != ALL && !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_status');
+			}
+		}
+	};
+}
+
+/**
  * 创建按科室分组下拉选项
  * @returns
  */
 function createDeptGroupCombo() {
-    var deptGroupStoreConfig = {
-        url : WWWROOT + '/disinfectSystem/baseData/departmentGroupAction!loadDeptGroup.do',
-        model :  [
-            {name: 'departCodes', mapping: 'valueField'},
-            {name: 'name', mapping: 'displayField'}
-        ]
+	var deptGroupStoreConfig = {
+			url : WWWROOT + '/disinfectSystem/baseData/departmentGroupAction!loadDeptGroup.do',
+			model :  [
+			          {name: 'departCodes', mapping: 'valueField'},
+			          {name: 'name', mapping: 'displayField'}
+			          ]
 	}
-    return createCombo({
-        fieldLabel: '按科室分组过滤',
-        displayField: 'name',
-        valueField: 'departCodes',
-        storeConfig : deptGroupStoreConfig,
-        width : 150,
-        listeners: {
-            select: function (combo, record, index) {
-                var deptGroupId = record.get('departCodes');
-                reloadConditionPara(deptGroupId, 'parm_s_departCodes');
-            }
-        }
+	
+	return createCombo({
+		id: 'deptGroup',
+        name: 'deptGroup',
+		fieldLabel: '按科室分组',
+		displayField: 'name',
+		valueField: 'departCodes',
+		storeConfig : deptGroupStoreConfig,
+		width : 150,
+		listeners: {
+			select: function (combo, record, index) {
+				var deptGroupId = record.get('departCodes');
+				reloadConditionPara(deptGroupId, 'parm_s_departCodes');
+			}
+		}
 	});
 }
 
@@ -2244,7 +2376,9 @@
         ]
 	}
 	return createCombo({
-        xtype: 'multiSelect',
+		id: 'touseGroup',
+        name: 'touseGroup',
+		xtype: 'multiSelect',
         storeConfig : touseGroupStoreConfig,
         fieldLabel: '按器械包分组',
         displayField: 'tousseGroupName',
@@ -2253,14 +2387,33 @@
         forceSelection : false,
 	    listeners: {
 		   select: function (combo, record, index) {
-			   if (record.get('tousseGroupName') == '全部') {
+			 //1、如果选中“全部”的项，则把所有的项选中，反之全部取消选择
+				if (record.get('tousseGroupName') == ALL) {
 					if (record.get('checked')) {
 						combo.selectAll()
 					} else {
 						combo.deselectAll()
 					}
-			   }
-			   reloadConditionPara(combo.getValue(), 'parm_s_tousseGroupId');
+				}
+				
+				//2、如果已经选中所有的项，则把“全部”项选中，反之把“全部”项取消选择
+				var selectAll = true;
+				combo.store.each(function(record) {
+					if (record.get('tousseGroupName') != ALL && !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_tousseGroupId');
 		   }
 	    }
 	});
@@ -2276,6 +2429,8 @@
         model : [{name: 'tousseType', mapping: 'tousseType'}]
 	}
 	return createCombo({
+		id: 'touseType',
+        name: 'touseType',
 		xtype : 'multiSelect',
 		fieldLabel : '按器械包类型',
 		valueField : 'tousseType',
@@ -2332,6 +2487,8 @@
 		model : [{name: 'applyType', mapping: 'applyType'}]
 	}
 	return createCombo({
+		id: 'applyType',
+        name: 'applyType',
 		xtype: 'multiSelect',
 		storeConfig : applyTypeStoreConfig,
 		fieldLabel: '按申请单类型',
@@ -2378,56 +2535,174 @@
         triggerAction: 'all',
         displayField: 'val',
         forceSelection: true,
-        value: '全部',
         editable: false,
         listeners : {
             select : function(combo, record, index){
                 var key = record.get('key');
-                reloadFilterPara(key, 'print');
+                reloadConditionPara(key, 'parm_s_print');
             }
         }
     };
     return printCombo;
 }
 
 /**
- * 根据storeConfig的配置创建extJs2的store
- * @param storeConfig 创建store的配置
- * @returns {Ext.data.Store}
+ * 创建申请科室的过滤条件.
+ * @returns
  */
-function createStore(storeConfig) {
-    return 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
-        )
-    });
+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');
+			}
+		}
+	});
+}
+
+///**
+// * 根据storeConfig的配置创建extJs2的store
+// * @param storeConfig 创建store的配置
+// * @returns {Ext.data.Store}
+// */
+//function createStore(storeConfig) {
+//    return 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
+//        )
+//    });
+//}
+
+/**
  * 创建下拉选项统一方法(xtype可以是combo或者multiSelect,如果要使用multiSelect则要引入multiSelect的js和css)
  * @param comboConfig 下拉选项的配置
  * @returns
  */
 function createCombo(comboConfig) {
-    return {
+	var storeConfig = comboConfig.storeConfig;
+	return {
         xtype: comboConfig.xtype || 'combo',
+        id: comboConfig.id,
+        name: comboConfig.name,
         fieldLabel: comboConfig.fieldLabel,
-        store: createStore(comboConfig.storeConfig),
+        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: '全部',
-        editable: false,
+        value: (comboConfig.value == null ? '' : comboConfig.value),
+        editable: comboConfig.editable,
+        queryParam : comboConfig.queryParam ? comboConfig.queryParam : 'spell',
+		minChars : comboConfig.minChars ? comboConfig.minChars : 0,
         listeners: comboConfig.listeners
     };
 }
@@ -2667,76 +2942,8 @@
 		]
 	});
 
-    //状态筛选combo Store
-    var quickScreenStatus = new Ext.data.SimpleStore({
-        fields: ['key', 'val'],
-        data: [
-            ['unFinish', '未完成'],
-            ['finish', '已完成'],
-            ['all', '全部']
-        ]
-    });
-
-    //状态筛选combo
-    var quickScreenCombo = {
-        xtype: 'combo',
-        fieldLabel: '状态筛选',
-        store: quickScreenStatus,
-        width: 80,
-        mode: 'local',
-        triggerAction: 'all',
-        displayField: 'val',
-        forceSelection: true,
-		hidden : sstsConfig.recyclingApplicationVersion != 2 && sstsConfig.recyclingApplicationVersion != 3,
-        value: '未完成',
-        editable: false,
-        listeners : {
-            select : function(combo, record, index){
-                var key = record.get('key');
-                // var val = record.get('val');
-                // var array = [val];
-                reloadFilterPara(key, 'status');
-            }
-        }
-    };
-
-
-	//时间筛选combo Store
-	var submitTimeStatus = new Ext.data.SimpleStore({
-		fields: ['key', 'val'],
-		data: [['all', '全部'], ['threeDay', '近三天'],['oneWeek','近一周'],['threeMonth','近三个月']]
-	});
-
-	//时间筛选combo
-	var submitTimeCombo = {
-		xtype: 'combo',
-		fieldLabel: '时间筛选',
-		// emptyText:'请选择申请单日期',
-		store: submitTimeStatus,
-		width: 80,
-		mode: 'local',
-		triggerAction: 'all',
-		displayField: 'val',
-		forceSelection: true,
-		value: '全部',
-		editable: false,
-		listeners : {
-			select : function(combo, record, index){
-				var condition = record.get('key');
-				reloadHiddenField(condition);
-			}
-		}
-	};
-
 	//搜索的tbar
-    var searchTbar = createSearchTbar({
-        quickScreenCombo : quickScreenCombo,
-        departmentGroupCombo : createDeptGroupCombo(),
-        tousseGroupCombo : createTousseGroupCombo(),
-        tousseTypeCombo : createTousseTypeCombo(),
-        applyTypeCombo : createApplyTypeCombo(),
-	    printCombo : createPrintCombo()
-    });
+    createSearchTbar();
 
     //操作的tbar
     var operationTbar = createOperationTbar(isFirstSupplyRoomUser);
@@ -2825,12 +3032,6 @@
 	}
 
 
-    // 省医要求:如果是科室申领,默认申请单是未提交状态(省医才有版本2和版本3)
-	if ((recyclingApplicationVersion == 2 || recyclingApplicationVersion == 3) && listType != 'all'){
-		document.getElementById("parm_s_status").value = 'unFinish';
-	}
-
-
 	//如果不是用版本2且不是版本3或者是在高级视图的全部申请单打开或者不是临床科室则按原来的显示
 	if ((recyclingApplicationVersion != 2 && recyclingApplicationVersion != 3) || listType == 'all' || isCssdUser == "true"){
 		grid = new Ext.ux.ForgonPageGrid({
@@ -2856,25 +3057,35 @@
                             new Ext.Toolbar({items: operationTbar}).render(this.tbar);
                         }
                         //搜索的工具栏另开一行,当工具栏的数组长度大于0才渲染到grid上
-						if (searchTbar.length > 0){
-                            new Ext.Toolbar({items: searchTbar}).render(this.tbar);
+//						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);
+						}
                     }
                 }
 			},
 			readerDetail,
 			RecyclingApplicationTableManager.findRecyclingApplicationTableList,
 			null
 		);
-
-
-		if (sstsConfig.showTimeSearch){
-			//如果开始日期为当天则设置开始时间为当天,否则设置开始时间为服务器当天当月第一天
-            sstsConfig.startDateIsToday ? getServerTime('yyyy-MM-dd', Ext, 'startDate') : getServerTime('yyyy-MM-dd', Ext, 'startDate', null, WWWROOT + '/system/serverTimeAction!getFirstDay.do');
-            //设置结束时间为服务器当天时间
-            getServerTime('yyyy-MM-dd',Ext,'endDate');
-		}
-
+		
+		//如果开始日期为当天则设置开始时间为当天,否则设置开始时间为服务器当天当月第一天
+        sstsConfig.startDateIsToday ? getServerTime('yyyy-MM-dd', Ext, 'startDate') : getServerTime('yyyy-MM-dd', Ext, 'startDate', null, WWWROOT + '/system/serverTimeAction!getFirstDay.do');
+        //设置结束时间为服务器当天时间
+        var format = sstsConfig.timeSearchFmt ? 'yyyy-MM-dd HH:mm' : 'yyyy-MM-dd';
+        getServerTime(format,Ext,'endDate');
+        
 		var tableContent;
 		if (mouseHoverEventOfApply != '否') {
 			grid.on('mouseover', function(e) {// 添加mouseover事件
Index: ssts-web/src/main/webapp/disinfectsystem/config/jmszxyy/config.js
===================================================================
diff -u -r22437 -r22523
--- ssts-web/src/main/webapp/disinfectsystem/config/jmszxyy/config.js	(.../config.js)	(revision 22437)
+++ ssts-web/src/main/webapp/disinfectsystem/config/jmszxyy/config.js	(.../config.js)	(revision 22523)
@@ -16,6 +16,11 @@
   barcodeType : 1,
   // 申请器械包时是否自动归还待归还物品
   autoReturnTousse : false,
+  //科室申领状态筛选过滤条件的项（items：需要筛选的项，defaultValue：筛选的默认值）
+  quickQueryForApply: {
+	  items: [['全部'],['部分回收'],['已回收'],['已发货'],['已终止']],
+	  defaultValue: '全部'
+  },
   // 是否隐藏进入审核列表按钮
   hideEnterReviewListButton : false,
   // 是否自动补全用户名