作者 朱兆平

update:

1. 用户界面增加状态查询条件
@@ -14,8 +14,9 @@ @@ -14,8 +14,9 @@
14 </el-input> 14 </el-input>
15 </el-form-item> 15 </el-form-item>
16 <el-form-item> 16 <el-form-item>
  17 + <div class="my-text-area">
  18 + <div class="el-input-group__prepend prepand">状态</div>
17 <el-select v-model="filters.userStatus" 19 <el-select v-model="filters.userStatus"
18 - default-first-option  
19 clearable placeholder="请选择" style="width: 225px"> 20 clearable placeholder="请选择" style="width: 225px">
20 <el-option 21 <el-option
21 v-for="item in userStatusOption" 22 v-for="item in userStatusOption"
@@ -25,6 +26,7 @@ @@ -25,6 +26,7 @@
25 > 26 >
26 </el-option> 27 </el-option>
27 </el-select> 28 </el-select>
  29 + </div>
28 </el-form-item> 30 </el-form-item>
29 <el-form-item> 31 <el-form-item>
30 <el-button type="primary" v-on:click="getUsers" icon="el-icon-search">查询</el-button> 32 <el-button type="primary" v-on:click="getUsers" icon="el-icon-search">查询</el-button>
@@ -265,7 +267,7 @@ @@ -265,7 +267,7 @@
265 filters: { 267 filters: {
266 userName: '', 268 userName: '',
267 realName: '', 269 realName: '',
268 - userStatus: 1 270 + userStatus: undefined
269 }, 271 },
270 treeDefaultProps: { 272 treeDefaultProps: {
271 children: 'children', 273 children: 'children',
@@ -670,3 +672,29 @@ @@ -670,3 +672,29 @@
670 } 672 }
671 673
672 </style> 674 </style>
  675 +<style scoped>
  676 + .toolbar{
  677 + height: 60px;
  678 + background-color: white;
  679 + /*line-height: 60px;*/
  680 + vertical-align: middle;
  681 + border-radius: 5px 5px 5px 5px;
  682 + padding: 15px 0 0 20px;
  683 + box-shadow: 0px 5px 5px #e5e8eb;
  684 + }
  685 + .my-text-area .prepand{
  686 + float: left;
  687 + width:89px;
  688 + height: 28px;
  689 + font-size: 12px;
  690 + line-height: 28px;
  691 + }
  692 +</style>
  693 +<style>
  694 + .my-text-area .el-textarea__inner{
  695 + min-height: 28px;
  696 + height: 28px;
  697 + border-bottom-left-radius: 0;
  698 + border-top-left-radius: 0;
  699 + }
  700 +</style>