commit

04.系统编码/App/App.csproj

@@ -159,6 +159,7 @@
     <Content Include="Content\images\clear-hover.png" />
     <Content Include="Content\images\clear.png" />
     <Content Include="Content\images\divider-line.png" />
+    <Content Include="Content\images\drop-down.png" />
     <Content Include="Content\images\edit-hover.png" />
     <Content Include="Content\images\edit.png" />
     <Content Include="Content\images\icon-calc.png" />

04.系统编码/App/Content/scripts/system-management/user-management/index.js

@@ -9,6 +9,7 @@
         $('#manage').addClass('active');
 
         this.ReLayout();
+        this.InitOrgList();
         this.InitDataGrid();
         this.ReLoadTableData();
         
@@ -33,6 +34,27 @@
         $('.manage-table, .manage-table .datagrid').height(height - 109);
     };
 
+    this.InitOrgList = function () {
+        $.ajax({
+            type: "POST",
+            dataType: 'text',
+            url: '/OrgManagement/Query',
+            data: {
+                pageIndex: 1,
+                pageSize: 10000
+            },
+            success: function (result) {
+                console.log(JSON.parse(result));
+                $('#org-list').combobox({
+                    valueField: 'Id',
+                    textField: 'Name',
+                    data: JSON.parse(result).rows
+
+                });
+            }.bind(this)
+        });
+    };
+
     this.InitDataGrid = function () {
         $('#task-grid').datagrid({
             columns: [[
@@ -67,7 +89,6 @@
                 pageSize: 10
             },
             success: function (result) {
-                console.log(JSON.parse(result))
                 $('#task-grid').datagrid('loadData', JSON.parse(result));
             }.bind(this)
         });

04.系统编码/App/Content/styles/common.css

@@ -462,6 +462,18 @@
     margin-top: 0;
 }
 
+.user-toolbar .params-select .tip {
+    line-height: 28px;
+}
+
+.user-toolbar .combo-arrow {
+    background: url("../images/drop-down.png") no-repeat;
+}
+
+.user-toolbar .org-list {
+    width: 150px;
+}
+
 .delete-user-dialog .dialog-title h2 {
     background: none !important;
     padding-left: 14px;

04.系统编码/App/Views/UserManagement/Index.cshtml

@@ -33,7 +33,7 @@
             </div>*@
             <div class="params-select">
                 <span class="tip">机构名称</span>
-                <input id="org-list" name="dept" value="aa">
+                <input id="org-list" class="easyui-combobox org-list">
                 <button type="button" class="btn query-btn" id="query-btn">查询</button>
             </div>
         </div>