update: 分组

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

@@ -148,7 +148,7 @@
       </template>
       <!-- 7.固定时段/最近 -->
       <template v-if="parent.templateCode == 'tag004'">
-        <div :key="'tag7' + pindex">
+        <div :key="'tag7' + pindex" class="m-t-20">
           <div>
             <el-radio v-model="parent.fixedRecentRadio" label="1">固定时段</el-radio>
             <el-radio v-model="parent.fixedRecentRadio" label="2">最近时段</el-radio>
@@ -171,7 +171,7 @@
             </el-date-picker>
             <div v-if="parent.fixedRecentRadio == 2">
               <label class="inline-block middle label-unit m-r-8">最近</label
-              ><el-input v-model="parent.fixedRecentTimeRecent" placeholder="请输入1-730" class="w-200 m-r-8" @blur="value => toEditInput(value, 'fixedRecentTimeRecent', parent)"></el-input
+              ><el-input v-model="parent.fixedRecentTimeRecent" placeholder="请输入1-730" class="m-r-8" style="width: 120px" @blur="value => toEditInput(value, 'fixedRecentTimeRecent', parent)"></el-input
               ><label class="inline-block middle label-unit">天</label>
             </div>
           </div>
@@ -1259,7 +1259,10 @@ export default {
       },
       tag024Options: {
         disabledDate(time) {
-          return time.getTime() < new Date(new Date().toLocaleDateString()).getTime();
+          const getYear = new Date().getFullYear();
+          const setYear = new Date().setYear(getYear + 1);
+          console.log(time.getTime(),setYear);
+          return time.getTime() > (setYear - 24 * 60 * 60 * 1000);
         }
       },
       tag025: {
@@ -1607,7 +1610,7 @@ export default {
         } else {
           this.loadSelector = true;
         }
-      }, 200);
+      }, 800);
 
       // 获取已存数据
       // this.getExistData(this.tagData.tagId);

src/components/tagDetail/mixin/index.js

@@ -1083,7 +1083,7 @@ export default {
       }
 
       // 会员等级变更
-      if (this.templateData.length && code === 'com009') {
+      if (this.templateData.length && this.templateData.some(el => el.templateCode == 'com009')) {
         const findAfter = this.templateData.find(el => el.afterGradeId);
         const findBefore = this.templateData.find(el => el.beforeGradeId);
         if (findAfter && findBefore)  {
@@ -1252,8 +1252,8 @@ export default {
         tagParams: JSON.stringify(tagParams) // 标签前端选择
       };
       postRequest('/member-tag-value/add.json', para)
-        .then(res => {
-          let resData = res.data;
+      .then(res => {
+        let resData = res.data;
           if (resData.errorCode == 1) {
             this.successAdd = true;
             if (that.tabActive != 'second') {
@@ -1274,12 +1274,13 @@ export default {
                 isActive: that.tagData.isActive,
                 templateCode: this.templateCode
               };
-              console.log(sendObj);
               this.$emit('returnTagData', sendObj);
+          }else {
+            this.$message.error(resData.message)
           }
         })
         .catch(function(error) {
-
+           this.$message.error(error.message)
         });
     },
 

src/view/memberGroup/memberGroupList.vue

@@ -48,7 +48,7 @@
               <el-option :key="0" label="不展示" :value="0"> </el-option>
               <el-option :key="1" label="展示" :value="1"> </el-option>
             </el-select>
-            <span class="look-self m-l-10" v-if="[2,3].includes($store.state.departAuth)">
+            <span class="look-self m-l-10" v-if="[2,3].includes($store.state.departAuth) || $store.state.isSuperAdmin">
                <el-checkbox v-model="isSelf">
                  仅看本人
                  <el-tooltip placement="top" trigger="hover" content="其它账号创建的分组覆盖人数根据创建人管辖门店查询数据"><i class="iconfont icon-QuestionCircleOutlined icon" /></el-tooltip>
@@ -213,7 +213,7 @@
                 <el-button type="primary" :limit-code="$buttonCode.memberTagAddGroup" @click="toAddGroup" class="fr">新增分组</el-button>
               </el-tooltip>
             </div>
-            <div class="look-self m-t-12 m-b-20" v-if="[2,3].includes($store.state.departAuth)">
+            <div class="look-self m-t-12 m-b-20" v-if="[2,3].includes($store.state.departAuth) || $store.state.isSuperAdmin">
                <el-checkbox v-model="isSelf">
                  仅看本人
                  <el-tooltip placement="top" trigger="hover" content="其它账号创建的分组覆盖人数根据创建人管辖门店查询数据"><i class="iconfont icon-QuestionCircleOutlined icon" /></el-tooltip>

src/view/platformTag/member-tag.vue

@@ -695,6 +695,8 @@ export default {
     deleteHandTag(id) {
       this.loadMemberTagList({
         id: id,
+        searchName: this.memberTag,
+        showSearchResult: true,
         type: 1 // 手工标签传1
       });
     },