From 8617b88f63fc1d2c80214e492d6821c1de72a425 Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Sat, 15 Jun 2024 15:54:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/invest/accountDealRecord/index.vue       |  4 ++--
 src/views/invest/creditCardBill/index.vue          |  2 +-
 src/views/invest/creditCardDealAnalysis/index.vue  |  2 +-
 .../invest/creditInstallmentHistory/index.vue      |  6 +++---
 .../creditInstallmentSettledAnalysis/index.vue     |  2 +-
 src/views/invest/creditQueryRecord/index.vue       |  6 +++---
 src/views/invest/creditTransferRecord/index.vue    |  6 +++---
 src/views/invest/debitDealAnalysis/index.vue       |  2 +-
 src/views/invest/debitTransferRecord/index.vue     |  8 ++++----
 src/views/invest/investAccountDeal/index.vue       |  4 ++--
 src/views/invest/investDealAnalysis/index.vue      |  2 +-
 src/views/invest/lendTransferRecord/index.vue      |  8 ++++----
 src/views/invest/onlineLendHistory/index.vue       |  6 +++---
 .../invest/onlineLendSettledAnalysis/index.vue     |  2 +-
 src/views/invest/posTransferRecord/index.vue       | 14 +++-----------
 15 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/src/views/invest/accountDealRecord/index.vue b/src/views/invest/accountDealRecord/index.vue
index 1a0208f..6743b17 100644
--- a/src/views/invest/accountDealRecord/index.vue
+++ b/src/views/invest/accountDealRecord/index.vue
@@ -10,7 +10,7 @@
         </el-form-item>
         <el-form-item label="记账账户" style="width: 435px" prop="accountId">
           <el-select v-model="queryParams.accountId" placeholder="请选择记账账户" clearable>
-            <el-option v-for="account in accountList" :key="account.id" :label="account.nameCode" :value="account.id" />
+            <el-option v-for="account in accountList" :key="account.id" :label="account.typeNameCodeAvailableLimit" :value="account.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="交易类型" style="width: 240px" prop="dealType">
@@ -86,7 +86,7 @@
         </el-form-item>
         <el-form-item label="记账账户" prop="accountId">
           <el-select v-model="form.accountId" placeholder="请选择记账账户" clearable>
