fix: 功能修复，账号相关，新增交易明细记录。

src/views/invest/accounts/index.vue

@@ -149,20 +149,21 @@
         </el-form-item>
       </el-form>
       <el-table v-loading="loadingDealRecord" :data="tableDealRecordData">
-        <el-table-column label="交易时间" align="center" prop="createTime" />
+        <el-table-column label="交易时间" align="center" width="180" prop="createTime" />
         <el-table-column label="交易金额" align="center" prop="amount" />
         <el-table-column label="当前余额" align="center" prop="currentBalance" />
-        <el-table-column label="交易类型" align="center" prop="dealType">
+        <el-table-column label="交易类型" align="center" width="120" prop="dealType">
           <template #default="scope">
             <dict-tag :options="deal_type" :value="scope.row.dealType" />
           </template>
         </el-table-column>
-        <el-table-column label="交易类别" align="center" prop="dealCategory">
+        <el-table-column label="交易类别" align="center" width="150" prop="dealCategory">
           <template #default="scope">
             <dict-tag :options="deal_category" :value="scope.row.dealCategory" />
           </template>
         </el-table-column>
-        <el-table-column label="备注" align="center" width="380" prop="remark" />
+        <el-table-column label="交易子类别" align="center" width="150" prop="childCategoryName" />
+        <el-table-column label="备注" align="center" width="300" prop="remark" />
       </el-table>
       <el-pagination small background layout="total, prev, pager, next" :total="dealRecordTotal" @current-change="handleCurrentDealRecordChange" />
     </el-dialog>
