订单页面UI需求调整

src/views/taobao/components/viewOrdersModal.vue

@@ -5,7 +5,8 @@
 
     <a-modal width="90%" height="90%" v-model:visible="visible" hide-title :footer="false" @ok="handleOk"
         @cancel="handleCancel">
-        <viewOrders v-if="visible" :keyword="keyword" :tk-status="tkStatus" :query-date="queryDate"></viewOrders>
+        <viewOrders v-if="visible" :keyword="keyword" :tk-status="tkStatus" :query-date="queryDate"
+            :query-type="queryType"></viewOrders>
     </a-modal>
 </template>
 
@@ -28,7 +29,8 @@ const props = defineProps({
 const visible = ref(false);
 const keyword = ref<string>('');
 const tkStatus = ref<Array<number>>([]);
-const queryDate = ref<Array<string | Date | undefined>>([]);
+const queryType = ref<string>('tbPaidTime');
+const queryDate = ref<Array<string>>([]);
 
 
 
@@ -43,6 +45,7 @@ const handleClickOrder = (val: any) => {
             tkStatus.value = [3, 12, 14];
             break;
         case "sett_ord_amt_56":
+            queryType.value = "tkEarningTime";
             tkStatus.value = [3];
             break;
         case "order_ord_amt":

src/views/taobao/orders.vue

@@ -23,7 +23,12 @@
                                 </a-form-item>
                             </a-col>
                             <a-col :span="6">
-                                <a-form-item field="query_date" :label="$t('searchTable.form.order_date')">
+                                <a-form-item field="query_date" hide-label>
+                                    <a-select v-model="formModel.query_type">
+                                        <a-option value="tbPaidTime">付款时间</a-option>
+                                        <a-option value="tkCreateTime">创建时间</a-option>
+                                        <a-option value="tkEarningTime">结算时间</a-option>
+                                    </a-select>
                                     <a-range-picker v-model="formModel.query_date" style="width: 100%"
                                         @change="changeDate" />
                                 </a-form-item>
@@ -141,10 +146,6 @@
                                             </template>
                                         </a-tooltip>
                                     </div>
-                                    <div> {{ record.tbPaidTime }}付款 </div>
-                                    <div v-if="record.tkEarningTime != '0001-01-01 00:00:00'">
-                                        {{ record.tkEarningTime }}结算
-                                    </div>
                                 </div>
                             </template>
                         </a-list-item-meta>
@@ -160,16 +161,16 @@
                 </template>
                 <template #pubSharePreFee="{ record }">
                     <div class="text-3">
-                        <div>付款预估佣金收入：<span class="money-sum">￥{{ record.pubSharePreFeeForCommission }}</span></div>
-                        <div>付款预估补贴收入：<span class="money-sum">￥{{ record.pubSharePreFeeForSdy }}</span></div>
-
+                        <div>预估佣金：<span class="money-sum">￥{{ record.pubSharePreFeeForCommission }}</span></div>
+                        <div>预估补贴：<span class="money-sum">￥{{ record.pubSharePreFeeForSdy }}</span></div>
+                        <a-tag>{{ record.accountName }}</a-tag>
                     </div>
                 </template>
 
                 <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>
@@ -178,6 +179,10 @@
                     <div>￥{{ record.alimamaShareFee }}</div>
                 </template>
                 <template #last_time="{ record }">
+                    <div> 付款 {{ record.tbPaidTime }} </div>
+                    <div v-if="record.tkEarningTime != '0001-01-01 00:00:00'">
+                        结算 {{ record.tkEarningTime }}
+                    </div>
                     <div class="money-sum">{{ record.last_time }}</div>
                 </template>
 
@@ -216,6 +221,7 @@ type Column = TableColumnData & { checked?: true };
 
 const props = defineProps({
     keyword: { type: String },
+    queryType: { type: String },
     tkStatus: { type: Array<number> },
     queryDate: { type: Array<string> }
 })
@@ -226,10 +232,11 @@ const generateFormModel = () => {
         tkStatus: props.tkStatus || [3, 12, 13, 14],
         formModel: 1000,
         query_date: props.queryDate || [] as Array<string>,
+        query_type: props.queryType || 'tbPaidTime',
         current: 1,
         pageSize: 20,
         maxTotal: 1000,
-        sort: 'tkPaidTime',
+        sort: 'tbPaidTime',
         order: 'descending',
     };
 };
@@ -311,14 +318,14 @@ const columns = computed<TableColumnData[]>(() => [
         title: '付款预估收入',
         dataIndex: 'pubSharePreFee',
         slotName: 'pubSharePreFee',
-        width: 220,
+        width: 150,
         align: 'right'
     },
     {
         title: '结算预估收入',
         dataIndex: 'totalCommissionFee',
         slotName: 'totalCommissionFee',
-        width: 220,
+        width: 150,
         align: 'right'
     },
     {
@@ -329,10 +336,10 @@ const columns = computed<TableColumnData[]>(() => [
         align: 'right'
     },
     {
-        title: '最后更新时间',
+        title: '时间',
         dataIndex: 'last_time',
         slotName: 'last_time',
-        width: 100,
+        width: 180,
         align: 'right'
     },
 ]);
@@ -344,7 +351,7 @@ const fetchData = async (
         current: 1,
         pageSize: 20,
         maxTotal: 1000,
-        sort: 'tkPaidTime',
+        sort: 'tbPaidTime',
         order: 'descending',
     }
 ) => {