Merge branch 'dev' into 'master'

sku 筛选

See merge request !41

src/views/system/sku-sort.vue

@@ -185,6 +185,9 @@
       width="800px"
       width="800px"
       :close-on-click-modal="false"
       :close-on-click-modal="false"
       title="选择属性">
       title="选择属性">
+      <div class="filter" style="margin-bottom: 10px">
+        <el-input placeholder="请输入属性类名称" clearable v-model="filterVal"></el-input>
+      </div>
       <div class="product-prop">
       <div class="product-prop">
         <div
         <div
           class="product-prop_item"
           class="product-prop_item"
@@ -271,6 +274,7 @@ export default {
         currentPage: 1,
         currentPage: 1,
         total: 0
         total: 0
       },
       },
+      filterVal: '',
       selectProps: []
       selectProps: []
     }
     }
   },
   },
@@ -353,7 +357,7 @@ export default {
           enname: item.enname,
           enname: item.enname,
           children: []
           children: []
         }
         }
-        const current = properties.find((e) => e.code === item.cateCode)
+        const current = properties.find((e) => e.code === item.cateCode && item.cnname.includes(this.filterVal))
         if (current) {
         if (current) {
           current.children.push(item)
           current.children.push(item)
         } else {
         } else {
@@ -361,6 +365,10 @@ export default {
           properties.push(prop)
           properties.push(prop)
         }
         }
       })
       })
+      console.log(properties)
+      properties.forEach(el => {
+        el.children = el.children.filter(item => item.cnname.includes(this.filterVal))
+      })
       return properties
       return properties
     }
     }
   },
   },