Merge branch 'master' of http://159.75.201.17:3000/zwq/tuanfeng-pc-mer

src/views/commodity/commoditySystem/addCommodity.vue

@@ -54,11 +54,21 @@
             </el-form-item>
 
             <el-form-item label="商品分组" prop="shopGroupId">
-              <el-select v-model="form.shopGroupId" placeholder="请选择商品分组" clearable>
-                <el-option
-                  v-for="(item, index) in groupList" :key="index" :label="item.groupName"
-                  :value="item.shopGroupId"
-                />
+              <el-cascader
+                v-model="form.shopGroupId" :options="groupList" clearable :props="{
+                  checkStrictly: false,
+                  label: 'groupName',
+                  value: 'shopGroupId',
+                  children: 'childs',
+                  checkStrictly: true,
+                  emitPath: false
+                }"
+              />
+              <!-- <el-select v-model="form.shopGroupId" placeholder="请选择商品分组" clearable>
+                <el-option                  @change="handleChangeCascader"
+                v-for="(item, index) in groupList" :key="index" :label="item.groupName"
+                :value="item.shopGroupId"
+                /> -->
               </el-select>
             </el-form-item>
             <el-form-item label="品牌">