Merge remote-tracking branch 'origin/main' into feature/0710_下载中心_rxd

src/views/property-marketing/put-account/account-data/components/board-table/constants.ts

@@ -7,7 +7,7 @@ export const TABLE_COLUMNS = [
     title: '账户名称',
     dataIndex: 'name',
     prop: 'name',
-    width: 180,
+    width: 240,
     fixed: 'left',
   },
   {
@@ -19,7 +19,7 @@ export const TABLE_COLUMNS = [
   },
   {
     title: '运营人员',
-    dataIndex: 'operator_ame',
+    dataIndex: 'operator_name',
     prop: 'operator',
     width: 180,
   },

src/views/property-marketing/put-account/account-data/components/filter-block/index.vue

@@ -38,7 +38,7 @@
     <div class="filter-row flex">
       <div v-if="!isAccountTab" class="filter-row-item flex items-center">
         <span class="label">关联账户</span>
-        <a-space class="w-160px">
+        <a-space class="w-240px">
           <AccountSelect v-model="query.placement_account_id" :options="placementAccounts" @change="handleSearch" />
         </a-space>
       </div>

src/views/property-marketing/put-account/account-data/components/plan-table/constants.ts

@@ -7,7 +7,7 @@ export const TABLE_COLUMNS = [
     title: '计划名称',
     dataIndex: 'name',
     prop: 'name',
-    width: 180,
+    width: 240,
     fixed: 'left',
   },
   {

src/views/property-marketing/put-account/account-data/index.vue

@@ -92,7 +92,8 @@ const init = () => {
   selectedRowKeys.value = [];
   accountTableRef.value?.resetTable();
 
-  const data_time = [dayjs().format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD')];
+  const yesterday = dayjs().subtract(1, 'day').format('YYYY-MM-DD');
+  const data_time = [yesterday, yesterday];
   query.value.data_time = data_time;
 
   getData();
@@ -137,9 +138,11 @@ const handleSelectionChange = (selectedRows) => {
 };
 
 const handleTabClick = (key) => {
+  dataSource.value = [];
+  selectedRowKeys.value = [];
+  pageInfo.value = cloneDeep(INITIAL_PAGE_INFO);
   activeTab.value = key;
   getData();
-
 };
 
 const handleExport = () => {