From 1de018bbc62cb8a872dd93f0a72776ee0775b323 Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Mon, 13 May 2024 17:57:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=87=AA=E6=B5=8B=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/invest/accounts/index.vue           | 32 ++++++++++++++++---
 src/views/invest/lendTransferRecord/index.vue | 22 +++++++++++--
 2 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/src/views/invest/accounts/index.vue b/src/views/invest/accounts/index.vue
index 436bdeb..35149e8 100644
--- a/src/views/invest/accounts/index.vue
+++ b/src/views/invest/accounts/index.vue
@@ -7,7 +7,7 @@
           <el-input v-model="queryParams.name" placeholder="请输入名称" clearable @keyup.enter="handleQuery" />
         </el-form-item>
         <el-form-item label="账户类型" prop="type">
-          <el-select v-model="queryParams.type" placeholder="请选择账户类型" clearable>
+          <el-select v-model="queryParams.type" placeholder="请选择账户类型" @change="handleQueryTypeChange" clearable>
             <el-option v-for="dict in account_type" :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
         </el-form-item>
@@ -40,15 +40,24 @@
               <dict-tag :options="account_type" :value="scope.row.type" />
             </template>
           </el-table-column>
-          <el-table-column label="账号" align="center" prop="code" />
-          <el-table-column label="余额" align="center" prop="balance" />
+          <el-table-column label="账号" width="180" align="center" prop="code" />
+          <el-table-column label="信用卡额度" align="center" v-if="queryParams.type === '2'" prop="creditLimit" />
           <el-table-column label="可用额度" align="center" prop="availableLimit" />
+          <el-table-column label="余额" align="center" prop="balance" />
+          <el-table-column label="储蓄卡类型" align="center" v-if="queryParams.type === '1'" prop="debitType">
+            <template #default="scope">
+              <dict-tag :options="debit_type" :value="scope.row.debitType" />
+            </template>
+          </el-table-column>
+          <el-table-column label="账单日" align="center" v-if="queryParams.type === '2'" prop="billDateName" />
+          <el-table-column label="还款日" align="center" v-if="queryParams.type === '2'" prop="payDateName" />
+
           <el-table-column label="账户状态" align="center" prop="state">
             <template #default="scope">
               <dict-tag :options="account_state" :value="scope.row.state" />
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <el-table-column label="操作" align="center" width="300" 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">
@@ -174,7 +183,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 } = proxy.useDict('account_state', 'account_type', 'deal_type', 'deal_category')
+const { account_state, account_type, deal_type, deal_category, debit_type } = proxy.useDict(
+  'account_state',
+  'account_type',
+  'deal_type',
+  'deal_category',
+  'debit_type'
+)
 const accountsList = ref([])
 const open = ref(false)
 const loading = ref(true)
@@ -268,6 +283,13 @@ function getList() {
   })
 }
 
+const handleQueryTypeChange = (type) => {
+  queryParams.value.type = type
+  listAccounts(queryParams.value).then((response) => {
+    accountsList.value = response.rows
+  })
+}
+
 // 取消按钮
 function cancel() {
   open.value = false
diff --git a/src/views/invest/lendTransferRecord/index.vue b/src/views/invest/lendTransferRecord/index.vue
index 29b910c..3ead9bd 100644
--- a/src/views/invest/lendTransferRecord/index.vue
+++ b/src/views/invest/lendTransferRecord/index.vue
@@ -40,11 +40,17 @@
         <el-table v-loading="loading" :data="accountsTransferRecordList" @selection-change="handleSelectionChange" height="calc(100% - 0.62rem)">
           <!-- <el-table-column type="selection" width="55" align="center" /> -->
           <el-table-column label="名称" align="center" prop="name" />
-          <el-table-column label="转出账户" align="center" prop="outAccountName" />
-          <el-table-column label="转入账户" align="center" prop="inAccountName" />
+          <el-table-column label="交易类型" align="center" width="100" prop="dealType">
+            <template #default="scope">
+              <dict-tag :options="record_lend_type" :value="scope.row.dealType" />
+            </template>
+          </el-table-column>
+          <el-table-column label="转出账户" align="center" width="250" prop="outAccountName" />
+          <el-table-column label="转入账户" align="center" width="250" prop="inAccountName" />
           <el-table-column label="借贷时间" width="180" align="center" prop="createTime" />
           <el-table-column label="借贷金额" width="150" align="center" prop="amount" />
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <el-table-column label="还款利息" width="150" align="center" prop="commission" />
+          <el-table-column label="操作" width="150" 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">
@@ -288,6 +294,16 @@ function handleSelectionChange(selection) {
 // 查看
 const handleView = (row) => {
   title.value = '查看借贷记账'
+  //1表示借款，2表示还款
+  if (row.dealType === '1') {
+    commissionShow.value = false
+    createTimeLabel.value = '借款时间'
+    amountLabel.value = '借款金额'
+  } else if (row.dealType === '2') {
+    amountLabel.value = '还款本金'
+    createTimeLabel.value = '还款时间'
+    commissionShow.value = true
+  }
   form.value = row
   open.value = true
 }