update: 会员分组

src/view/memberGroup/edit-tag.vue

@@ -74,6 +74,16 @@ export default {
           this.templateObj = newval;
         }, 20);
       }
+    },
+    showEditTagPop(newVal) {
+      if (!newVal) {
+        try {
+          const getStore = this.$refs.tagConfig.$refs.storeNew;
+          if (Array.isArray(getStore) && getStore[0].$children[1]) getStore[0].$children[1].popoverShow = false;
+        } catch(e) {
+          console.error(e);
+        }
+      }
     }
   },
   // mixins: [tagDetails],

src/view/memberGroup/memberGroupList.vue

@@ -316,9 +316,8 @@
 
               <el-table-column prop="updateTime" min-width="110" label="最近编辑时间">
                 <template slot-scope="scope">
-                  {{ updateTime }}
-                  <p class="h-18">{{ scope.row.updateTime | formatTimeYMD }}</p>
-                  <p class="h-18">{{ scope.row.updateTime | formatTimeHMS }}</p>
+                  <p class="h-18">{{ dateformat(new Date(scope.row.updateTime), 'yyyy-MM-dd') }}</p>
+                  <p class="h-18">{{ dateformat(new Date(scope.row.updateTime), 'hh:mm:ss') }}</p>
                 </template>
               </el-table-column>
 
@@ -582,6 +581,7 @@ import GroupList from './group-list';
 import RecommendTable from './recommend-table';
 import { aliasNames } from '@/config'
 import PyramidGroupTable from './pyramid-group-table.vue';
+import { dateformat } from '@/utils/formatTime'
 
 export default {
   name: 'memberGroupList',
@@ -685,7 +685,8 @@ export default {
         data: {},
         isBatch: false
       },
-      addGroupDialog: false
+      addGroupDialog: false,
+      dateformat
     };
   },
 

src/view/memberGroup/memberLevelDetail.vue

@@ -650,9 +650,10 @@ export default {
     if (local.indexOf('localhost') != -1) {
       local = 'http://gicdev.demogic.com';
     }
-
+    const type = this.$route.query.type
     this.downMemberListPop.params.gradeId = memberTagGroupId;
     this.downMemberListPop.params.memberTagGroupId = memberTagGroupId;
+    if (type) this.downMemberListPop.params.exportFieldPrefix = type;
     this.downMemberListPop.excelUrl = local + this.downMemberListPop.excelUrl;
     // this.canDownMemberList();
     this.getTagValueDtoList();