From 3145335e6b3019c8dd56f3807e3df8db680ff401 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E8=BF=9C?= <2970639877@qq.com>
Date: Thu, 2 Apr 2026 18:18:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/agent/customerTradeOrder.ts   |  7 ++-
 src/components/common/Search.vue              |  8 ++-
 src/views/agent/customerTradeOrder/index.vue  | 51 +++++++++++++++----
 src/views/agent/customerTradeOrder/options.ts | 50 ++++++++++--------
 src/views/trade/positionStat/options.ts       | 18 +++----
 vite.config.ts                                |  3 ++
 6 files changed, 96 insertions(+), 41 deletions(-)

diff --git a/src/api/modules/agent/customerTradeOrder.ts b/src/api/modules/agent/customerTradeOrder.ts
index 81e9a53..3f7acf3 100644
--- a/src/api/modules/agent/customerTradeOrder.ts
+++ b/src/api/modules/agent/customerTradeOrder.ts
@@ -1,6 +1,11 @@
 import { request } from '@/api';
 
-// 获取跟订单列表
+// 获取交易订单列表
 export const getCustomTradeOrderListApi = (params: any) => {
     return request.get('/orderRecords/getList', {...params})
+}
+
+//查询子账户列表
+export const getSubAccountListApi = (params: any) => {
+    return request.get('/user/getAllAccount', {...params})
 }
\ No newline at end of file
diff --git a/src/components/common/Search.vue b/src/components/common/Search.vue
index 61fed4c..ff51508 100644
--- a/src/components/common/Search.vue
+++ b/src/components/common/Search.vue
@@ -8,7 +8,7 @@
                     <!-- 输入框 -->
                     <el-input v-if="item.type === 'input'" v-model="searchForm[item.prop]"
                         :placeholder="item.placeholder || `请输入${item.label}`" :clearable="item.clearable ?? true"
-                        :disabled="item.disabled" />
+                        :disabled="item.disabled"  @blur="handleBlur"/>
 
                     <!-- 选择器 -->
                     <el-select v-else-if="item.type === 'select'" v-model="searchForm[item.prop]"
@@ -96,7 +96,11 @@ const props = defineProps({
 })
 
 // 暴露事件
-defineEmits(['search', 'reset'])
+const emit = defineEmits(['search', 'reset','blur-input'])
+// 3. 👇 关键：账户名输入完成 → 抛事件给父组件
+const handleBlur = () => {
+  emit('blur-input')
+}
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/agent/customerTradeOrder/index.vue b/src/views/agent/customerTradeOrder/index.vue
index a682ac7..94c964c 100644
--- a/src/views/agent/customerTradeOrder/index.vue
+++ b/src/views/agent/customerTradeOrder/index.vue
@@ -2,7 +2,7 @@
     <div>
         <!-- 搜索 -->
         <CustomerTradeOrderSearch :search-form="searchForm" :search-options="searchOptions" @search="handleSearch"
-            @reset="handleReset">
+            @reset="handleReset"  @blur-input="getSubAccountList">
         </CustomerTradeOrderSearch>
         <div class="bar" v-if="searchForm.orderId === '1'">
             <div>持仓量:0</div>
@@ -14,7 +14,7 @@
 
         <!-- 分页 -->
         <CustomerTradeOrderPagination v-model="currentPage" v-model:pageSizeValue="pageSize" :total="total"
-           @pagination-change="handlePaginationChange" />
+            @pagination-change="handlePaginationChange" />
 
     </div>
 </template>
@@ -28,10 +28,9 @@ import CustomerTradeOrderPagination from '@/components/common/Pagination.vue'
 import { search, tradeOrderTableColumns, positionOrderTableColumns } from './options'
 
 // 接口
-import { getCustomTradeOrderListApi } from '@/api/modules/agent/customerTradeOrder'
-
-
-
+import { getCustomTradeOrderListApi, getSubAccountListApi } from '@/api/modules/agent/customerTradeOrder'
+// 本地存储
+import { getStorage } from '@/utils/storage'
 
 // 公用方法
 
@@ -44,8 +43,13 @@ const searchForm = ref({
     tradeType: '',
     startTime: '',
     endTime: '',
+    subAccountName: '',
 })
 const searchOptions = ref(search)
+const subAccountOptions = ref([])
+//获取用户数据，用来判断当前查询的是不是自己的账号
+const userInfo: any = getStorage('userInfo')
+
 /**
  * @description: 定义表格数据
  */
@@ -67,12 +71,13 @@ const getCustomerTradeOrderList = async () => {
         page: currentPage.value,
         page_size: pageSize.value,
         user_name: searchForm.value.accountName,
-        account_id: searchForm.value.accountName,
+        account_id: searchForm.value.subAccountName,
         order_no: '',
         type: searchForm.value.tradeType,
-        start_time: searchForm.value.startTime.length > 0 ? `${searchForm.value.startTime} 0:00:00` : '2026-01-01 0:00:00',
-        end_time: searchForm.value.endTime.length > 0 ? `${searchForm.value.endTime} 23:59:59` : '2026-01-01 23:59:59',
+        start_time: '',
+        end_time: '',
     }
+    console.log(params)
     const data: any = await getCustomTradeOrderListApi(params)
 
     //表格数据
@@ -94,12 +99,39 @@ const getCustomerTradeOrderList = async () => {
     currentPage.value = data.current_page
     pageSize.value = Number(data.per_page)
 }
