update: 分组

src/components/tag/tag-config-options.vue

@@ -713,12 +713,10 @@
           <div class="checkboxOption-wrap__body__checkAll border-box tag-mode">
             <el-checkbox :indeterminate="parent.isIndeterminate" v-model="parent.checkAll" @change="handleCheckAllChange($event, parent)">全选</el-checkbox>
           </div>
-          <div class="checkboxOption-wrap__body__options border-box tag-options">
+          <div class="checkboxOption-wrap__body__options border-box tag-options" style="padding: 20px 0">
             <el-checkbox-group v-model="parent.checkeditems" @change="handleCheckedCitiesChange">
-              <el-checkbox v-for="(item, index) in parent.options" :label="item.memberTagGradeId" :key="item.memberTagGradeId + index">
-                <el-tooltip class="item" effect="dark" :content="item.aliasName | aliasTips" placement="top-start">
-                  <span>{{ item.aliasName }}</span>
-                </el-tooltip>
+              <el-checkbox style="width: 170px; margin: 0 16px 16px" v-for="(item, index) in parent.options" :label="item.memberTagGroupId" :key="item.memberTagGroupId + index">
+                <span>{{ item.groupName }}</span>
               </el-checkbox>
             </el-checkbox-group>
           </div>
@@ -1541,9 +1539,9 @@ export default {
              * 会员分层
              */
             if (data.templateCode == 'tag021') {
-              this.axios.get(`${this.baseUrl}/gic-member-tag-web/memberTagGrade/gradeList?requestProject=gic-member-tag-web&type=1`).then(res => {
+              this.axios.get(`${this.baseUrl}/gic-member-tag-web/memberTagGrade/gradeGroupListV2?requestProject=gic-member-tag-web&type=1`).then(res => {
                 if (res.data.errorCode === 1) {
-                  this.templateData[0].options = res.data.result;
+                  this.templateData[0].options = res.data.result.result || [];
                 }
               });
             }

src/components/tagDetail/mixin/index.js

@@ -437,9 +437,9 @@ export default {
         tagValue.val[0].data.compute = that.templateData[0].compute;
         const checkeditems = this.templateData[0].checkeditems.map(el => el);
         this.templateData[0].options.forEach((ele, index) =>{
-          if (checkeditems.indexOf(ele.memberTagGradeId) != -1) {
-            this.postTemplateData.selectedVal.push(ele.aliasName);
-            itemArr.push(ele.memberTagGradeId);
+          if (checkeditems.indexOf(ele.memberTagGroupId) != -1) {
+            this.postTemplateData.selectedVal.push(ele.groupName);
+            itemArr.push(ele.memberTagGroupId);
           }
         });
         this.templateData[0].checkeditems = itemArr;
@@ -1290,9 +1290,11 @@ export default {
       if (val) {
         item.checkeditems = [];
         item.options.forEach(function(el, index) {
-          if (item.templateCode === 'tag021' || item.templateCode === 'tag022') {
+          if (item.templateCode === 'tag021') {
+            item.checkeditems.push(el.memberTagGroupId);
+          } else if (item.templateCode == 'tag022') {
             item.checkeditems.push(el.memberTagGradeId);
-          } else {
+          }else {
             item.checkeditems.push(el.key);
           }
         });

src/view/platformTag/member-tag.vue

@@ -472,10 +472,10 @@ export default {
         return;
       }
 
-      if (param.isRealTime === 0 && param.updateType !== 1 && param.updateDay === '') {
-        this.$message.warning({ message: '会员分组更新频率不能为空！' });
-        return;
-      }
+      // if (param.isRealTime === 0 && param.updateType !== 1 && param.updateDay === '') {
+      //   this.$message.warning({ message: '会员分组更新频率不能为空！' });
+      //   return;
+      // }
 
       // if (param.fixedType === 2 && new Date(this.tagConfig.fixedTime) > new Date(this.tagConfig.fixedEndTime)) {
       //   this.$message.error({ message: '固化开始时间不允许晚于结束时间!' });