From 3960b713301c2c8dd09d5bace1c1bd84dd45adea Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Sun, 19 May 2024 12:54:14 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B4=A6=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=8Cbug=E4=BF=AE=E5=A4=8D=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/invest/accounts/index.vue | 35 ++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/views/invest/accounts/index.vue b/src/views/invest/accounts/index.vue
index 5b2aaba..c7f8622 100644
--- a/src/views/invest/accounts/index.vue
+++ b/src/views/invest/accounts/index.vue
@@ -156,6 +156,11 @@
             end-placeholder="结束时间"
           />
         </el-form-item>
+        <el-form-item label="转账类型" style="width: 220px" prop="type">
+          <el-select v-model="queryTransferRecordParams.type" placeholder="请选择转账类型" clearable>
+            <el-option v-for="dict in transfer_type" :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="handleTransferRecordQuery">搜索</el-button>
           <el-button type="info" icon="Refresh" @click="resetTransferRecordQuery">重置</el-button>
@@ -166,8 +171,13 @@
         <el-table-column label="名称" align="center" width="380" prop="name" />
         <el-table-column label="转出账户" align="center" prop="outAccountName" />
         <el-table-column label="转入账户" align="center" prop="inAccountName" />
-        <el-table-column label="转账时间" align="center" prop="createTime" />
-        <el-table-column label="转账金额" align="center" prop="amount" />
+        <el-table-column label="转账时间" align="center" width="160" prop="createTime" />
+        <el-table-column label="转账金额" align="center" width="120" prop="amount" />
+        <el-table-column label="转账类型" align="center" width="100" prop="type">
+          <template #default="scope">
+            <dict-tag :options="transfer_type" :value="scope.row.type" />
+          </template>
+        </el-table-column>
       </el-table>
       <el-pagination small background layout="total, prev, pager, next" :total="transferRecordTotal" @current-change="handleCurrentTransferRecordChange" />
     </el-dialog>
@@ -183,12 +193,13 @@ import { listAccountsTransferRecord } from '@/api/invest/accountsTransferRecord'
 import { require } from '@/utils/require'
 import dayjs from 'dayjs'
 const { proxy } = getCurrentInstance()
-const { account_state, account_type, deal_type, deal_category, debit_type } = proxy.useDict(
+const { account_state, account_type, deal_type, deal_category, debit_type, transfer_type } = proxy.useDict(
   'account_state',
   'account_type',
   'deal_type',
   'deal_category',
-  'debit_type'
+  'debit_type',
+  'transfer_type'
 )
 const accountsList = ref([])
 const open = ref(false)
@@ -222,6 +233,7 @@ const tableTransferRecordData = ref([])
 const transferRecordTotal = ref(0)
 const queryTransferRecordParams = ref({
   time: '',
+  type: '',
   pageNum: 1,
   pageSize: 10
 })
@@ -418,6 +430,8 @@ function handleExport() {
 function handleDealRecord(row) {
   const _id = row.id || ids.value
   queryDealRecordParams.value.time = ''
+  queryDealRecordParams.value.dealType = ''
+  queryDealRecordParams.value.dealCategory = ''
   titleDealRecord.value = row.nameCode + '历史交易记录'
   currentAccountId.value = _id
   getDealRecordList(1)
@@ -435,6 +449,8 @@ const handleDealRecordQuery = () => {
 const resetDealRecordQuery = () => {
   proxy.resetForm('queryDealRecordRef')
   queryDealRecordParams.value.time = ''
+  queryDealRecordParams.value.dealType = ''
+  queryDealRecordParams.value.dealCategory = ''
   dealRecordTotal.value = 0
   getDealRecordList(1)
 }
@@ -464,6 +480,7 @@ const getDealRecordList = (num, id) => {
 function handleTransDeal(row) {
   const _id = row.id || ids.value
   queryTransferRecordParams.value.time = ''
+  queryTransferRecordParams.value.type = ''
   titleTransferRecord.value = row.nameCode + '历史转账记录'
   currentAccountId.value = _id
   getTransferRecordList(1)
@@ -480,6 +497,7 @@ const handleTransferRecordQuery = () => {
 
 const resetTransferRecordQuery = () => {
   queryTransferRecordParams.value.time = ''
+  queryTransferRecordParams.value.type = ''
   transferRecordTotal.value = 0
   getTransferRecordList(1)
 }
@@ -495,7 +513,14 @@ const getTransferRecordList = (num, id) => {
     et = dayjs(timeRange[1]).format('YYYY-MM-DD')
   }
 
-  listAccountsTransferRecord({ accountId: currentAccountId.value, startTime: st, endTime: et, pageNum: num, pageSize: 10 }).then((res) => {
+  listAccountsTransferRecord({
+    accountId: currentAccountId.value,
+    startTime: st,
+    endTime: et,
+    pageNum: num,
+    pageSize: 10,
+    type: queryTransferRecordParams.value.type
+  }).then((res) => {
     loadingTransferRecord.value = false
     tableTransferRecordData.value = res.rows
     transferRecordTotal.value = res.total