Merge branch 'bugfix/门店筛选' into test

src/components/relatePop.vue

@@ -4,9 +4,10 @@
     :key="updateDialog"
     :visible.sync="dialogTableVisible"
     :before-close="closePop"
+    :append-to-body="true"
     :width="$store.state.product.ruleMemberFilterClose==0?'1200px':'900px'"
   >
-    <el-tabs v-model="activeName" @tab-click="handleClick">
+    <el-tabs v-model="activeName" >
       <el-tab-pane label="上架规则" name="list">
         <div class="tab-pane-container">
           <div class="search-wrap">

src/components/ruleDetail.vue

@@ -80,8 +80,11 @@
       @editShow="hasEditGicPeople=true"
     />
       <el-form-item v-show="ruleForm.memberType === 2" prop="selectedGroupIds" >
-          <el-button v-if="!selectedGroupIds" size="small" @click="groupVisible = true">添加分组</el-button>
-          <gic-new-member-group :visiable.sync="groupVisible" :selectedIds="selectedGroupIds" @change="confirmGroupDialog" />
+          <el-button v-if="!selectedGroupIds" size="small" @click="addMemberGroup">添加分组</el-button>
+          <gic-new-member-group :visiable.sync="groupVisible"
+              :selectedIds="selectedGroupIds"
+              @change="confirmGroupDialog"
+              ref="newMemberGroup"/>
       </el-form-item>
     <div>
       <el-form-item style="margin-top:50px" v-show="!isDialog">
@@ -151,6 +154,7 @@ export default {
       btnLoading: false,
       uuid: '',
       memberTypeTotal: 0,
+
     };
   },
   computed: {
@@ -165,7 +169,7 @@ export default {
       }
     },
     canShowStoreSelector () {
-      return this.uuid || this.isAdd || this.memberType == 3 || this.memberType == 2;
+      return this.isDialog || this.uuid || this.isAdd || this.memberType == 3 || this.memberType == 2;
     },
   },
   mounted () {
@@ -176,6 +180,9 @@ export default {
     this.memberTypeNum();
   },
   methods: {
+    addMemberGroup () {
+      this.groupVisible = true;
+    },
     /** 门店筛选器 */
     storeChange (storeId) {
       this.uuid = storeId;