Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/profitable/warehouseinventory.vue

@@ -12,10 +12,10 @@
     <div class="center">
       <el-row style='margin-bottom:10px;'>
         <el-col :span="12">
-         <ws-select v-model="warehouseName" placeholder="" class="typeselect" @change="selectwarehouse">
-          <ws-option v-for="item in warehouse" :key="item.warehouseName" :label="item.warehouseName" :value="item.warehouseName"
+         <el-select v-model="warehouseName" filterable clearable placeholder="" @change="selectwarehouse" :value="searchType">
+          <el-option v-for="item in warehouse" :key="item.warehouseName" :label="item.warehouseName" :value="item.warehouseName"
             style="color: #8890b1" />
-        </ws-select>
+        </el-select>
         </el-col>
         <el-col :span="12">
           <div class="datascreen">