fix: fenzu

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

@@ -41,9 +41,9 @@ export default {
     currentGroupId: {
       handler: function(val) {
         console.log(val, 111);
-        if (val != null) {
-          this.currentGroupId = val;
-        }
+        // if (val != null) {
+        this.currentGroupId = val;
+        // }
       },
       immediate: true
     }

src/views/salesleads/actCodeManage/staffActCode/views/act-code-table.vue

@@ -46,12 +46,12 @@
       <el-table-column type="selection" width="60" fixed> </el-table-column>
       <el-table-column width="60" class-name="table-select-cell" fixed>
         <template #header>
-          <dm-table-select-page class="table-select" :type="selectPage.type" :data-ready="selectPage.dataReady" :table-vm="$refs.actCodeTableRef" :table-data="actCodeList" :total="totalCount" @change="t => (selectPage.type = t)" @selection-change="handleSelectionChange"></dm-table-select-page>
+          <dm-table-select-page class="table-select" :type="selectPage.type" :data-ready="selectPage.dataReady" :table-vm="$refs.actCodeTableRef" :table-data="tableData" :total="totalCount" @change="t => (selectPage.type = t)" @selection-change="handleSelectionChange"></dm-table-select-page>
         </template>
       </el-table-column>
       <el-table-column label="活码ID" fixed width="110">
         <template slot-scope="{ row }">
-          <p>{{ row.hmId }}</p>
+          <p>{{ row.hmCode }}</p>
         </template>
       </el-table-column>
       <el-table-column label="活码信息" width="100">
@@ -454,9 +454,7 @@ export default {
         this.inFields.startTime = this.dateTime ? Date.parse(new Date(this.dateTime[0]).toString()) : '';
         this.inFields.endTime = this.dateTime ? Date.parse(new Date(this.dateTime[1]).toString()) : '';
       }
-      if (this.currentGroupId != null) {
-        this.inFields.hmGroupId = Number(this.currentGroupId);
-      }
+      this.inFields.hmGroupId = this.currentGroupId;
       if (this.inFields.hmSelect == '') {
         delete this.inFields.hmSelect;
       }
@@ -483,21 +481,22 @@ export default {
             this.tableData = res.data.result.data || [];
             this.totalCount = res.data.result.page.totalCount;
           }
+          this.selectPage.dataReady = true;
         })
         .finally(_ => {
           this.loadingStatus = false;
-          this.selectPage.dataReady = true;
         });
     }
   },
   watch: {
     currentGroupId: {
       handler: function(val) {
-        if (val != null) {
-          this.currentGroupId = val;
-          this.pageParam.pageNum = 1;
-          this.getTableList();
-        }
+        console.log('val', val, 'val');
+        // if (val != null) {
+        this.currentGroupId = val;
+        this.pageParam.pageNum = 1;
+        this.getTableList();
+        // }
       },
       immediate: true
     }

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

@@ -115,7 +115,9 @@ export default {
       }
     },
     clickGroupListItem(listItem) {
+      console.log(listItem, 'uuuuu');
       this.currentListItemUuid = listItem.groupId;
+      console.log(this.currentListItemUuid, 'this.currentListItemUuid');
       this.$emit('updateList', this.currentListItemUuid);
     },
     isShowGroupListItemMore(listItem) {

src/views/salesleads/components/act-code-set.vue

@@ -63,7 +63,7 @@ export default {
         hmGroupId: '', //活码分组id
         passFlag: true, // 1自动通过 0否
         memberLabelId: 'fd6b44967aa647bcadfad10706244c56', //会员活动标签id
-        memberLabelName: '',
+        memberLabelName: '测试121212-木瑾0630测试标签值50',
         welcomeId: '' // 欢迎语id
         // clerkIdList: '', // 选择导购id
         // storeId: '' //门店id

src/views/salesleads/components/dataDetail.vue

@@ -48,7 +48,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <dm-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="pageParam.pageNo" :page-sizes="[20, 40, 60, 80]" :page-size="pageParam.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalCount"> </dm-pagination>
+    <dm-pagination v-if="tableData && tableData.length > 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="pageParam.pageNo" :page-sizes="[20, 40, 60, 80]" :page-size="pageParam.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="totalCount"> </dm-pagination>
   </div>
 </template>
 

src/views/salesleads/components/welcomesItem.vue

@@ -105,6 +105,15 @@ export default {
   activated() {
     this.onSearch();
   },
+  // mounted() {
+  //   this.getWelcomeTable();
+  //   document.addEventListener('visibilitychange', () => {
+  //     console.log(document.visibilityState, 99999);
+  //     if (document.visibilityState == 'visible') {
+  //       this.getWelcomeTable();
+  //     }
+  //   });
+  // },
   methods: {
     onSearch() {
       this.welcomePage.pageNum = 1;