收入列表的业务调整和bug修复

src/views/taobao/orders.vue

@@ -169,8 +169,8 @@
 
                 <template #totalCommissionFee="{ record }">
                     <div class="text-3">
-                        <div>付款预估佣金收入：<span class="money-sum">￥{{ record.pubShareFeeForCommission }}</span></div>
-                        <div>付款预估补贴收入：<span class="money-sum">￥{{ record.pubShareFeeForSdy }}</span></div>
+                        <div>结算预估佣金收入：<span class="money-sum">￥{{ record.pubShareFeeForCommission }}</span></div>
+                        <div>结算预估补贴收入：<span class="money-sum">￥{{ record.pubShareFeeForSdy }}</span></div>
 
                     </div>
                 </template>

src/views/taobao/report_daily.vue

@@ -99,9 +99,80 @@
                         {{ dayjs(record.report_date).format(record.isLeaf ? 'HH:mm' : 'YYYY-MM-DD') }}
                     </template>
                 </template>
+
                 <template #accountName="{ record }">
                     {{ record.isLeaf ? '' : record.accountName }}
                 </template>
+
+                <template #order_ord_amt_14="{ record }">
+                    <a-popover popup-container="body" trigger="click">
+                        <div>{{ amountFormat(record.order_ord_amt_12 + record.order_ord_amt_14) }}</div>
+                        <template #content>
+
+                            <div style="min-width:400px;">
+                                <a-row>
+                                    <a-col :span="8">
+                                        <div>已付款金额/收入：</div>
+                                    </a-col>
+                                    <a-col :span="8"> {{ amountFormat(record.order_ord_amt_12) }} </a-col>
+                                    <a-col :span="8"> {{ amountFormat(record.order_ord_tfee_12) }} </a-col>
+                                </a-row>
+
+
+                                <a-row>
+                                    <a-col :span="8">
+                                        <div>已收货金额/收入：</div>
+                                    </a-col>
+                                    <a-col :span="8"> {{ amountFormat(record.order_ord_amt_14) }} </a-col>
+                                    <a-col :span="8"> {{ amountFormat(record.order_ord_tfee_14) }} </a-col>
+                                </a-row>
+
+                                <a-row>
+                                    <a-col :span="8">
+                                        <div>已失效金额/收入：</div>
+                                    </a-col>
+                                    <a-col :span="8"> {{ amountFormat(record.order_ord_amt_13) }} </a-col>
+                                    <a-col :span="8"> {{ amountFormat(record.order_ord_tfee_13) }} </a-col>
+                                </a-row>
+                            </div>
+                        </template>
+                    </a-popover>
+
+
+                </template>
+                <template #order_ord_tfee_14="{ record }">
+                    <a-popover popup-container="body" trigger="click">
+                        <div>{{ amountFormat(record.order_ord_tfee_12 + record.order_ord_tfee_14) }}</div>
+                        <template #content>
+                            <div style="min-width:400px;">
+                                <a-row>
+                                    <a-col :span="8">
+                                        <div>已付款金额/收入：</div>
+                                    </a-col>
+                                    <a-col :span="8"> {{ amountFormat(record.order_ord_amt_12) }} </a-col>
+                                    <a-col :span="8"> {{ amountFormat(record.order_ord_tfee_12) }} </a-col>
+                                </a-row>
+
+
+                                <a-row>
+                                    <a-col :span="8">
+                                        <div>已收货金额/收入：</div>
+                                    </a-col>
+                                    <a-col :span="8"> {{ amountFormat(record.order_ord_amt_14) }} </a-col>
+                                    <a-col :span="8"> {{ amountFormat(record.order_ord_tfee_14) }} </a-col>
+                                </a-row>
+
+                                <a-row>
+                                    <a-col :span="8">
+                                        <div>已失效金额/收入：</div>
+                                    </a-col>
+                                    <a-col :span="8"> {{ amountFormat(record.order_ord_amt_13) }} </a-col>
+                                    <a-col :span="8"> {{ amountFormat(record.order_ord_tfee_13) }} </a-col>
+                                </a-row>
+                            </div>
+                        </template>
+                    </a-popover>
+                </template>
                 <template #total_count="{ record }">
                     <a-popover v-if="record.total_count > 0" popup-container="body" trigger="click">
                         <a-tag color="green">{{ record.total_count }}</a-tag>
@@ -146,7 +217,7 @@ const generateFormModel = () => {
         accountName: '',
         query_date: [],
         current: 1,
-        pageSize: 999,
+        pageSize: 30,
         sort: 'report_date',
         order: 'descending',
     };
@@ -171,7 +242,7 @@ const scroll = {
 
 const basePagination: Pagination = {
     current: 1,
-    pageSize: 20,
+    pageSize: 30,
 };
 const pagination = reactive({
     ...basePagination,
@@ -240,14 +311,14 @@ const columns = computed<TableColumnData[]>(() => [
                 dataIndex: 'pay_ord_amt_56',
                 width: 150,
                 align: 'right',
-                render: (e: any) => amountFormat(e.record.sett_tk_disp_tfee_56)
+                render: (e: any) => amountFormat(e.record.pay_ord_amt_56)
             },
             {
                 title: '付款预估收入',
                 dataIndex: 'pay_tk_disp_tfee_56',
                 width: 150,
                 align: 'right',
-                render: (e: any) => amountFormat(e.record.sett_tk_disp_tfee_56)
+                render: (e: any) => amountFormat(e.record.pay_tk_disp_tfee_56)
             },
             {
                 title: '付款人数',
@@ -271,14 +342,14 @@ const columns = computed<TableColumnData[]>(() => [
                 dataIndex: 'eff_ord_amt',
                 width: 150,
                 align: 'right',
-                render: (e: any) => amountFormat(e.record.sett_tk_disp_tfee_56)
+                render: (e: any) => amountFormat(e.record.eff_ord_amt)
             },
             {
                 title: '有效付款预估收入',
                 dataIndex: 'eff_tk_disp_tfee',
                 width: 150,
                 align: 'right',
-                render: (e: any) => amountFormat(e.record.sett_tk_disp_tfee_56)
+                render: (e: any) => amountFormat(e.record.eff_tk_disp_tfee)
             },
         ]
     },
@@ -322,6 +393,18 @@ const columns = computed<TableColumnData[]>(() => [
                 align: 'right',
                 render: (e: any) => amountFormat(e.record.order_ord_tfee)
             },
+            {
+                title: '未结算金额',
+                width: 150,
+                align: 'right',
+                slotName: 'order_ord_amt_14',
+            },
+            {
+                title: '未结算收入',
+                width: 120,
+                align: 'right',
+                slotName: 'order_ord_tfee_14',
+            },
         ]
     },
     {
@@ -393,7 +476,7 @@ const columns = computed<TableColumnData[]>(() => [
 const fetchData = async (
     params: TkReportParams = {
         current: 1,
-        pageSize: 20,
+        pageSize: 30,
         sort: 'report_date',
         order: 'descending',
     }
@@ -406,6 +489,7 @@ const fetchData = async (
         renderData.value = data.list;
         pagination.current = data.page;
         pagination.total = data.count;
+
         console.log(data);
     } catch (err) {
         console.log(err);