update: bug修复

src/components/tagDetail/mixin/index.js

@@ -573,11 +573,18 @@ export default {
         tagValue.val[0].data.value = that.templateData[0].dateRangeValue.join(',');
         that.templateData[0].timeInput = '';
         if (code === 'tag019' || code === 'tag020' || code === 'tag015') {
-          tagValue.val[0].data.value = that.templateData[0].dateRangeValue
-            .join(',')
-            .replace(/-/g, '')
-            .replace(/:/g, '')
-            .replace(/\s+/g, '');
+          if (code === 'tag020') {
+            tagValue.val[0].data.value = that.templateData[0].dateRangeValue.map(el => {
+              return el.split(' ')[0];
+            }).join(',').replace(/-/g, '')
+            console.log(tagValue.val[0].data.value);
+          } else {
+            tagValue.val[0].data.value = that.templateData[0].dateRangeValue
+              .join(',')
+              .replace(/-/g, '')
+              .replace(/:/g, '')
+              .replace(/\s+/g, '');
+          }
         }
         that.postTemplateData.selectedVal.push(that.templateData[0].dateRangeValue[0].split(' ')[0] + '至' + that.templateData[0].dateRangeValue[1].split(' ')[0]);
       }
@@ -1254,6 +1261,8 @@ export default {
         tagValue: JSON.stringify(tagValue), // 标签选择保存值
         tagParams: JSON.stringify(tagParams) // 标签前端选择
       };
+      const { type } = this.$route.query;
+      para.pageType = type === 'fixed' ? 2 : 1;
       postRequest('/member-tag-value/add.json', para)
       .then(res => {
         let resData = res.data;

src/view/memberGroup/memberGroupList.vue

@@ -127,7 +127,7 @@
               </el-table-column>
               <el-table-column prop="effectiveDate" min-width="100" label="到期时间">
                 <template slot-scope="scope">
-                  <p v-if="!scope.row.effectiveStatus" class="h-18">{{ scope.row.effectiveDate | formatTimeYMD }}</p>
+                  <p v-if="!scope.row.isRealTime" class="h-18">{{ scope.row.effectiveDate | formatTimeYMD }}</p>
                   <p v-else class="h-18">--</p>
                 </template>
               </el-table-column>
@@ -306,7 +306,7 @@
               </el-table-column>
               <el-table-column prop="recentUpdateDate" min-width="100" label="到期时间">
                 <template slot-scope="scope">
-                  <template  v-if="!scope.row.effectiveStatus">
+                  <template  v-if="!scope.row.isRealTime">
                     <p class="h-18">{{ scope.row.effectiveDate | formatTimeYMD }}</p>
                     <p class="h-18">{{ scope.row.effectiveDate | formatTimeHMS }}</p>
                   </template>
@@ -895,9 +895,10 @@ export default {
         pageSize: this.pageSize,
         memberTagGradeId: id
       };
+      const flag = 3;
       gradeList(params).then(res => {
         if (res.errorCode == 1) {
-          console.log(312312);
+          if (flag != this.activeType) return;
           this.total = res.result.totalCount;
           this.groupTableData = res.result.result;
         }
@@ -913,7 +914,7 @@ export default {
         this.showFixedList = true;
         this.params.pageNum = 1;
         this.params.pageSize = 20;
-        this.getGroupList();
+        this.getGroupList(2);
         return;
       }
       if (list === 'allLevel') {
@@ -934,7 +935,7 @@ export default {
         this.isTagRecommend = false;
         this.currentPage = 1;
         this.pageSize = 20;
-        this.getGroupList();
+        this.getGroupList(1);
         return;
       }
       if (list.isTag) {
@@ -1311,13 +1312,15 @@ export default {
     /**
      * 获取列表数据
      */
-    getGroupList() {
+    getGroupList(type) {
       this.loading = true;
       this.params.fixedType = this.showFixedList ? 1 : 0;
       this.params.permissionType = this.isSelf ? 2 : 1;
+      const flag = type; // 用来控制快速切换tab时，数据混乱得问题
       memberTagGroupList(this.params).then(res => {
         this.loading = false;
         if (res.errorCode == 1) {
+          if (flag && flag != this.activeType) return;
           this.total = res.result.totalCount;
           this.classifyOptions = res.result.params || {};
           this.groupTableData = res.result.result.map(el => ({