Merge pull request '妙选ERP：商品规格：增加可售库存的区间筛选（最小值-最大值的筛选）' (#5) from yyw into master

Reviewed-on: #5

src/views/commodity/sku.vue

@@ -9,6 +9,14 @@
           </el-select>
         </div>
       </div>
+      <div class="row">
+        <span class="span">商品品牌：</span>
+        <div class="right">
+          <el-select v-model="brandIds" placeholder="请选择" clearable class="wid100" filterable multiple collapse-tags>
+            <el-option v-for="it in brandList" :key="it.id" :label="it.name" :value="it.id" />
+          </el-select>
+        </div>
+      </div>
       <div class="row">
         <span class="span">规格名称：</span>
         <div class="right"><el-input v-model="filter.title" class="wid100" clearable></el-input></div>
@@ -25,6 +33,13 @@
           </el-select>
         </div>
       </div>
+      <div class="row">
+        <span class="span">可售库存：</span>
+        <div class="right">
+          <el-input v-model="filter.min_available_inventory" class="wid100" clearable></el-input>&nbsp;~&nbsp;
+          <el-input v-model="filter.max_available_inventory" class="wid100" clearable></el-input>
+        </div>
+      </div>
       <div class="row">
         <span class="span">状态：</span>
         <div class="right">
@@ -172,7 +187,9 @@ export default {
       goodsList: [],
       itemInfo: {},
       role: localStorage.getItem('roleName') == '爆品运营',
-      goodsIds: []
+      goodsIds: [],
+      brandIds: [],
+      brandList: []
     })
 
     function handleSearch() {
@@ -187,6 +204,7 @@ export default {
         pageSize: data.pageSize,
         service_id: data.service_id,
         ...data.filter,
+        brand_ids: data.brandIds.join(','),
         goods_ids: data.goodsIds.join(',')
       }
       get(`/api/goods-skus`, params).then((res) => {
@@ -293,10 +311,17 @@ export default {
       })
     }
 
+    function getBrandList() {
+      get(`/api/all/brands`).then((res) => {
+        data.brandList = res.data
+      })
+    }
+
     onMounted(() => {
       fetchData()
       getWarehouseList()
       getGoodsList()
+      getBrandList()
     })
 
     return {
@@ -310,7 +335,8 @@ export default {
       handleUpload,
       commitOpa,
       getWarehouseList,
-      getGoodsList
+      getGoodsList,
+      getBrandList
     }
   }
 }
@@ -342,6 +368,8 @@ export default {
       }
       .right{
         width: calc(100% - 100px);
+        display: flex;
+        align-items: center;
       }
       .wid100{
         width: 100%;