Authored by 王涛

Merge branch 'master-v32-lushangqing' into 'master'

忙时配置功能输入框宽度更改 #1



See merge request !666
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="cm-card" :style="{'min-height':height+'px','max-height':height+'px','height':'100%'}"> 2 <div class="cm-card" :style="{'min-height':height+'px','max-height':height+'px','height':'100%'}">
3 <div class="search" style="margin:6px 0;"> 3 <div class="search" style="margin:6px 0;">
4 <div class="condition"> 4 <div class="condition">
5 - <el-input :size="$global.elementConfig.size.input" v-model="search.keyWords" placeholder="请输入关键字"></el-input> 5 + <el-input :size="$global.elementConfig.size.input" style="width:180px;" v-model="search.keyWords" placeholder="请输入关键字"></el-input>
6 <el-button :size="$global.elementConfig.size.button" type="primary" style="margin-left: 6px;" @click="getDataList">查询</el-button> 6 <el-button :size="$global.elementConfig.size.button" type="primary" style="margin-left: 6px;" @click="getDataList">查询</el-button>
7 <el-button :size="$global.elementConfig.size.button" type="primary" @click="addConfig">新增</el-button> 7 <el-button :size="$global.elementConfig.size.button" type="primary" @click="addConfig">新增</el-button>
8 <el-button :size="$global.elementConfig.size.button" type="primary" @click="delConfig">删除</el-button> 8 <el-button :size="$global.elementConfig.size.button" type="primary" @click="delConfig">删除</el-button>