+
+const getSubAccountList = async () => {
+    const accountName = searchForm.value.accountName
+    // 空值不请求
+    if (!accountName) {
+        subAccountOptions.value = []
+        searchForm.value.subAccountName = ''
+        return
+    }
+
+    try {
+        const params = {
+            username: userInfo.username === searchForm.value.accountName ? '' : accountName,
+        }
+        const data: any = await getSubAccountListApi(params)
+        subAccountOptions.value = data.map((item: any) => ({
+            label: item.name || item.account_name, // 子账户名称
+            value: item.id || item.account_id    // 子账户值
+        }))
+        searchOptions.value.find(item => item.prop === 'subAccountName')!.options = subAccountOptions.value
+    } catch (error) {
+        subAccountOptions.value = []
+        console.error('获取子账户失败', error)
+    }
+}
+
 /**
  * @description: 页面加载完成需要请求的数据
  */
 onMounted(() => {
     getCustomerTradeOrderList()
 })
+
 /**
  * @description: 定义搜索方法
  */
@@ -113,6 +145,7 @@ const handleReset = () => {
         tradeType: '',
         startTime: '',
         endTime: '',
+        subAccountName: '',
     }
     getCustomerTradeOrderList()
 }
diff --git a/src/views/agent/customerTradeOrder/options.ts b/src/views/agent/customerTradeOrder/options.ts
index 3fcf4d0..da425c3 100644
--- a/src/views/agent/customerTradeOrder/options.ts
+++ b/src/views/agent/customerTradeOrder/options.ts
@@ -2,14 +2,7 @@
  * @description: 搜索配置
  */
 export const search = [
-    // 账户名
-    {
-        label: '账户名',
-        prop: 'accountName',
-        type: 'input' as const,
-        placeholder: '请输入账户名',
-        width: '140px'
-    },
+    // 订单类型
     {
         label: '订单',
         prop: 'orderId',
@@ -26,6 +19,23 @@ export const search = [
         ],
         width: '140px'
     },
+    // 账户名
+    {
+        label: '账户名',
+        prop: 'accountName',
+        type: 'input' as const,
+        placeholder: '请输入账户名',
+        width: '140px'
+    },
+    // 子账号
+    {
+        label: '子账号',
+        prop: 'subAccountName',
+        type: 'select' as const,
+        placeholder: '请选择子账号',
+        width: '140px',
+        options: []
+    },
     // 选择交易类型
     {
         label: '交易类型',
@@ -47,18 +57,18 @@ export const search = [
         ],
         width: '140px'
     },
-    // 开始时间
-    {
-        prop: "startTime", label: '注册开始时间', type: 'date' as const, dateType: 'date' as const, // 时间范围选择器
-        valueFormat: 'YYYY-MM-DD',
-        width: '140px'
-    },
-    // 结束时间
-    {
-        prop: "endTime", label: '注册结束时间', type: 'date' as const, dateType: 'date' as const, // 时间范围选择器
-        valueFormat: 'YYYY-MM-DD',
-        width: '140px'
-    },
+    // // 开始时间
+    // {
+    //     prop: "startTime", label: '注册开始时间', type: 'date' as const, dateType: 'date' as const, // 时间范围选择器
+    //     valueFormat: 'YYYY-MM-DD',
+    //     width: '140px'
+    // },
+    // // 结束时间
+    // {
+    //     prop: "endTime", label: '注册结束时间', type: 'date' as const, dateType: 'date' as const, // 时间范围选择器
+    //     valueFormat: 'YYYY-MM-DD',
+    //     width: '140px'
+    // },
 ]
 
 /**
diff --git a/src/views/trade/positionStat/options.ts b/src/views/trade/positionStat/options.ts
index 2464a50..ba18383 100644
--- a/src/views/trade/positionStat/options.ts
+++ b/src/views/trade/positionStat/options.ts
@@ -9,15 +9,15 @@ export const search = [
     //账号
     { prop: 'account', label: '账号', type: 'select' as const, placeholder: '请选择账号',width: '150px' },
     //开始时间
-    {
-        prop: 'startTime', label: '开始时间', type: 'date' as const, dateType: 'date' as const, // 时间范围选择器
-        valueFormat: 'YYYY-MM-DD', placeholder: '请选择开始时间', width: '150px'
-    },
-    //结束时间
-    {
-        prop: 'endTime', label: '结束时间', type: 'date' as const, dateType: 'date' as const, // 时间范围选择器
-        valueFormat: 'YYYY-MM-DD', placeholder: '请选择结束时间', width: '150px'
-    },
+    // {
+    //     prop: 'startTime', label: '开始时间', type: 'date' as const, dateType: 'date' as const, // 时间范围选择器
+    //     valueFormat: 'YYYY-MM-DD', placeholder: '请选择开始时间', width: '150px'
+    // },
+    // //结束时间
+    // {
+    //     prop: 'endTime', label: '结束时间', type: 'date' as const, dateType: 'date' as const, // 时间范围选择器
+    //     valueFormat: 'YYYY-MM-DD', placeholder: '请选择结束时间', width: '150px'
+    // },
 ]
 
 export const tableColumns = [
diff --git a/vite.config.ts b/vite.config.ts
index d31332a..4673c7b 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -76,5 +76,8 @@ export default defineConfig(({ mode }) => {
       //   },
       // } : {},
     },
+    server: {
+      host: true,
+    },
   }
 })