Merge branch 'feature/act-code' of http://git.gicdev.com/office/haoban-3 into feature/act-code

src/views/salesleads/actCodeManage/staffActCode/actCodeDetail.vue

@@ -8,7 +8,7 @@
           <el-tag size="small" effect="dark" :type="codeStatusLis[statusIndex].style" style="margin-left: 8px;">{{ codeStatusLis[statusIndex].value }}</el-tag>
           <!-- 正常success/正常到上限warning/待生效info/已作废danger -->
         </div>
-        <p class="font-14 m-t-10 ">ID：{{ codeInfo.hmId }}</p>
+        <p class="font-14 m-t-10 ">ID：{{ codeInfo.hmCode }}</p>
         <div class="flex font-14" style="padding-top:20px;">
           <div class="flex flex-1">
             <div class="font-14 line-22">

src/views/salesleads/actCodeManage/staffActCode/views/group-list.vue

@@ -99,7 +99,7 @@ export default {
     };
   },
   created() {
-    // this.searchGroup();
+    this.searchGroup();
   },
   activated() {
     if (this.$route.meta.refresh) {
@@ -108,8 +108,8 @@ export default {
         pageNum: 1,
         pageSize: 20
       };
+      this.searchGroup();
     }
-    this.searchGroup();
   },
   methods: {
     onSearch() {

src/views/salesleads/components/dataDetail.vue

@@ -119,7 +119,7 @@ export default {
               start = start.setFullYear(start.getFullYear() - 2);
               end = end.getTime();
             }
-            return time.getTime() < start || time.getTime() > end;
+            return time.getTime() <= start || time.getTime() >= end;
           }
         };
       }
@@ -228,7 +228,6 @@ export default {
       }
 
       await this.api(paras).then(res => {
-        console.log(res);
         if (res.data.code == 0) {
           this.tableData = res.data.result.result || [];
           this.totalCount = res.data.result.totalCount;