Merge branch 'bugfix/5-11修改bug'

src/view/memberGroup/memberGroupEdit.vue

@@ -126,9 +126,9 @@
               ></el-input>
             </el-form-item>
             <el-form-item label :class="{'m-l-60': ruleForm.selectedTags.length > 1}">
-              <div class="tips-count" style="color: red;margin-bottom: 15px;" v-show="!(ruleForm.fixedType && !ruleForm.isTogether) && ruleForm.isActive == 0 && realCount.totalCount <= realCount.currCount">
+              <!-- <div class="tips-count" style="color: red;margin-bottom: 15px;" v-show="!(ruleForm.fixedType && !ruleForm.isTogether) && ruleForm.isActive == 0 && realCount.totalCount <= realCount.currCount">
                 您的非实时会员分组数量已达上限{{realCount.totalCount}}，建议您删除或失效部分非实时会员分组！
-              </div>
+              </div> -->
               <template v-if="hasFixed">
                 <el-tooltip class="item" effect="dark" placement="top-start" content="该分组包含固化人群，不可编辑">
                   <el-button type="primary" style="color: #c0c4cc;cursor: not-allowed;background-image: none;background-color: #F5F7FA;border-color: #DCDFE6;">{{$route.query.memberTagGroupId ? '保存': '创建会员分组'}}</el-button>
@@ -139,10 +139,10 @@
                   <el-tooltip class="item" effect="dark" :disabled="ruleForm.isActive == 0 && realCount.totalCount <= realCount.currCount" content="您商户的非实时分组数量已达到上限" placement="top-start" v-if="isAllowAdd && ruleForm.isActive == 0">
                     <el-button type="primary" style="color: #c0c4cc;cursor: not-allowed;background-image: none;background-color: #F5F7FA;border-color: #DCDFE6;">{{$route.query.memberTagGroupId ? '保存': '创建会员分组'}}</el-button>
                   </el-tooltip>
+                   <!-- :disabled="!($route.query.memberTagGroupId && ruleForm.isActive == 1) && (!(ruleForm.fixedType && !ruleForm.isTogether) && ruleForm.isActive == 0 && realCount.totalCount <= realCount.currCount)" -->
                   <el-button
                     v-else
                     type="primary"
-                    :disabled="!(ruleForm.fixedType && !ruleForm.isTogether) && ruleForm.isActive == 0 && realCount.totalCount <= realCount.currCount"
                     @click.stop="confirmSavePost"
                   >{{$route.query.memberTagGroupId ? '保存': '创建会员分组'}}</el-button>
                 </template>