Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CRM

zkqy-ui/src/views/bussiness/progressShow.vue

@@ -29,7 +29,7 @@
           </div>
           <div class="search-input">
             <el-input placeholder="请输入..." v-model="queryString">
-              <el-button slot="append" icon="el-icon-search"></el-button>
+              <el-button slot="append" @click="getList" icon="el-icon-search"></el-button>
             </el-input>
           </div>
         </div>