From 3befbf327b354eacdf7a2a51ec4838cc41addef2 Mon Sep 17 00:00:00 2001
From: Argo-Lenovo <Argo@163.com>
Date: Sat, 5 Nov 2016 18:43:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E8=A1=A8=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E5=85=B8=E5=88=86=E9=A1=B9=E3=80=81?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=90=8D=E7=A7=B0=E3=80=81=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E7=B1=BB=E5=88=AB=E6=9F=A5=E8=AF=A2=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bootstrap.Admin/Models/QueryDictOption.cs |  8 ++++++++
 Bootstrap.Admin/Scripts/Dicts.js          |  2 +-
 Bootstrap.Admin/Views/Admin/Dicts.cshtml  | 20 ++++++++++++--------
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/Bootstrap.Admin/Models/QueryDictOption.cs b/Bootstrap.Admin/Models/QueryDictOption.cs
index 92a414c1..60d4ec8a 100644
--- a/Bootstrap.Admin/Models/QueryDictOption.cs
+++ b/Bootstrap.Admin/Models/QueryDictOption.cs
@@ -6,6 +6,10 @@ namespace Bootstrap.Admin.Models
 {
     public class QueryDictOption : PaginationOption
     {
+        /// <summary>
+        /// 字典分项
+        /// </summary>
+        public string Category { get; set; }
         /// <summary>
         /// 字典名称
         /// </summary>
@@ -21,6 +25,10 @@ namespace Bootstrap.Admin.Models
         public QueryData<Dict> RetrieveData()
         {
             var data = DictHelper.RetrieveDicts();
+            if (!string.IsNullOrEmpty(Category))
+            {
+                data = data.Where(t => t.Category.Contains(Category));
+            }
             if (!string.IsNullOrEmpty(Name))
             {
                 data = data.Where(t => t.Name.Contains(Name));
diff --git a/Bootstrap.Admin/Scripts/Dicts.js b/Bootstrap.Admin/Scripts/Dicts.js
index 0b98cfe6..b80869dc 100644
--- a/Bootstrap.Admin/Scripts/Dicts.js
+++ b/Bootstrap.Admin/Scripts/Dicts.js
@@ -15,7 +15,7 @@
     $('table').smartTable({
         url: '../api/Dicts',            //请求后台的URL（*）
         sortName: 'Category',
-        queryParams: function (params) { return $.extend(params, { name: $("#txt_dict_name").val(), define: $("#txt_dict_cate").val() }); },
+        queryParams: function (params) { return $.extend(params, { category: $('#txt_dict_cate').val(), name: $("#txt_dict_name").val(), define: $("#txt_dict_define").val() }); },
         columns: [{ checkbox: true },
             { title: "Id", field: "ID", events: bsa.idEvents(), formatter: BootstrapAdmin.idFormatter },
             { title: "字典分项", field: "Category", sortable: true },
diff --git a/Bootstrap.Admin/Views/Admin/Dicts.cshtml b/Bootstrap.Admin/Views/Admin/Dicts.cshtml
index 86072446..53edc9fe 100644
--- a/Bootstrap.Admin/Views/Admin/Dicts.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Dicts.cshtml
@@ -14,21 +14,25 @@
 }
 @section query {
     <form class="form-inline" role="form">
-        <div class="form-group col-lg-5">
-            <label class="control-label" for="txt_dict_name">字典分项</label>
+        <div class="form-group col-lg-3">
+            <label class="control-label" for="txt_dict_cate">字典分项</label>
+            <input type="text" class="form-control" id="txt_dict_cate" />
+        </div>
+        <div class="form-group col-lg-3">
+            <label class="control-label" for="txt_dict_name">字典名称</label>
             <input type="text" class="form-control" id="txt_dict_name" />
         </div>
-        <div class="form-group col-lg-5">
-            <label class="control-label" for="txt_dict_cate">字典类别</label>
-            <input type="text" class="form-control hide" id="txt_dict_cate" />
+        <div class="form-group col-lg-3">
+            <label class="control-label" for="txt_dict_define">字典类别</label>
+            <input type="text" class="form-control hide" id="txt_dict_define" />
             <div class="btn-group">
-                <button type="button" class="btn btn-default">未选择</button>
+                <button type="button" class="btn btn-default">全部</button>
                 <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
                     <span class="caret"></span>
                     <span class="sr-only">下拉按钮</span>
                 </button>
                 <ul class="dropdown-menu" role="menu">
-                    <li><a href="#" data-val="">未选择</a></li>
+                    <li><a href="#" data-val="">全部</a></li>
                     <li><a href="#" data-val="1">自定义</a></li>
                     <li><a href="#" data-val="0">系统使用</a></li>
                 </ul>
@@ -59,7 +63,7 @@
                 <label class="control-label" for="dictCode">字典代码</label>
                 <input type="text" class="form-control" id="dictCode" name="dictCode" maxlength="50" />
             </div>
-            <div class="form-group col-lg-6">
+            <div class="form-group col-lg-2">
                 <label class="control-label" for="dictDefine">字典类别</label>
                 <input type="text" class="form-control" id="dictDefine" name="dictDefine" maxlength="50" />
             </div>