收入列表增加账号名搜索

src/views/taobao/components/selectAccount.vue

@@ -1,6 +1,6 @@
 <template>
 
-    <a-select v-model="model" placeholder="指定账号名" @change="changeCompany">
+    <a-select v-model="model" placeholder="指定账号名" allow-clear @change="changeCompany">
         <a-option value="">所有账号</a-option>
         <a-option :key="item.id" v-for="item of accounts" :value="item.company" :label="item.company" />
     </a-select>

src/views/taobao/report_daily.vue

@@ -7,6 +7,11 @@
                     <a-form :model="formModel" :label-col-props="{ span: 6 }" :wrapper-col-props="{ span: 18 }"
                         label-align="left">
                         <a-row :gutter="16">
+                            <a-col :span="8">
+                                <a-form-item field="keyword" label="账号名">
+                                    <selectAccount v-model="formModel.accountName" @change="changeCompany" />
+                                </a-form-item>
+                            </a-col>
                             <a-col :span="8">
                                 <a-form-item field="query_date" :label="$t('searchTable.form.report_date')">
                                     <a-range-picker v-model="formModel.query_date" style="width: 100%"
@@ -92,12 +97,25 @@
                 :data="renderData" :bordered="{ headerCell: true }" :size="size" :load-more="loadMore"
                 @page-change="onPageChange" @page-size-change="onPageSizeChange">
                 <template #xAxis="{ record }">
-                    <template v-if="record.accountName !== '' && !record.isLeaf">
+                    <!-- <template v-if="record.accountName !== '' && !record.isLeaf">
                         {{ record.accountName }}
                     </template>
-                    <template v-else>
+    <template v-else>
                         {{ dayjs(record.report_date).format(record.isLeaf ? 'HH:mm' : 'YYYY-MM-DD') }}
+                    </template> -->
+
+
+                    <template v-if="record.isLeaf || record.accountName == ''">
+                        {{ dayjs(record.report_date).format(record.isLeaf ? 'HH:mm' : 'YYYY-MM-DD') }}
+                    </template>
+                    <template v-else>
+                        <a-typography-text type="secondary">
+                            {{ dayjs(record.report_date).format('YYYY-MM-DD') }}
+                        </a-typography-text>
+
+                        {{ record.accountName }}
                     </template>
+
                 </template>
 
                 <template #accountName="{ record }">
@@ -287,6 +305,7 @@ import cloneDeep from 'lodash/cloneDeep';
 import Sortable from 'sortablejs';
 import CategoriesPercent from './components/categories-percent.vue';
 import viewOrdersModal from './components/viewOrdersModal.vue';
+import selectAccount from './components/selectAccount.vue';
 
 type SizeProps = 'mini' | 'small' | 'medium' | 'large';
 type Column = TableColumnData & { checked?: true };
@@ -775,23 +794,35 @@ const fetchData = async (
 ) => {
     setLoading(true);
     try {
-        console.log(params)
-        const { data } = await queryTkReportDailys(params);
-        console.log(data);
-        if (!data) return;
-        let list: TableData[] = [];
+        let list: TkReportRecord[] = [];
+        if (formModel.value.accountName) {
+            const { data } = await queryTkReport(params);
+            console.log(data);
+            if (!data) return;
+            list = data.list.map((item: TkReportRecord) => ({
+                ...item,
+                order_ord_amt_12_14: item.order_ord_amt_12 + item.order_ord_amt_14,
+                order_ord_tfee_12_14: item.order_ord_tfee_12 + item.order_ord_tfee_14,
+            }));
+            renderData.value = list;
+            pagination.current = data.page;
+            pagination.total = data.count;
+        } else {
+            const { data } = await queryTkReportDailys(params);
+            console.log(data);
+            if (!data) return;
 
-        list = data.list.map((item: TkReportRecord) => ({
-            ...item,
-            order_ord_amt_12_14: item.order_ord_amt_12 + item.order_ord_amt_14,
-            order_ord_tfee_12_14: item.order_ord_tfee_12 + item.order_ord_tfee_14,
-        }));
+            list = data.list.map((item: TkReportRecord) => ({
+                ...item,
+                order_ord_amt_12_14: item.order_ord_amt_12 + item.order_ord_amt_14,
+                order_ord_tfee_12_14: item.order_ord_tfee_12 + item.order_ord_tfee_14,
+            }));
+            renderData.value = list;
+            pagination.current = data.page;
+            pagination.total = data.count;
+        }
 
-        renderData.value = list;
-        pagination.current = data.page;
-        pagination.total = data.count;
 
-        console.log(data);
     } catch (err) {
         console.log(err);
         // you can report use errorHandler or other
@@ -800,6 +831,7 @@ const fetchData = async (
     }
 };
 
+
 const loadMore = async (
     row: TableData,
     done: (data: TableData[]) => void
@@ -861,6 +893,21 @@ const search = () => {
         ...formModel.value,
     } as unknown as TkReportParams);
 };
+const changeCompany = (value: any) => {
+    const reset = () => {
+        formModel.value = generateFormModel();
+    };
+    formModel.value.accountName = value
+
+    fetchData({
+        ...basePagination,
+        ...formModel.value,
+    } as unknown as TkReportParams);
+};
+
+
+
+
 const onPageChange = (current: number) => {
     fetchData({
         ...basePagination,