Merge branch 'master' of http://git.echepei.com/wengyuwen/anpinjingyuan-ui

src/combination/listComponent.vue

@@ -4,6 +4,7 @@
       <div style="margin: 10px 12px;float: left;">
         <el-button
           v-for="(item,index) in customButton"
+          :key="index"
           :type="item.type"
           :size="item.size"
           :icon="item.icon"
@@ -85,7 +86,7 @@
             </span>
           </span>
           <span v-else-if="item.changeable && listData">
-            <el-select v-if="item.changeable == 1" :disabled="item.disabled" @change="change(scope)" v-model="scope.row[item.label]" slot="prepend" placeholder="请选择">
+            <el-select v-if="item.changeable == 1" filterable :disabled="item.disabled" @change="change(scope)" v-model="scope.row[item.label]" slot="prepend" placeholder="请选择">
               <el-option
                 v-for="(item,index) in listData[item.label]"
                 :key="index"