-            <el-option v-for="account in addAccountList" :key="account.id" :label="account.nameCode" :value="account.id" />
+            <el-option v-for="account in addAccountList" :key="account.id" :label="account.nameCodeAvailableLimit" :value="account.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="交易类型" prop="dealType">
diff --git a/src/views/invest/creditCardBill/index.vue b/src/views/invest/creditCardBill/index.vue
index e784d13..24b0fbf 100644
--- a/src/views/invest/creditCardBill/index.vue
+++ b/src/views/invest/creditCardBill/index.vue
@@ -200,7 +200,7 @@ const data = reactive({
   queryCreditCardParams: {
     pageNum: 1,
     type: '2',
-    pageSize: 10
+    pageSize: 100
   },
   rules: {
     billDate: [{ required: true, message: '账单日不能为空', trigger: 'blur' }],
diff --git a/src/views/invest/creditCardDealAnalysis/index.vue b/src/views/invest/creditCardDealAnalysis/index.vue
index 7318de8..1513dd9 100644
--- a/src/views/invest/creditCardDealAnalysis/index.vue
+++ b/src/views/invest/creditCardDealAnalysis/index.vue
@@ -5,7 +5,7 @@
       <el-form :model="queryParams" ref="queryRef" :inline="true" :rules="rules" label-width="100px">
         <el-form-item label="信用卡" style="width: 480px" prop="id">
           <el-select v-model="queryParams.id" placeholder="请选择信用卡" clearable>
-            <el-option v-for="account in accountsList" :key="account.id" :label="account.nameCode" :value="account.id" />
+            <el-option v-for="account in accountsList" :key="account.id" :label="account.nameCodeAvailableLimit" :value="account.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="交易类型" style="width: 300px" prop="dealType">
diff --git a/src/views/invest/creditInstallmentHistory/index.vue b/src/views/invest/creditInstallmentHistory/index.vue
index fcf3d0e..6f2bb6a 100644
--- a/src/views/invest/creditInstallmentHistory/index.vue
+++ b/src/views/invest/creditInstallmentHistory/index.vue
@@ -8,7 +8,7 @@
             <el-option v-for="creditCard in creditCardList" :key="creditCard.id" :label="creditCard.nameCode" :value="creditCard.id" />
           </el-select>
         </el-form-item>
-        <el-form-item label="账户状态" prop="state">
+        <el-form-item label="结清状态" prop="state">
           <el-select v-model="queryParams.state" placeholder="请选择账户状态" clearable>
             <el-option v-for="dict in settle_state" :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
@@ -60,7 +60,7 @@
                       <span>{{ parseTime(scope.row.closeDate, '{y}-{m}-{d}') }}</span>
                     </template>
                   </el-table-column> -->
-          <el-table-column label="账户状态" align="center" width="80" prop="state">
+          <el-table-column label="结清状态" align="center" width="80" prop="state">
             <template #default="scope">
               <dict-tag :options="settle_state" :value="scope.row.state" />
             </template>
@@ -98,7 +98,7 @@
         <el-form-item label="余额" prop="balance">
           <el-input v-model="form.balance" placeholder="请输入余额" />
         </el-form-item>
-        <el-form-item label="账户状态" prop="state">
+        <el-form-item label="结清状态" prop="state">
           <el-select v-model="form.state" placeholder="请选择账户状态">
             <el-option v-for="dict in settle_state" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
diff --git a/src/views/invest/creditInstallmentSettledAnalysis/index.vue b/src/views/invest/creditInstallmentSettledAnalysis/index.vue
index 0bf09ad..38cd8bf 100644
--- a/src/views/invest/creditInstallmentSettledAnalysis/index.vue
+++ b/src/views/invest/creditInstallmentSettledAnalysis/index.vue
@@ -122,7 +122,7 @@
           </el-table-column>
           <el-table-column label="分期日期" align="center" prop="time" />
           <el-table-column label="分期金额（本息）" align="center" prop="value" />
-          <el-table-column prop="detail" label="分期金额明细" width="700" v-if="queryParams.type === 2">
+          <el-table-column prop="detail" label="分期金额明细" width="900" v-if="queryParams.type === 2">
             <template #default="scope">
               <span v-html="formatMultiLineData(scope.row.detail)"></span>
             </template>
diff --git a/src/views/invest/creditQueryRecord/index.vue b/src/views/invest/creditQueryRecord/index.vue
index 0b16aac..9c58c82 100644
--- a/src/views/invest/creditQueryRecord/index.vue
+++ b/src/views/invest/creditQueryRecord/index.vue
@@ -41,7 +41,7 @@
         </div>
       </div>
       <div class="content-con" v-loading="loading">
-        <el-table v-loading="loading" :data="CreditQueryRecordList" @selection-change="handleSelectionChange" height="calc(100% - 0.62rem)">
+        <el-table v-loading="loading" :data="creditQueryRecordList" @selection-change="handleSelectionChange" height="calc(100% - 0.62rem)">
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="查询日期" align="center" prop="queryDate" width="150">
             <template #default="scope">
@@ -153,7 +153,7 @@ import { require } from '@/utils/require'
 const { proxy } = getCurrentInstance()
 const { credit_report_type, credit_query_type } = proxy.useDict('credit_report_type', 'credit_query_type')
 
-const CreditQueryRecordList = ref([])
+const creditQueryRecordList = ref([])
 const open = ref(false)
 const openAnalysis = ref(false)
 const loading = ref(true)
@@ -221,7 +221,7 @@ function getInstitutionList() {
 function getList() {
   loading.value = true
   listCreditQueryRecord(queryParams.value).then((response) => {
-    CreditQueryRecordList.value = response.rows
+    creditQueryRecordList.value = response.rows
     total.value = response.total
     loading.value = false
   })
diff --git a/src/views/invest/creditTransferRecord/index.vue b/src/views/invest/creditTransferRecord/index.vue
index 62bb86a..960e6ee 100644
--- a/src/views/invest/creditTransferRecord/index.vue
+++ b/src/views/invest/creditTransferRecord/index.vue
@@ -5,7 +5,7 @@
       <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
         <el-form-item label="信用卡" style="width: 500px" prop="inAccountId">
           <el-select v-model="queryParams.inAccountId" placeholder="请选择信用卡" clearable>
-            <el-option v-for="bankCardLend in creditCardList" :key="bankCardLend.id" :label="bankCardLend.nameCode" :value="bankCardLend.id" />
+            <el-option v-for="bankCardLend in creditCardList" :key="bankCardLend.id" :label="bankCardLend.nameCodeAvailableLimit" :value="bankCardLend.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="还款时间" prop="time">
@@ -67,12 +67,12 @@
       <el-form ref="accountsTransferRecordRef" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="储蓄卡" prop="outAccountId">
           <el-select v-model="form.outAccountId" placeholder="请选择储蓄卡" clearable>
-            <el-option v-for="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCode" :value="debitCard.id" />
+            <el-option v-for="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCodeAvailableLimit" :value="debitCard.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="信用卡" prop="inAccountId">
           <el-select v-model="form.inAccountId" placeholder="请选择信用卡" clearable>
-            <el-option v-for="creditCard in creditCardList" :key="creditCard.id" :label="creditCard.nameCode" :value="creditCard.id" />
+            <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="createTime">
diff --git a/src/views/invest/debitDealAnalysis/index.vue b/src/views/invest/debitDealAnalysis/index.vue
index db816de..eb97968 100644
--- a/src/views/invest/debitDealAnalysis/index.vue
+++ b/src/views/invest/debitDealAnalysis/index.vue
@@ -5,7 +5,7 @@
       <el-form :model="queryParams" ref="queryRef" :inline="true" :rules="rules" label-width="100px">
         <el-form-item label="储蓄账户" style="width: 480px" prop="id">
           <el-select v-model="queryParams.id" placeholder="请选择储蓄账户" clearable>
-            <el-option v-for="account in accountsList" :key="account.id" :label="account.nameCode" :value="account.id" />
+            <el-option v-for="account in accountsList" :key="account.id" :label="account.nameCodeAvailableLimit" :value="account.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="交易类型" style="width: 300px" prop="dealType">
diff --git a/src/views/invest/debitTransferRecord/index.vue b/src/views/invest/debitTransferRecord/index.vue
index 8f65628..c2478c2 100644
--- a/src/views/invest/debitTransferRecord/index.vue
+++ b/src/views/invest/debitTransferRecord/index.vue
@@ -5,12 +5,12 @@
       <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
         <el-form-item label="转出账户" style="width: 500px" prop="outAccountId">
           <el-select v-model="queryParams.outAccountId" placeholder="请选择转出账户" clearable>
-            <el-option v-for="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCode" :value="debitCard.id" />
+            <el-option v-for="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCodeAvailableLimit" :value="debitCard.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="转入账户" style="width: 500px" prop="inAccountId">
           <el-select v-model="queryParams.inAccountId" placeholder="请选择转入账户" clearable>
-            <el-option v-for="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCode" :value="debitCard.id" />
+            <el-option v-for="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCodeAvailableLimit" :value="debitCard.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="转账时间" prop="time">
@@ -62,12 +62,12 @@
       <el-form ref="accountsTransferRecordRef" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="转出账户" prop="outAccountId">
           <el-select v-model="form.outAccountId" placeholder="请选择转出账户" clearable>
-            <el-option v-for="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCode" :value="debitCard.id" />
+            <el-option v-for="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCodeAvailableLimit" :value="debitCard.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="转入账户" prop="inAccountId">
           <el-select v-model="form.inAccountId" placeholder="请选择转入账户" clearable>
-            <el-option v-for="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCode" :value="debitCard.id" />
+            <el-option v-for="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCodeAvailableLimit" :value="debitCard.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="转账时间" prop="createTime">
diff --git a/src/views/invest/investAccountDeal/index.vue b/src/views/invest/investAccountDeal/index.vue
index 41497d4..1b61bfb 100644
--- a/src/views/invest/investAccountDeal/index.vue
+++ b/src/views/invest/investAccountDeal/index.vue
@@ -5,7 +5,7 @@
       <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
         <el-form-item label="投资账户" style="width: 500px" prop="accountId">
           <el-select v-model="queryParams.accountId" placeholder="请选择投资账户" clearable>
-            <el-option v-for="account in accountList" :key="account.id" :label="account.nameCode" :value="account.id" />
+            <el-option v-for="account in accountList" :key="account.id" :label="account.nameCodeAvailableLimit" :value="account.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="交易类型" style="width: 300px" prop="dealType">
@@ -61,7 +61,7 @@
       <el-form ref="accountDealRecordRef" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="投资账户" prop="accountId">
           <el-select v-model="form.accountId" placeholder="请选择投资账户" clearable>
-            <el-option v-for="account in accountList" :key="account.id" :label="account.nameCode" :value="account.id" />
+            <el-option v-for="account in accountList" :key="account.id" :label="account.nameCodeAvailableLimit" :value="account.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="交易类型" prop="dealType">
diff --git a/src/views/invest/investDealAnalysis/index.vue b/src/views/invest/investDealAnalysis/index.vue
index 7e43084..0439fca 100644
--- a/src/views/invest/investDealAnalysis/index.vue
+++ b/src/views/invest/investDealAnalysis/index.vue
@@ -5,7 +5,7 @@
       <el-form :model="queryParams" ref="queryRef" :inline="true" :rules="rules" label-width="100px">
         <el-form-item label="投资账户" style="width: 480px" prop="id">
           <el-select v-model="queryParams.id" placeholder="请选择投资账户" clearable>
-            <el-option v-for="account in accountsList" :key="account.id" :label="account.nameCode" :value="account.id" />
+            <el-option v-for="account in accountsList" :key="account.id" :label="account.nameCodeAvailableLimit" :value="account.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="" style="width: 100px" prop="type">
diff --git a/src/views/invest/lendTransferRecord/index.vue b/src/views/invest/lendTransferRecord/index.vue
index e77dbe1..417a557 100644
--- a/src/views/invest/lendTransferRecord/index.vue
+++ b/src/views/invest/lendTransferRecord/index.vue
@@ -5,12 +5,12 @@
       <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
         <el-form-item label="转入账户" style="width: 500px" prop="inAccountId">
           <el-select v-model="queryParams.inAccountId" placeholder="请选择转入账户" clearable>
-            <el-option v-for="lend in lendList" :key="lend.id" :label="lend.nameCode" :value="lend.id" />
+            <el-option v-for="lend in lendList" :key="lend.id" :label="lend.nameCodeAvailableLimit" :value="lend.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="转出账户" style="width: 500px" prop="outAccountId">
           <el-select v-model="queryParams.outAccountId" placeholder="请选择转出账户" clearable>
-            <el-option v-for="lend in lendList" :key="lend.id" :label="lend.nameCode" :value="lend.id" />
+            <el-option v-for="lend in lendList" :key="lend.id" :label="lend.nameCodeAvailableLimit" :value="lend.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="借贷时间" prop="time">
@@ -68,12 +68,12 @@
       <el-form ref="accountsTransferRecordRef" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="借贷账户" prop="outAccountId">
           <el-select v-model="form.outAccountId" placeholder="请选择借贷账户" clearable>
-            <el-option v-for="lend in lendList" :key="lend.id" :label="lend.nameCode" :value="lend.id" />
+            <el-option v-for="lend in lendList" :key="lend.id" :label="lend.nameCodeAvailableLimit" :value="lend.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="储蓄卡" prop="inAccountId">
           <el-select v-model="form.inAccountId" placeholder="请选择储蓄卡" clearable>
-            <el-option v-for="debit in debitCardList" :key="debit.id" :label="debit.nameCode" :value="debit.id" />
+            <el-option v-for="debit in debitCardList" :key="debit.id" :label="debit.nameCodeAvailableLimit" :value="debit.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="交易类型" prop="dealType">
diff --git a/src/views/invest/onlineLendHistory/index.vue b/src/views/invest/onlineLendHistory/index.vue
index b672e67..ddf980f 100644
--- a/src/views/invest/onlineLendHistory/index.vue
+++ b/src/views/invest/onlineLendHistory/index.vue
@@ -8,7 +8,7 @@
             <el-option v-for="creditCard in creditCardList" :key="creditCard.id" :label="creditCard.nameCode" :value="creditCard.id" />
           </el-select>
         </el-form-item>
-        <el-form-item label="账户状态" prop="state">
+        <el-form-item label="结清状态" prop="state">
           <el-select v-model="queryParams.state" placeholder="请选择账户状态" clearable>
             <el-option v-for="dict in settle_state" :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
@@ -60,7 +60,7 @@
                       <span>{{ parseTime(scope.row.closeDate, '{y}-{m}-{d}') }}</span>
                     </template>
                   </el-table-column> -->
-          <el-table-column label="账户状态" align="center" width="80" prop="state">
+          <el-table-column label="结清状态" align="center" width="80" prop="state">
             <template #default="scope">
               <dict-tag :options="settle_state" :value="scope.row.state" />
             </template>
@@ -99,7 +99,7 @@
         <el-form-item label="余额" prop="balance">
           <el-input v-model="form.balance" placeholder="请输入余额" />
         </el-form-item>
-        <el-form-item label="账户状态" prop="state">
+        <el-form-item label="结清状态" prop="state">
           <el-select v-model="form.state" placeholder="请选择账户状态">
             <el-option v-for="dict in settle_state" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
diff --git a/src/views/invest/onlineLendSettledAnalysis/index.vue b/src/views/invest/onlineLendSettledAnalysis/index.vue
index 1abf6aa..e0c2a54 100644
--- a/src/views/invest/onlineLendSettledAnalysis/index.vue
+++ b/src/views/invest/onlineLendSettledAnalysis/index.vue
@@ -122,7 +122,7 @@
           </el-table-column>
           <el-table-column label="借款日期" align="center" prop="time" />
           <el-table-column label="借款金额（本息）" align="center" prop="value" />
-          <el-table-column prop="detail" label="借款金额明细" width="700" v-if="queryParams.type === 2">
+          <el-table-column prop="detail" label="借款金额明细" width="900" v-if="queryParams.type === 2">
             <template #default="scope">
               <span v-html="formatMultiLineData(scope.row.detail)"></span>
             </template>
diff --git a/src/views/invest/posTransferRecord/index.vue b/src/views/invest/posTransferRecord/index.vue
index 47f1c1a..e107865 100644
--- a/src/views/invest/posTransferRecord/index.vue
+++ b/src/views/invest/posTransferRecord/index.vue
@@ -10,7 +10,7 @@
         </el-form-item>
         <el-form-item label="信用卡" style="width: 500px" prop="outAccountId">
           <el-select v-model="queryParams.outAccountId" placeholder="请选择信用卡" clearable>
-            <el-option v-for="creditCard in bankCardLendList" :key="creditCard.id" :label="creditCard.nameCode" :value="creditCard.id" />
+            <el-option v-for="creditCard in bankCardLendList" :key="creditCard.id" :label="creditCard.nameCodeAvailableLimit" :value="creditCard.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="刷卡时间" prop="time">
@@ -43,7 +43,7 @@
           <el-table-column label="刷卡商户" align="center" prop="merchantName" />
           <el-table-column label="信用卡" align="center" prop="outAccountName" />
           <el-table-column label="刷卡时间" align="center" prop="createTime" />
-          <el-table-column label="交易金额" align="center" prop="amount" />
+          <el-table-column label="刷卡金额" align="center" prop="amount" />
           <el-table-column label="手续费" width="100" align="center" prop="commission" />
           <el-table-column label="储蓄卡" align="center" prop="inAccountName" />
           <el-table-column label="入账金额" width="120" align="center" prop="actualAmount" />
@@ -76,7 +76,7 @@
         </el-form-item>
         <el-form-item label="信用卡" prop="outAccountId">
           <el-select v-model="form.outAccountId" placeholder="请选择信用卡" clearable>
-            <el-option v-for="creditCard in bankCardLendList" :key="creditCard.id" :label="creditCard.nameCode" :value="creditCard.id" />
+            <el-option v-for="creditCard in bankCardLendList" :key="creditCard.id" :label="creditCard.nameCodeAvailableLimit" :value="creditCard.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="刷卡时间" prop="createTime">
@@ -202,13 +202,6 @@ function getPosMachineList() {
   })
 }
 
-/** 查询投资账户管理列表 */
-function getFutruesStocksList() {
-  listAccounts(queryFutruesStocksParams.value).then((response) => {
-    futruesStocksList.value = response.rows
-  })
-}
-
 /** 查询POS机刷卡列表 */
 function getList() {
   loading.value = true
@@ -361,7 +354,6 @@ function handleExport() {
     `accountsTransferRecord_${new Date().getTime()}.xlsx`
   )
 }
-getFutruesStocksList()
 getPosMachineList()
 getBankCardLendList()
 getList()