@@ -266,7 +267,7 @@ const operateList = ref([
   { id: 'view', icon: 'View', title: '查看', hasPermi: ['invest:accounts:query'] },
   { id: 'edit', icon: 'Edit', title: '修改', hasPermi: ['invest:accounts:edit'] },
   // { id: 'delete', icon: 'Delete', title: '删除', hasPermi: ['invest:accounts:remove'] },
-  { id: 'dealRecord', icon: 'Tickets', title: '交易记录', hasPermi: ['invest:accounts:query'] },
+  { id: 'dealRecord', icon: 'Tickets', title: '交易明细', hasPermi: ['invest:accounts:query'] },
   { id: 'transDeal', icon: 'Cellphone', title: '转账记录', hasPermi: ['invest:accounts:query'] }
 ])
 const data = reactive({
@@ -465,13 +466,13 @@ function handleExport() {
   )
 }
 
-/** 历史数据按钮操作 */
+/** 交易明细按钮操作 */
 function handleDealRecord(row) {
   const _id = row.id || ids.value
   queryDealRecordParams.value.time = ''
   queryDealRecordParams.value.dealType = ''
   queryDealRecordParams.value.dealCategory = ''
-  titleDealRecord.value = row.nameCode + '历史交易记录'
+  titleDealRecord.value = `${row.name}${row.code ? '【' + row.code + '】' : ''}交易明细`
   currentAccountId.value = _id
   getDealRecordList(1)
   openDealRecord.value = true

src/views/invest/creditcard/index.vue

@@ -73,7 +73,7 @@
               <dict-tag :options="account_status" :value="scope.row.status" />
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="165" align="center" class-name="small-padding fixed-width">
+          <el-table-column label="操作" width="210" align="center" class-name="small-padding fixed-width">
             <template v-slot="scope">
               <div class="ctrl-btn d-flex">
                 <el-tooltip v-for="item in operateList" :key="item.id" class="item" effect="dark" :content="item.title" placement="top">
@@ -265,6 +265,46 @@
       </div>
       <template #footer> </template>
     </el-dialog>
+
+    <el-dialog :title="titleDealRecord" v-model="openDealRecord" width="1200px" append-to-body destroy-on-close>
+      <el-form :model="queryDealRecordParams" ref="queryDealRecordRef" inline>
+        <el-form-item label="交易时间" prop="time">
+          <el-date-picker v-model="queryDealRecordParams.time" type="daterange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" />
+        </el-form-item>
+        <el-form-item label="交易类型" style="width: 220px" prop="dealType">
+          <el-select v-model="queryDealRecordParams.dealType" placeholder="请选择交易类型" clearable>
+            <el-option v-for="dict in deal_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="交易类别" style="width: 220px" prop="dealCategory">
+          <el-select v-model="queryDealRecordParams.dealCategory" placeholder="请选择交易类别" clearable>
+            <el-option v-for="dict in deal_category" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="">
+          <el-button type="primary" icon="Search" @click="handleDealRecordQuery">搜索</el-button>
+          <el-button type="info" icon="Refresh" @click="resetDealRecordQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="loadingDealRecord" :data="tableDealRecordData">
+        <el-table-column label="交易时间" align="center" prop="createTime" width="180" />
+        <el-table-column label="交易金额" align="center" prop="amount" />
+        <el-table-column label="当前余额" align="center" prop="currentBalance" />
+        <el-table-column label="交易类型" width="120" align="center" prop="dealType">
+          <template #default="scope">
+            <dict-tag :options="deal_type" :value="scope.row.dealType" />
+          </template>
+        </el-table-column>
+        <el-table-column label="交易类别" width="150" align="center" prop="dealCategory">
+          <template #default="scope">
+            <dict-tag :options="deal_category" :value="scope.row.dealCategory" />
+          </template>
+        </el-table-column>
+        <el-table-column label="交易子类别" width="150" align="center" prop="childCategoryName" />
+        <el-table-column label="备注" align="center" width="300" prop="remark" />
+      </el-table>
+      <el-pagination small background layout="total, prev, pager, next" :total="dealRecordTotal" @current-change="handleCurrentDealRecordChange" />
+    </el-dialog>
   </div>
 </template>
 
@@ -272,11 +312,14 @@
 import { listBankcardLend, getBankcardLend, delBankcardLend, addBankcardLend, updateBankcardLend } from '@/api/invest/bankcardlend'
 import { listLimitHistory, getLimitHistory, delLimitHistory, addLimitHistory, updateLimitHistory } from '@/api/invest/limitHistory'
 import { listBankBaseInfo } from '@/api/invest/bankBaseInfo'
+import { listAccountDealRecord } from '@/api/invest/accountDealRecord'
+import dayjs from 'dayjs'
 // eslint-disable-next-line no-unused-vars
 import { require } from '@/utils/require'
 const { proxy } = getCurrentInstance()
 const { is_zero_bill, is_next_bill_date, account_status, card_tier } = proxy.useDict('is_zero_bill', 'is_next_bill_date', 'account_status', 'card_tier')
 const { limit_history_type, adjust_type } = proxy.useDict('limit_history_type', 'adjust_type')
+const { deal_type, deal_category } = proxy.useDict('deal_type', 'deal_category')
 const bankcardList = ref([])
 const open = ref(false)
 const loading = ref(true)
@@ -286,6 +329,19 @@ const single = ref(true)
 const multiple = ref(true)
 const total = ref(0)
 const title = ref('')
+const titleDealRecord = ref('')
+const openDealRecord = ref(false)
+const currentAccountId = ref('')
+const loadingDealRecord = ref(false)
+const tableDealRecordData = ref([])
+const dealRecordTotal = ref(0)
+const queryDealRecordParams = ref({
+  time: '',
+  dealType: null,
+  dealCategory: null,
+  pageNum: 1,
+  pageSize: 10
+})
 
 const detailOpen = ref(false)
 const openDetail = ref(false)
@@ -297,6 +353,7 @@ const bankList = ref([])
 
 const operateList = ref([
   { id: 'view', icon: 'View', title: '查看', hasPermi: ['invest:bankcard:query'] },
+  { id: 'dealRecord', icon: 'Tickets', title: '交易明细', hasPermi: ['invest:bankcard:query'] },
   { id: 'limit', icon: 'Grid', title: '调额记录', hasPermi: ['invest:bankcard:edit'] },
   { id: 'edit', icon: 'Edit', title: '修改', hasPermi: ['invest:bankcard:edit'] },
   { id: 'delete', icon: 'Delete', title: '删除', hasPermi: ['invest:bankcard:remove'] }
@@ -339,6 +396,9 @@ const data = reactive({
 
 const handleOperate = (operate, row) => {
   switch (operate) {
+    case 'dealRecord':
+      handleDealRecord(row)
+      break
     case 'limit':
       handleDetail(row)
       break
@@ -474,6 +534,54 @@ function handleDetail(row) {
   })
 }
 
+/** 交易明细按钮操作 */
+function handleDealRecord(row) {
+  queryDealRecordParams.value.time = ''
+  queryDealRecordParams.value.dealType = ''
+  queryDealRecordParams.value.dealCategory = ''
+  titleDealRecord.value = `${row.name}${row.code ? '【' + row.code + '】' : ''}交易明细`
+  currentAccountId.value = row.id || ids.value
+  getDealRecordList(1)
+  openDealRecord.value = true
+}
+
+const handleCurrentDealRecordChange = (num) => {
+  getDealRecordList(num)
+}
+
+const handleDealRecordQuery = () => {
+  getDealRecordList(1)
+}
+
+const resetDealRecordQuery = () => {
+  proxy.resetForm('queryDealRecordRef')
+  queryDealRecordParams.value.time = ''
+  queryDealRecordParams.value.dealType = ''
+  queryDealRecordParams.value.dealCategory = ''
+  dealRecordTotal.value = 0
+  getDealRecordList(1)
+}
+
+const getDealRecordList = (num) => {
+  loadingDealRecord.value = true
+  const timeRange = queryDealRecordParams.value.time
+  let st = ''
+  let et = ''
+  if (timeRange && timeRange.length === 2) {
+    st = dayjs(timeRange[0]).format('YYYY-MM-DD')
+    et = dayjs(timeRange[1]).format('YYYY-MM-DD')
+  }
+  queryDealRecordParams.value.startTime = st
+  queryDealRecordParams.value.endTime = et
+  queryDealRecordParams.value.pageNum = num
+  queryDealRecordParams.value.accountId = currentAccountId.value
+  listAccountDealRecord(queryDealRecordParams.value).then((response) => {
+    loadingDealRecord.value = false
+    tableDealRecordData.value = response.rows
+    dealRecordTotal.value = response.total
+  })
+}
+
 /** 查询信用卡信息列表 */
 function getList() {
   loading.value = true

src/views/invest/debitcard/index.vue

@@ -72,7 +72,7 @@
           </el-table-column>
           <el-table-column label="卡面" align="center" width="100" prop="cardFace" />
           <el-table-column label="备注" align="center" prop="remark" />
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <el-table-column label="操作" width="210" align="center" class-name="small-padding fixed-width">
             <template v-slot="scope">
               <div class="ctrl-btn d-flex">
                 <el-tooltip v-for="item in operateList" :key="item.id" class="item" effect="dark" :content="item.title" placement="top">
@@ -224,6 +224,46 @@
       </div>
       <template #footer> </template>
     </el-dialog>
+
+    <el-dialog :title="titleDealRecord" v-model="openDealRecord" width="1200px" append-to-body destroy-on-close>
+      <el-form :model="queryDealRecordParams" ref="queryDealRecordRef" inline>
+        <el-form-item label="交易时间" prop="time">
+          <el-date-picker v-model="queryDealRecordParams.time" type="daterange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" />
+        </el-form-item>
+        <el-form-item label="交易类型" style="width: 220px" prop="dealType">
+          <el-select v-model="queryDealRecordParams.dealType" placeholder="请选择交易类型" clearable>
+            <el-option v-for="dict in deal_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="交易类别" style="width: 220px" prop="dealCategory">
+          <el-select v-model="queryDealRecordParams.dealCategory" placeholder="请选择交易类别" clearable>
+            <el-option v-for="dict in deal_category" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="">
+          <el-button type="primary" icon="Search" @click="handleDealRecordQuery">搜索</el-button>
+          <el-button type="info" icon="Refresh" @click="resetDealRecordQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="loadingDealRecord" :data="tableDealRecordData">
+        <el-table-column label="交易时间" align="center" prop="createTime" width="180" />
+        <el-table-column label="交易金额" align="center" prop="amount" />
+        <el-table-column label="当前余额" align="center" prop="currentBalance" />
+        <el-table-column label="交易类型" align="center" width="120" prop="dealType">
+          <template #default="scope">
+            <dict-tag :options="deal_type" :value="scope.row.dealType" />
+          </template>
+        </el-table-column>
+        <el-table-column label="交易类别" align="center" width="120" prop="dealCategory">
+          <template #default="scope">
+            <dict-tag :options="deal_category" :value="scope.row.dealCategory" />
+          </template>
+        </el-table-column>
+        <el-table-column label="交易子类别" align="center" width="150" prop="childCategoryName" />
+        <el-table-column label="备注" align="center" width="300" prop="remark" />
+      </el-table>
+      <el-pagination small background layout="total, prev, pager, next" :total="dealRecordTotal" @current-change="handleCurrentDealRecordChange" />
+    </el-dialog>
   </div>
 </template>
 
@@ -231,11 +271,14 @@
 import { listBankcardLend, getBankcardLend, delBankcardLend, addBankcardLend, updateBankcardLend } from '@/api/invest/bankcardlend'
 import { listLimitHistory, getLimitHistory, delLimitHistory, addLimitHistory, updateLimitHistory } from '@/api/invest/limitHistory'
 import { listBankBaseInfo } from '@/api/invest/bankBaseInfo'
+import { listAccountDealRecord } from '@/api/invest/accountDealRecord'
+import dayjs from 'dayjs'
 // eslint-disable-next-line no-unused-vars
 import { require } from '@/utils/require'
 const { proxy } = getCurrentInstance()
 const { bank_card_type, debit_type, account_status, card_tier } = proxy.useDict('bank_card_type', 'debit_type', 'account_status', 'card_tier')
 const { limit_history_type, adjust_type } = proxy.useDict('limit_history_type', 'adjust_type')
+const { deal_type, deal_category } = proxy.useDict('deal_type', 'deal_category')
 const bankcardList = ref([])
 const open = ref(false)
 const loading = ref(true)
@@ -245,6 +288,19 @@ const single = ref(true)
 const multiple = ref(true)
 const total = ref(0)
 const title = ref('')
+const titleDealRecord = ref('')
+const openDealRecord = ref(false)
+const currentAccountId = ref('')
+const loadingDealRecord = ref(false)
+const tableDealRecordData = ref([])
+const dealRecordTotal = ref(0)
+const queryDealRecordParams = ref({
+  time: '',
+  dealType: null,
+  dealCategory: null,
+  pageNum: 1,
+  pageSize: 10
+})
 
 const detailOpen = ref(false)
 const openDetail = ref(false)
@@ -256,6 +312,7 @@ const bankList = ref([])
 
 const operateList = ref([
   { id: 'view', icon: 'View', title: '查看', hasPermi: ['invest:bankcard:query'] },
+  { id: 'dealRecord', icon: 'Tickets', title: '交易明细', hasPermi: ['invest:bankcard:query'] },
   { id: 'limit', icon: 'Grid', title: '非柜面限额记录', hasPermi: ['invest:bankcard:edit'] },
   { id: 'edit', icon: 'Edit', title: '修改', hasPermi: ['invest:bankcard:edit'] },
   { id: 'delete', icon: 'Delete', title: '删除', hasPermi: ['invest:bankcard:remove'] }
@@ -295,6 +352,9 @@ const data = reactive({
 
 const handleOperate = (operate, row) => {
   switch (operate) {
+    case 'dealRecord':
+      handleDealRecord(row)
+      break
     case 'limit':
       handleDetail(row)
       break
@@ -429,6 +489,54 @@ function handleDetail(row) {
     limitHistoryList.value = response.rows
   })
 }
+
+/** 交易明细按钮操作 */
+function handleDealRecord(row) {
+  queryDealRecordParams.value.time = ''
+  queryDealRecordParams.value.dealType = ''
+  queryDealRecordParams.value.dealCategory = ''
+  titleDealRecord.value = `${row.name}${row.code ? '【' + row.code + '】' : ''}交易明细`
+  currentAccountId.value = row.id || ids.value
+  getDealRecordList(1)
+  openDealRecord.value = true
+}
+
+const handleCurrentDealRecordChange = (num) => {
+  getDealRecordList(num)
+}
+
+const handleDealRecordQuery = () => {
+  getDealRecordList(1)
+}
+
+const resetDealRecordQuery = () => {
+  proxy.resetForm('queryDealRecordRef')
+  queryDealRecordParams.value.time = ''
+  queryDealRecordParams.value.dealType = ''
+  queryDealRecordParams.value.dealCategory = ''
+  dealRecordTotal.value = 0
+  getDealRecordList(1)
+}
+
+const getDealRecordList = (num) => {
+  loadingDealRecord.value = true
+  const timeRange = queryDealRecordParams.value.time
+  let st = ''
+  let et = ''
+  if (timeRange && timeRange.length === 2) {
+    st = dayjs(timeRange[0]).format('YYYY-MM-DD')
+    et = dayjs(timeRange[1]).format('YYYY-MM-DD')
+  }
+  queryDealRecordParams.value.startTime = st
+  queryDealRecordParams.value.endTime = et
+  queryDealRecordParams.value.pageNum = num
+  queryDealRecordParams.value.accountId = currentAccountId.value
+  listAccountDealRecord(queryDealRecordParams.value).then((response) => {
+    loadingDealRecord.value = false
+    tableDealRecordData.value = response.rows
+    dealRecordTotal.value = response.total
+  })
+}
 /** 查询储蓄账户信息列表 */
 function getList() {
   loading.value = true

src/views/invest/financials/index.vue

@@ -46,7 +46,7 @@
             </template>
           </el-table-column>
           <el-table-column label="备注" align="center" prop="remark" />
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <el-table-column label="操作" width="210" align="center" class-name="small-padding fixed-width">
             <template v-slot="scope">
               <div class="ctrl-btn d-flex">
                 <el-tooltip v-for="item in operateList" :key="item.id" class="item" effect="dark" :content="item.title" placement="top">
@@ -111,16 +111,58 @@
         </div>
       </template>
     </el-dialog>
+
+    <el-dialog :title="titleDealRecord" v-model="openDealRecord" width="1200px" append-to-body destroy-on-close>
+      <el-form :model="queryDealRecordParams" ref="queryDealRecordRef" inline>
+        <el-form-item label="交易时间" prop="time">
+          <el-date-picker v-model="queryDealRecordParams.time" type="daterange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" />
+        </el-form-item>
+        <el-form-item label="交易类型" style="width: 220px" prop="dealType">
+          <el-select v-model="queryDealRecordParams.dealType" placeholder="请选择交易类型" clearable>
+            <el-option v-for="dict in deal_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="交易类别" style="width: 220px" prop="dealCategory">
+          <el-select v-model="queryDealRecordParams.dealCategory" placeholder="请选择交易类别" clearable>
+            <el-option v-for="dict in deal_category" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="">
+          <el-button type="primary" icon="Search" @click="handleDealRecordQuery">搜索</el-button>
+          <el-button type="info" icon="Refresh" @click="resetDealRecordQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="loadingDealRecord" :data="tableDealRecordData">
+        <el-table-column label="交易时间" align="center" prop="createTime" width="180" />
+        <el-table-column label="交易金额" align="center" prop="amount" />
+        <el-table-column label="当前余额" align="center" prop="currentBalance" />
+        <el-table-column label="交易类型" align="center" width="120" prop="dealType">
+          <template #default="scope">
+            <dict-tag :options="deal_type" :value="scope.row.dealType" />
+          </template>
+        </el-table-column>
+        <el-table-column label="交易类别" align="center" width="150" prop="dealCategory">
+          <template #default="scope">
+            <dict-tag :options="deal_category" :value="scope.row.dealCategory" />
+          </template>
+        </el-table-column>
+        <el-table-column label="交易子类别" align="center" width="150" prop="childCategoryName" />
+        <el-table-column label="备注" align="center" width="300" prop="remark" />
+      </el-table>
+      <el-pagination small background layout="total, prev, pager, next" :total="dealRecordTotal" @current-change="handleCurrentDealRecordChange" />
+    </el-dialog>
   </div>
 </template>
 
 <script setup name="FutureStocks">
 import { listFutureStocks, getFutureStocks, delFutureStocks, addFutureStocks, updateFutureStocks } from '@/api/invest/futureStocks'
+import { listAccountDealRecord } from '@/api/invest/accountDealRecord'
 import { listBankcardLend } from '@/api/invest/bankcardlend'
 // eslint-disable-next-line no-unused-vars
 import { require } from '@/utils/require'
 const { proxy } = getCurrentInstance()
 const { future_stock_type, account_status } = proxy.useDict('future_stock_type', 'account_status')
+const { deal_type, deal_category } = proxy.useDict('deal_type', 'deal_category')
 
 const futureStocksList = ref([])
 const open = ref(false)
@@ -131,9 +173,23 @@ const single = ref(true)
 const multiple = ref(true)
 const total = ref(0)
 const title = ref('')
+const titleDealRecord = ref('')
+const openDealRecord = ref(false)
+const currentAccountId = ref('')
+const loadingDealRecord = ref(false)
+const tableDealRecordData = ref([])
+const dealRecordTotal = ref(0)
+const queryDealRecordParams = ref({
+  time: '',
+  dealType: null,
+  dealCategory: null,
+  pageNum: 1,
+  pageSize: 10
+})
 const debitCardList = ref([])
 const operateList = ref([
   { id: 'view', icon: 'View', title: '查看', hasPermi: ['invest:futureStocks:query'] },
+  { id: 'dealRecord', icon: 'Tickets', title: '交易明细', hasPermi: ['invest:futureStocks:query'] },
   { id: 'edit', icon: 'Edit', title: '修改', hasPermi: ['invest:futureStocks:edit'] },
   { id: 'delete', icon: 'Delete', title: '删除', hasPermi: ['invest:futureStocks:remove'] }
 ])
@@ -172,6 +228,9 @@ const handleOperate = (operate, row) => {
     case 'view':
       handleView(row)
       break
+    case 'dealRecord':
+      handleDealRecord(row)
+      break
     case 'edit':
       handleUpdate(row)
       break
@@ -298,6 +357,54 @@ function handleUpdate(row) {
   })
 }
 
+/** 交易明细按钮操作 */
+function handleDealRecord(row) {
+  queryDealRecordParams.value.time = ''
+  queryDealRecordParams.value.dealType = ''
+  queryDealRecordParams.value.dealCategory = ''
+  titleDealRecord.value = `${row.name}${row.code ? '【' + row.code + '】' : ''}交易明细`
+  currentAccountId.value = row.id || ids.value
+  getDealRecordList(1)
+  openDealRecord.value = true
+}
+
+const handleCurrentDealRecordChange = (num) => {
+  getDealRecordList(num)
+}
+
+const handleDealRecordQuery = () => {
+  getDealRecordList(1)
+}
+
+const resetDealRecordQuery = () => {
+  proxy.resetForm('queryDealRecordRef')
+  queryDealRecordParams.value.time = ''
+  queryDealRecordParams.value.dealType = ''
+  queryDealRecordParams.value.dealCategory = ''
+  dealRecordTotal.value = 0
+  getDealRecordList(1)
+}
+
+const getDealRecordList = (num) => {
+  loadingDealRecord.value = true
+  const timeRange = queryDealRecordParams.value.time
+  let st = ''
+  let et = ''
+  if (timeRange && timeRange.length > 0) {
+    st = timeRange[0]
+    et = timeRange[1]
+  }
+  queryDealRecordParams.value.startTime = st
+  queryDealRecordParams.value.endTime = et
+  queryDealRecordParams.value.pageNum = num
+  queryDealRecordParams.value.accountId = currentAccountId.value
+  listAccountDealRecord(queryDealRecordParams.value).then((response) => {
+    loadingDealRecord.value = false
+    tableDealRecordData.value = response.rows
+    dealRecordTotal.value = response.total
+  })
+}
+
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs.futureStocksRef.validate((valid) => {

src/views/invest/futures/index.vue

@@ -44,7 +44,7 @@
           <el-table-column label="关联储蓄卡" align="center" prop="bankNameCode" />
           <el-table-column label="开户日期" align="center" prop="activationDate" width="120"> </el-table-column>
           <el-table-column label="备注" align="center" prop="remark" />
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <el-table-column label="操作" width="210" align="center" class-name="small-padding fixed-width">
             <template v-slot="scope">
               <div class="ctrl-btn d-flex">
                 <el-tooltip v-for="item in operateList" :key="item.id" class="item" effect="dark" :content="item.title" placement="top">
@@ -121,16 +121,58 @@
         </div>
       </template>
     </el-dialog>
+
+    <el-dialog :title="titleDealRecord" v-model="openDealRecord" width="1200px" append-to-body destroy-on-close>
+      <el-form :model="queryDealRecordParams" ref="queryDealRecordRef" inline>
+        <el-form-item label="交易时间" prop="time">
+          <el-date-picker v-model="queryDealRecordParams.time" type="daterange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" />
+        </el-form-item>
+        <el-form-item label="交易类型" style="width: 220px" prop="dealType">
+          <el-select v-model="queryDealRecordParams.dealType" placeholder="请选择交易类型" clearable>
+            <el-option v-for="dict in deal_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="交易类别" style="width: 220px" prop="dealCategory">
+          <el-select v-model="queryDealRecordParams.dealCategory" placeholder="请选择交易类别" clearable>
+            <el-option v-for="dict in deal_category" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="">
+          <el-button type="primary" icon="Search" @click="handleDealRecordQuery">搜索</el-button>
+          <el-button type="info" icon="Refresh" @click="resetDealRecordQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="loadingDealRecord" :data="tableDealRecordData">
+        <el-table-column label="交易时间" align="center" prop="createTime" width="180" />
+        <el-table-column label="交易金额" align="center" prop="amount" />
+        <el-table-column label="当前余额" align="center" prop="currentBalance" />
+        <el-table-column label="交易类型" align="center" width="120" prop="dealType">
+          <template #default="scope">
+            <dict-tag :options="deal_type" :value="scope.row.dealType" />
+          </template>
+        </el-table-column>
+        <el-table-column label="交易类别" align="center" width="150" prop="dealCategory">
+          <template #default="scope">
+            <dict-tag :options="deal_category" :value="scope.row.dealCategory" />
+          </template>
+        </el-table-column>
+        <el-table-column label="交易子类别" align="center" width="150" prop="childCategoryName" />
+        <el-table-column label="备注" align="center" width="300" prop="remark" />
+      </el-table>
+      <el-pagination small background layout="total, prev, pager, next" :total="dealRecordTotal" @current-change="handleCurrentDealRecordChange" />
+    </el-dialog>
   </div>
 </template>
 
 <script setup name="FutureStocks">
 import { listFutureStocks, getFutureStocks, delFutureStocks, addFutureStocks, updateFutureStocks } from '@/api/invest/futureStocks'
+import { listAccountDealRecord } from '@/api/invest/accountDealRecord'
 import { listBankcardLend } from '@/api/invest/bankcardlend'
 // eslint-disable-next-line no-unused-vars
 import { require } from '@/utils/require'
 const { proxy } = getCurrentInstance()
 const { future_stock_type, account_status } = proxy.useDict('future_stock_type', 'account_status')
+const { deal_type, deal_category } = proxy.useDict('deal_type', 'deal_category')
 
 const futureStocksList = ref([])
 const open = ref(false)
@@ -141,9 +183,23 @@ const single = ref(true)
 const multiple = ref(true)
 const total = ref(0)
 const title = ref('')
+const titleDealRecord = ref('')
+const openDealRecord = ref(false)
+const currentAccountId = ref('')
+const loadingDealRecord = ref(false)
+const tableDealRecordData = ref([])
+const dealRecordTotal = ref(0)
+const queryDealRecordParams = ref({
+  time: '',
+  dealType: null,
+  dealCategory: null,
+  pageNum: 1,
+  pageSize: 10
+})
 const debitCardList = ref([])
 const operateList = ref([
   { id: 'view', icon: 'View', title: '查看', hasPermi: ['invest:futureStocks:query'] },
+  { id: 'dealRecord', icon: 'Tickets', title: '交易明细', hasPermi: ['invest:futureStocks:query'] },
   { id: 'edit', icon: 'Edit', title: '修改', hasPermi: ['invest:futureStocks:edit'] },
   { id: 'delete', icon: 'Delete', title: '删除', hasPermi: ['invest:futureStocks:remove'] }
 ])
@@ -182,6 +238,9 @@ const handleOperate = (operate, row) => {
     case 'view':
       handleView(row)
       break
+    case 'dealRecord':
+      handleDealRecord(row)
+      break
     case 'edit':
       handleUpdate(row)
       break
@@ -308,6 +367,54 @@ function handleUpdate(row) {
   })
 }
 
+/** 交易明细按钮操作 */
+function handleDealRecord(row) {
+  queryDealRecordParams.value.time = ''
+  queryDealRecordParams.value.dealType = ''
+  queryDealRecordParams.value.dealCategory = ''
+  titleDealRecord.value = `${row.name}${row.code ? '【' + row.code + '】' : ''}交易明细`
+  currentAccountId.value = row.id || ids.value
+  getDealRecordList(1)
+  openDealRecord.value = true
+}
+
+const handleCurrentDealRecordChange = (num) => {
+  getDealRecordList(num)
+}
+
+const handleDealRecordQuery = () => {
+  getDealRecordList(1)
+}
+
+const resetDealRecordQuery = () => {
+  proxy.resetForm('queryDealRecordRef')
+  queryDealRecordParams.value.time = ''
+  queryDealRecordParams.value.dealType = ''
+  queryDealRecordParams.value.dealCategory = ''
+  dealRecordTotal.value = 0
+  getDealRecordList(1)
+}
+
+const getDealRecordList = (num) => {
+  loadingDealRecord.value = true
+  const timeRange = queryDealRecordParams.value.time
+  let st = ''
+  let et = ''
+  if (timeRange && timeRange.length > 0) {
+    st = timeRange[0]
+    et = timeRange[1]
+  }
+  queryDealRecordParams.value.startTime = st
+  queryDealRecordParams.value.endTime = et
+  queryDealRecordParams.value.pageNum = num
+  queryDealRecordParams.value.accountId = currentAccountId.value
+  listAccountDealRecord(queryDealRecordParams.value).then((response) => {
+    loadingDealRecord.value = false
+    tableDealRecordData.value = response.rows
+    dealRecordTotal.value = response.total
+  })
+}
+
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs.futureStocksRef.validate((valid) => {

src/views/invest/lend/index.vue

@@ -128,16 +128,58 @@
         </div>
       </template>
     </el-dialog>
+
+    <el-dialog :title="titleDealRecord" v-model="openDealRecord" width="1200px" append-to-body destroy-on-close>
+      <el-form :model="queryDealRecordParams" ref="queryDealRecordRef" inline>
+        <el-form-item label="交易时间" prop="time">
+          <el-date-picker v-model="queryDealRecordParams.time" type="daterange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" />
+        </el-form-item>
+        <el-form-item label="交易类型" style="width: 220px" prop="dealType">
+          <el-select v-model="queryDealRecordParams.dealType" placeholder="请选择交易类型" clearable>
+            <el-option v-for="dict in deal_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="交易类别" style="width: 220px" prop="dealCategory">
+          <el-select v-model="queryDealRecordParams.dealCategory" placeholder="请选择交易类别" clearable>
+            <el-option v-for="dict in deal_category" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="">
+          <el-button type="primary" icon="Search" @click="handleDealRecordQuery">搜索</el-button>
+          <el-button type="info" icon="Refresh" @click="resetDealRecordQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="loadingDealRecord" :data="tableDealRecordData">
+        <el-table-column label="交易时间" align="center" prop="createTime" width="180" />
+        <el-table-column label="交易金额" align="center" prop="amount" />
+        <el-table-column label="当前余额" align="center" prop="currentBalance" />
+        <el-table-column label="交易类型" align="center" width="120" prop="dealType">
+          <template #default="scope">
+            <dict-tag :options="deal_type" :value="scope.row.dealType" />
+          </template>
+        </el-table-column>
+        <el-table-column label="交易类别" align="center" width="150" prop="dealCategory">
+          <template #default="scope">
+            <dict-tag :options="deal_category" :value="scope.row.dealCategory" />
+          </template>
+        </el-table-column>
+        <el-table-column label="交易子类别" align="center" width="150" prop="childCategoryName" />
+        <el-table-column label="备注" align="center" width="300" prop="remark" />
+      </el-table>
+      <el-pagination small background layout="total, prev, pager, next" :total="dealRecordTotal" @current-change="handleCurrentDealRecordChange" />
+    </el-dialog>
   </div>
 </template>
 
 <script setup name="BankcardLend">
 import { listBankcardLend, getBankcardLend, delBankcardLend, addBankcardLend, updateBankcardLend } from '@/api/invest/bankcardlend'
+import { listAccountDealRecord } from '@/api/invest/accountDealRecord'
 import { listBankBaseInfo } from '@/api/invest/bankBaseInfo'
 // eslint-disable-next-line no-unused-vars
 import { require } from '@/utils/require'
 const { proxy } = getCurrentInstance()
 const { bank_card_type, lend_type, account_status } = proxy.useDict('bank_card_type', 'lend_type', 'account_status')
+const { deal_type, deal_category } = proxy.useDict('deal_type', 'deal_category')
 
 const bankcardList = ref([])
 const open = ref(false)
@@ -148,9 +190,23 @@ const single = ref(true)
 const multiple = ref(true)
 const total = ref(0)
 const title = ref('')
+const titleDealRecord = ref('')
+const openDealRecord = ref(false)
+const currentAccountId = ref('')
+const loadingDealRecord = ref(false)
+const tableDealRecordData = ref([])
+const dealRecordTotal = ref(0)
+const queryDealRecordParams = ref({
+  time: '',
+  dealType: null,
+  dealCategory: null,
+  pageNum: 1,
+  pageSize: 10
+})
 const bankList = ref([])
 const operateList = ref([
   { id: 'view', icon: 'View', title: '查看', hasPermi: ['invest:bankcard:query'] },
+  { id: 'dealRecord', icon: 'Tickets', title: '交易明细', hasPermi: ['invest:bankcard:query'] },
   { id: 'edit', icon: 'Edit', title: '修改', hasPermi: ['invest:bankcard:edit'] },
   { id: 'delete', icon: 'Delete', title: '删除', hasPermi: ['invest:bankcard:remove'] }
 ])
@@ -180,6 +236,9 @@ const handleOperate = (operate, row) => {
     case 'view':
       handleView(row)
       break
+    case 'dealRecord':
+      handleDealRecord(row)
+      break
     case 'edit':
       handleUpdate(row)
       break
@@ -312,6 +371,54 @@ function handleUpdate(row) {
   })
 }
 
+/** 交易明细按钮操作 */
+function handleDealRecord(row) {
+  queryDealRecordParams.value.time = ''
+  queryDealRecordParams.value.dealType = ''
+  queryDealRecordParams.value.dealCategory = ''
+  titleDealRecord.value = `${row.name}${row.code ? '【' + row.code + '】' : ''}交易明细`
+  currentAccountId.value = row.id || ids.value
+  getDealRecordList(1)
+  openDealRecord.value = true
+}
+
+const handleCurrentDealRecordChange = (num) => {
+  getDealRecordList(num)
+}
+
+const handleDealRecordQuery = () => {
+  getDealRecordList(1)
+}
+
+const resetDealRecordQuery = () => {
+  proxy.resetForm('queryDealRecordRef')
+  queryDealRecordParams.value.time = ''
+  queryDealRecordParams.value.dealType = ''
+  queryDealRecordParams.value.dealCategory = ''
+  dealRecordTotal.value = 0
+  getDealRecordList(1)
+}
+
+const getDealRecordList = (num) => {
+  loadingDealRecord.value = true
+  const timeRange = queryDealRecordParams.value.time
+  let st = ''
+  let et = ''
+  if (timeRange && timeRange.length > 0) {
+    st = timeRange[0]
+    et = timeRange[1]
+  }
+  queryDealRecordParams.value.startTime = st
+  queryDealRecordParams.value.endTime = et
+  queryDealRecordParams.value.pageNum = num
+  queryDealRecordParams.value.accountId = currentAccountId.value
+  listAccountDealRecord(queryDealRecordParams.value).then((response) => {
+    loadingDealRecord.value = false
+    tableDealRecordData.value = response.rows
+    dealRecordTotal.value = response.total
+  })
+}
+
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs.bankcardRef.validate((valid) => {

src/views/invest/posmachine/index.vue

@@ -62,7 +62,7 @@
           <el-table-column label="供货商" align="center" width="100" prop="manufacture" />
           <!--
           <el-table-column label="商户码" align="center" prop="merchantCode" /> -->
-          <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
+          <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
             <template v-slot="scope">
               <div class="ctrl-btn d-flex">
                 <el-tooltip v-for="item in operateList" :key="item.id" class="item" effect="dark" :content="item.title" placement="top">
@@ -150,12 +150,44 @@
         </div>
       </template>
     </el-dialog>
+
+    <el-dialog :title="titleSwipeRecord" v-model="openSwipeRecord" width="1200px" append-to-body destroy-on-close>
+      <el-form :model="querySwipeRecordParams" ref="querySwipeRecordRef" inline>
+        <el-form-item label="信用卡" style="width: 420px" prop="outAccountId">
+          <el-select v-model="querySwipeRecordParams.outAccountId" placeholder="请选择信用卡" clearable>
+            <el-option v-for="creditCard in creditCardList" :key="creditCard.id" :label="creditCard.nameCodeAvailableLimit" :value="creditCard.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="刷卡时间" prop="time">
+          <el-date-picker v-model="querySwipeRecordParams.time" type="daterange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" />
+        </el-form-item>
+        <el-form-item label="">
+          <el-button type="primary" icon="Search" @click="handleSwipeRecordQuery">搜索</el-button>
+          <el-button type="info" icon="Refresh" @click="resetSwipeRecordQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="loadingSwipeRecord" :data="tableSwipeRecordData">
+        <el-table-column type="index" label="序号" :index="swipeRecordIndexMethod" width="60" />
+        <el-table-column label="POS机名称" align="center" prop="posName" />
+        <el-table-column label="刷卡商户" align="center" prop="merchantName" />
+        <el-table-column label="信用卡" align="center" prop="outAccountName" />
+        <el-table-column label="刷卡时间" align="center" width="180" prop="createTime" />
+        <el-table-column label="刷卡金额" align="center" prop="amount" />
+        <el-table-column label="手续费" align="center" width="100" prop="commission" />
+        <el-table-column label="储蓄卡" align="center" prop="inAccountName" />
+        <el-table-column label="入账金额" align="center" width="120" prop="actualAmount" />
+      </el-table>
+      <el-pagination small background layout="total, prev, pager, next" :total="swipeRecordTotal" @current-change="handleCurrentSwipeRecordChange" />
+    </el-dialog>
   </div>
 </template>
 
 <script setup name="Posmachine">
 import { listPosmachine, getPosmachine, delPosmachine, addPosmachine, updatePosmachine } from '@/api/invest/posmachine'
 import { listBankcardLend } from '@/api/invest/bankcardlend'
+import { listAccounts } from '@/api/invest/accounts'
+import { listAccountsTransferRecord } from '@/api/invest/accountsTransferRecord'
+import dayjs from 'dayjs'
 // eslint-disable-next-line no-unused-vars
 import { require } from '@/utils/require'
 const { proxy } = getCurrentInstance()
@@ -171,8 +203,16 @@ const multiple = ref(true)
 const total = ref(0)
 const title = ref('')
 const debitCardList = ref([])
+const creditCardList = ref([])
+const titleSwipeRecord = ref('')
+const openSwipeRecord = ref(false)
+const currentPosId = ref('')
+const loadingSwipeRecord = ref(false)
+const tableSwipeRecordData = ref([])
+const swipeRecordTotal = ref(0)
 const operateList = ref([
   { id: 'view', icon: 'View', title: '查看', hasPermi: ['invest:posmachine:query'] },
+  { id: 'swipeRecord', icon: 'Tickets', title: '刷卡明细', hasPermi: ['invest:accountsTransferRecord:query'] },
   { id: 'edit', icon: 'Edit', title: '修改', hasPermi: ['invest:posmachine:edit'] },
   { id: 'delete', icon: 'Delete', title: '删除', hasPermi: ['invest:posmachine:remove'] }
 ])
@@ -193,6 +233,12 @@ const data = reactive({
     status: '1',
     pageSize: 1000
   },
+  queryCreditCardParams: {
+    pageNum: 1,
+    type: '2',
+    status: '1',
+    pageSize: 1000
+  },
   rules: {
     name: [{ required: true, message: 'pos机名称不能为空', trigger: 'blur' }],
     status: [{ required: true, message: '账户状态不能为空', trigger: 'blur' }],
@@ -208,12 +254,23 @@ const data = reactive({
     // merchantType: [{ required: true, message: '商户类型不能为空', trigger: 'change' }]
   }
 })
+const querySwipeRecordParams = ref({
+  pageNum: 1,
+  pageSize: 10,
+  type: '1',
+  time: '',
+  posId: null,
+  outAccountId: null
+})
 
 const handleOperate = (operate, row) => {
   switch (operate) {
     case 'view':
       handleView(row)
       break
+    case 'swipeRecord':
+      handleSwipeRecord(row)
+      break
     case 'edit':
       handleUpdate(row)
       break
@@ -225,7 +282,7 @@ const handleOperate = (operate, row) => {
   }
 }
 
-const { queryParams, queryDebitCardParams, form, rules } = toRefs(data)
+const { queryParams, queryDebitCardParams, queryCreditCardParams, form, rules } = toRefs(data)
 
 /** 查询储蓄卡管理列表 */
 function getDebitCardList() {
@@ -234,6 +291,13 @@ function getDebitCardList() {
   })
 }
 
+/** 查询信用卡管理列表 */
+function getCreditCardList() {
+  listAccounts(queryCreditCardParams.value).then((response) => {
+    creditCardList.value = response.rows
+  })
+}
+
 /** 查询pos机信息列表 */
 function getList() {
   loading.value = true
@@ -340,6 +404,59 @@ function handleUpdate(row) {
   })
 }
 
+/** 刷卡明细按钮操作 */
+function handleSwipeRecord(row) {
+  querySwipeRecordParams.value.time = ''
+  querySwipeRecordParams.value.outAccountId = null
+  titleSwipeRecord.value = `${row.name}${row.merchantName ? '【' + row.merchantName + '】' : ''}刷卡明细`
+  currentPosId.value = row.id || ids.value
+  getSwipeRecordList(1)
+  openSwipeRecord.value = true
+}
+
+const handleCurrentSwipeRecordChange = (num) => {
+  getSwipeRecordList(num)
+}
+
+const handleSwipeRecordQuery = () => {
+  getSwipeRecordList(1)
+}
+
+const resetSwipeRecordQuery = () => {
+  proxy.resetForm('querySwipeRecordRef')
+  querySwipeRecordParams.value.time = ''
+  querySwipeRecordParams.value.outAccountId = null
+  swipeRecordTotal.value = 0
+  getSwipeRecordList(1)
+}
+
+const getSwipeRecordList = (num) => {
+  loadingSwipeRecord.value = true
+  const timeRange = querySwipeRecordParams.value.time
+  let st = ''
+  let et = ''
+  if (timeRange && timeRange.length === 2) {
+    st = dayjs(timeRange[0]).format('YYYY-MM-DD')
+    et = dayjs(timeRange[1]).format('YYYY-MM-DD')
+  }
+  querySwipeRecordParams.value.startTime = st
+  querySwipeRecordParams.value.endTime = et
+  querySwipeRecordParams.value.pageNum = num
+  querySwipeRecordParams.value.posId = currentPosId.value
+  querySwipeRecordParams.value.type = '1'
+  listAccountsTransferRecord(querySwipeRecordParams.value).then((response) => {
+    loadingSwipeRecord.value = false
+    tableSwipeRecordData.value = response.rows
+    swipeRecordTotal.value = response.total
+  })
+}
+
+const swipeRecordIndexMethod = (index) => {
+  const nowPage = querySwipeRecordParams.value.pageNum
+  const nowLimit = querySwipeRecordParams.value.pageSize
+  return index + 1 + (nowPage - 1) * nowLimit
+}
+
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs.posmachineRef.validate((valid) => {
@@ -386,6 +503,7 @@ function handleExport() {
     `posmachine_${new Date().getTime()}.xlsx`
   )
 }
+getCreditCardList()
 getDebitCardList()
 getList()
 </script>

src/views/invest/stocks/index.vue

@@ -46,7 +46,7 @@
             </template>
           </el-table-column>
           <el-table-column label="备注" align="center" prop="remark" />
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <el-table-column label="操作" width="210" align="center" class-name="small-padding fixed-width">
             <template v-slot="scope">
               <div class="ctrl-btn d-flex">
                 <el-tooltip v-for="item in operateList" :key="item.id" class="item" effect="dark" :content="item.title" placement="top">
@@ -111,16 +111,58 @@
         </div>
       </template>
     </el-dialog>
+
+    <el-dialog :title="titleDealRecord" v-model="openDealRecord" width="1200px" append-to-body destroy-on-close>
+      <el-form :model="queryDealRecordParams" ref="queryDealRecordRef" inline>
+        <el-form-item label="交易时间" prop="time">
+          <el-date-picker v-model="queryDealRecordParams.time" type="daterange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" />
+        </el-form-item>
+        <el-form-item label="交易类型" style="width: 220px" prop="dealType">
+          <el-select v-model="queryDealRecordParams.dealType" placeholder="请选择交易类型" clearable>
+            <el-option v-for="dict in deal_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="交易类别" style="width: 220px" prop="dealCategory">
+          <el-select v-model="queryDealRecordParams.dealCategory" placeholder="请选择交易类别" clearable>
+            <el-option v-for="dict in deal_category" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="">
+          <el-button type="primary" icon="Search" @click="handleDealRecordQuery">搜索</el-button>
+          <el-button type="info" icon="Refresh" @click="resetDealRecordQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="loadingDealRecord" :data="tableDealRecordData">
+        <el-table-column label="交易时间" align="center" prop="createTime" width="180" />
+        <el-table-column label="交易金额" align="center" prop="amount" />
+        <el-table-column label="当前余额" align="center" prop="currentBalance" />
+        <el-table-column label="交易类型" align="center" width="120" prop="dealType">
+          <template #default="scope">
+            <dict-tag :options="deal_type" :value="scope.row.dealType" />
+          </template>
+        </el-table-column>
+        <el-table-column label="交易类别" align="center" width="150" prop="dealCategory">
+          <template #default="scope">
+            <dict-tag :options="deal_category" :value="scope.row.dealCategory" />
+          </template>
+        </el-table-column>
+        <el-table-column label="交易子类别" align="center" width="150" prop="childCategoryName" />
+        <el-table-column label="备注" align="center" width="300" prop="remark" />
+      </el-table>
+      <el-pagination small background layout="total, prev, pager, next" :total="dealRecordTotal" @current-change="handleCurrentDealRecordChange" />
+    </el-dialog>
   </div>
 </template>
 
 <script setup name="FutureStocks">
 import { listFutureStocks, getFutureStocks, delFutureStocks, addFutureStocks, updateFutureStocks } from '@/api/invest/futureStocks'
+import { listAccountDealRecord } from '@/api/invest/accountDealRecord'
 import { listBankcardLend } from '@/api/invest/bankcardlend'
 // eslint-disable-next-line no-unused-vars
 import { require } from '@/utils/require'
 const { proxy } = getCurrentInstance()
 const { future_stock_type, account_status } = proxy.useDict('future_stock_type', 'account_status')
+const { deal_type, deal_category } = proxy.useDict('deal_type', 'deal_category')
 
 const futureStocksList = ref([])
 const open = ref(false)
@@ -131,9 +173,23 @@ const single = ref(true)
 const multiple = ref(true)
 const total = ref(0)
 const title = ref('')
+const titleDealRecord = ref('')
+const openDealRecord = ref(false)
+const currentAccountId = ref('')
+const loadingDealRecord = ref(false)
+const tableDealRecordData = ref([])
+const dealRecordTotal = ref(0)
+const queryDealRecordParams = ref({
+  time: '',
+  dealType: null,
+  dealCategory: null,
+  pageNum: 1,
+  pageSize: 10
+})
 const debitCardList = ref([])
 const operateList = ref([
   { id: 'view', icon: 'View', title: '查看', hasPermi: ['invest:futureStocks:query'] },
+  { id: 'dealRecord', icon: 'Tickets', title: '交易明细', hasPermi: ['invest:futureStocks:query'] },
   { id: 'edit', icon: 'Edit', title: '修改', hasPermi: ['invest:futureStocks:edit'] },
   { id: 'delete', icon: 'Delete', title: '删除', hasPermi: ['invest:futureStocks:remove'] }
 ])
@@ -172,6 +228,9 @@ const handleOperate = (operate, row) => {
     case 'view':
       handleView(row)
       break
+    case 'dealRecord':
+      handleDealRecord(row)
+      break
     case 'edit':
       handleUpdate(row)
       break
@@ -298,6 +357,54 @@ function handleUpdate(row) {
   })
 }
 
+/** 交易明细按钮操作 */
+function handleDealRecord(row) {
+  queryDealRecordParams.value.time = ''
+  queryDealRecordParams.value.dealType = ''
+  queryDealRecordParams.value.dealCategory = ''
+  titleDealRecord.value = `${row.name}${row.code ? '【' + row.code + '】' : ''}交易明细`
+  currentAccountId.value = row.id || ids.value
+  getDealRecordList(1)
+  openDealRecord.value = true
+}
+
+const handleCurrentDealRecordChange = (num) => {
+  getDealRecordList(num)
+}
+
+const handleDealRecordQuery = () => {
+  getDealRecordList(1)
+}
+
+const resetDealRecordQuery = () => {
+  proxy.resetForm('queryDealRecordRef')
+  queryDealRecordParams.value.time = ''
+  queryDealRecordParams.value.dealType = ''
+  queryDealRecordParams.value.dealCategory = ''
+  dealRecordTotal.value = 0
+  getDealRecordList(1)
+}
+
+const getDealRecordList = (num) => {
+  loadingDealRecord.value = true
+  const timeRange = queryDealRecordParams.value.time
+  let st = ''
+  let et = ''
+  if (timeRange && timeRange.length > 0) {
+    st = timeRange[0]
+    et = timeRange[1]
+  }
+  queryDealRecordParams.value.startTime = st
+  queryDealRecordParams.value.endTime = et
+  queryDealRecordParams.value.pageNum = num
+  queryDealRecordParams.value.accountId = currentAccountId.value
+  listAccountDealRecord(queryDealRecordParams.value).then((response) => {
+    loadingDealRecord.value = false
+    tableDealRecordData.value = response.rows
+    dealRecordTotal.value = response.total
+  })
+}
+
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs.futureStocksRef.validate((valid) => {