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

src/components/tag/batch-list.vue

@@ -133,6 +133,7 @@ export default {
     },
     getMemberGroupList() {
       memberGroupList({
+        type: 0,
         requestProject: 'gic-member-tag-web'
       })
         .then(res => {

src/view/memberGroup/memberGroupEdit.vue

@@ -231,6 +231,7 @@ import { postRequest } from '@/api/api';
 import { getMemberTagCount } from '@/request/memberGroup.js';
 import { getMemberTagList, memberGroupList, getIsAllowAdd, groupCount } from '@/request/api.js';
 import { parseTime } from '@/utils'
+import { dateformat } from '@/utils/formatTime';
 import errMsg from '@/common/js/error';
 import {
   getGroupUseList,
@@ -467,11 +468,10 @@ export default {
     },
     // 设置默认的分组有效期
     defaultDate() {
-      let date = new Date(new Date().getTime() + 90 * 24 * 3600 * 1000);
-      let Y = date.getFullYear() + '-';
-      let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
-      let D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ' ';
-      this.ruleForm=Object.assign({},this.ruleForm,{effectiveDateTmp: Y + M + D + '23:59:59'})
+      let curDate = new Date();
+      curDate.setMonth(3 + curDate.getMonth());
+      curDate = new Date(+new Date(curDate) - 24 * 60 * 60 * 1000);
+      this.ruleForm.effectiveDateTmp = dateformat(curDate, 'yyyy-MM-dd') + ' 23:59:59';
     },
     _groupCount() {
       groupCount().then(res => {

src/view/memberGroup/memberGroupList.vue

@@ -21,7 +21,7 @@
         <div class="right-box">
           <div class="common-wrap__opt">
             <div class="top m-b-20">
-              <p class="tips">实时分组仅在分组生效开始时间查询一次数据，后续数据不会发生变化，分组失效后数据会自动清空。</p>
+              <p class="tips">固化分组仅在分组生效开始时间查询一次数据，后续数据不会发生变化，分组失效后数据会自动清空。</p>
             </div>
             <el-input
               class="m-r-8 w-160"
@@ -38,10 +38,10 @@
             </el-select>
 
             <!-- 实时和非实时 -->
-            <el-select v-model="isRealTime" @change="realTimeStatus" placeholder="是否实时" class="w120 m-l-0 m-r-8" clearable>
+            <!-- <el-select v-model="isRealTime" @change="realTimeStatus" placeholder="是否实时" class="w120 m-l-0 m-r-8" clearable>
               <el-option :key="0" label="非实时" :value="0"> </el-option>
               <el-option :key="1" label="实时" :value="1"> </el-option>
-            </el-select>
+            </el-select> -->
 
             <!--是否展示好办-->
             <el-select v-model="isHaoban" @change="changeHaoBan" placeholder="好办是否展示" class="w130 " clearable>

src/view/platformTag/member-tag.vue

@@ -204,7 +204,7 @@ import { getMemberTag, getMemberTagList, addNewGroup, memberGroupList, groupCoun
 import EditTag from '../memberGroup/edit-tag';
 import Trash from '@/components/Trash.vue';
 import { parseTime } from '@/utils';
-
+import { dateformat } from '@/utils/formatTime';
 Vue.component(CollapseTransition.name, CollapseTransition);
 let fixBeginTime = +new Date() + 1000 * 60 * 60 * 24;
 
@@ -417,11 +417,10 @@ export default {
     },
     // 设置默认的分组有效期
     defaultDate() {
-      let date = new Date(new Date().getTime() + 90 * 24 * 3600 * 1000);
-      let Y = date.getFullYear() + '-';
-      let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
-      let D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ' ';
-      this.tagConfig.date = Y + M + D + '23:59:59';
+      let curDate = new Date();
+      curDate.setMonth(3 + curDate.getMonth());
+      curDate = new Date(+new Date(curDate) - 24 * 60 * 60 * 1000);
+      this.tagConfig.date = dateformat(curDate, 'yyyy-MM-dd') + ' 23:59:59';
     },
     // 刷新
     refersh(list) {