Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui

src/views/system/auditConfiguration/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form inline :model="dataForm">
       <el-form-item>
-        <el-select v-model="dataForm.actId" placeholder="请选择活动名" filterable @change="getDataList()">
+        <el-select v-model="dataForm.actId" placeholder="请选择活动名" clearable filterable @change="getDataList()">
           <el-option
             v-for="item in actList"
             :key="item.actId"
@@ -12,6 +12,9 @@
         </el-select>
       </el-form-item>
       <el-form-item>
+        <el-button icon="el-icon-refresh-left" @click="getDataList">搜索</el-button>
+      </el-form-item>
+      <el-form-item>
         <el-button icon="el-icon-refresh-left" @click="resetSearch">重置</el-button>
       </el-form-item>
       <el-form-item>