From 7ca0798a1649d45773c3d008b5584aa4f4f0b269 Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Wed, 24 Jul 2024 16:34:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=87=AA=E6=B5=8Bbug=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=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           |  23 +-
 src/views/invest/accountsBalance/index.vue    | 210 +++++++++---------
 .../invest/creditTransferRecord/index.vue     |  12 +-
 .../invest/debitTransferRecord/index.vue      |  14 +-
 src/views/invest/lendTransferRecord/index.vue |  10 +-
 5 files changed, 139 insertions(+), 130 deletions(-)

diff --git a/src/views/invest/accounts/index.vue b/src/views/invest/accounts/index.vue
index 57e45e4..b76cd03 100644
--- a/src/views/invest/accounts/index.vue
+++ b/src/views/invest/accounts/index.vue
@@ -11,11 +11,16 @@
             <el-option v-for="dict in account_type" :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
         </el-form-item>
-        <el-form-item label="账户显示状态" prop="state">
+        <el-form-item label="账户状态" prop="status">
+          <el-select v-model="queryParams.status" placeholder="请选择账户状态" clearable>
+            <el-option v-for="dict in account_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item label="账户显示状态" prop="state">
           <el-select v-model="queryParams.state" placeholder="请选择账户状态" clearable>
             <el-option v-for="dict in account_state" :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div class="search-btn-con">
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -57,11 +62,11 @@
           <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">
+          <!-- <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> -->
           <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width">
             <template v-slot="scope">
               <div class="ctrl-btn d-flex">
@@ -89,17 +94,22 @@
         <el-form-item label="账号" prop="code">
           <el-input v-model="form.code" placeholder="请输入账号" />
         </el-form-item>
+        <el-form-item label="账户状态" prop="status">
+          <el-select v-model="form.status" placeholder="请选择账户状态">
+            <el-option v-for="dict in account_status" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="余额" prop="balance">
           <el-input v-model="form.balance" placeholder="请输入余额" />
         </el-form-item>
         <el-form-item label="可用额度" prop="availableLimit">
           <el-input v-model="form.availableLimit" 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 account_state" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
         </el-form-item>
@@ -257,6 +267,7 @@ const data = reactive({
     pageNum: 1,
     pageSize: 10,
     name: null,
+    status: null,
     type: null,
     state: null
   },
diff --git a/src/views/invest/accountsBalance/index.vue b/src/views/invest/accountsBalance/index.vue
index c477b59..581d477 100644
--- a/src/views/invest/accountsBalance/index.vue
+++ b/src/views/invest/accountsBalance/index.vue
@@ -1,119 +1,113 @@
 <template>
   <div class="app-container">
-        <div class="search-con">
-          <div class="title">查询条件</div>
-          <el-form :model="queryParams" ref="queryRef" :inline="true" :rules="rules" label-width="100px">
-            <el-form-item label="账户类型" prop="type">
-                      <el-select v-model="queryParams.dataType" placeholder="请选择账户类型" clearable>
-                        <el-option
-                            v-for="dict in account_type"
-                            :key="dict.value"
-                            :label="dict.label"
-                            :value="dict.value"
-                        />
-                      </el-select>
-                    </el-form-item>
-            <el-form-item label="" prop="time" v-if="queryParams.type === 1">
-              <el-date-picker
-                v-model="queryParams.time"
-                type="daterange"
-                disabled="true"
-                range-separator="~"
-                start-placeholder="开始时间"
-                end-placeholder="结束时间"
-                format="YYYY-MM-DD"
-                @calendar-change="calendarChange"
-              />
-            </el-form-item>
-          </el-form>
-          <div class="search-btn-con">
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-            <el-button type="info" icon="Refresh" @click="resetQuery">重置</el-button>
+    <div class="search-con">
+      <div class="title">查询条件</div>
+      <el-form :model="queryParams" ref="queryRef" :inline="true" :rules="rules" label-width="100px">
+        <el-form-item label="账户类型" prop="type">
+          <el-select v-model="queryParams.dataType" placeholder="请选择账户类型" clearable>
+            <el-option v-for="dict in account_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="" prop="time" v-if="queryParams.type === 1">
+          <el-date-picker
+            v-model="queryParams.time"
+            type="daterange"
+            disabled="true"
+            range-separator="~"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            format="YYYY-MM-DD"
+            @calendar-change="calendarChange"
+          />
+        </el-form-item>
+      </el-form>
+      <div class="search-btn-con">
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="info" icon="Refresh" @click="resetQuery">重置</el-button>
+      </div>
+    </div>
+    <div class="main-con" style="height: calc(100% - 1.45rem)">
+      <div class="summary-con">
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">储蓄账户可用余额</div>
+            <div>
+              <span class="num">{{ accountsBalance.debitBalance }}</span> <span class="unit"></span>
+            </div>
           </div>
         </div>
-        <div class="main-con" style="height: calc(100% - 1.45rem)">
-          <div class="summary-con"  >
-
-            <div class="right-con">
-              <div class="img">
-                <img src="@/assets/images/average.png" alt="" />
-              </div>
-              <div class="item-wrap">
-                <div class="title">储蓄卡可用余额</div>
-                <div>
-                  <span class="num">{{ accountsBalance.debetBalance }}</span> <span class="unit"></span>
-                </div>
-              </div>
-            </div>
-            <div class="right-con">
-              <div class="img">
-                <img src="@/assets/images/average.png" alt="" />
-              </div>
-              <div class="item-wrap">
-                <div class="title">信用卡可用额度</div>
-                <div>
-                  <span class="num">{{ accountsBalance.creditAvailableLimit }}</span> <span class="unit"></span>
-                </div>
-              </div>
-            </div>
-            <div class="right-con">
-              <div class="img">
-                <img src="@/assets/images/average.png" alt="" />
-              </div>
-              <div class="item-wrap">
-                <div class="title">信用卡余额</div>
-                <div>
-                  <span class="num">{{ accountsBalance.creditBalance}}</span> <span class="unit"></span>
-                </div>
-              </div>
-            </div>
-            <div class="center-con">
-              <div class="img">
-                <img src="@/assets/images/average.png" alt="" />
-              </div>
-              <div class="item-wrap">
-                <div class="title">投资账户余额</div>
-                <div>
-                  <span class="num">{{ accountsBalance.investBalance }}</span>
-                </div>
-              </div>
-            </div>
-            <div class="center-con">
-              <div class="img">
-                <img src="@/assets/images/average.png" alt="" />
-              </div>
-              <div class="item-wrap">
-                <div class="title">借贷账户余额</div>
-                <div>
-                  <span class="num">{{ accountsBalance.debitBalance }}</span>
-                </div>
-              </div>
-            </div>
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
           </div>
-          <div class="title-con">
-            <div class="title">记账账户查询统计</div>
-            <div class="operate-btn-con">
-              <el-radio-group v-model="radioVal" @change="handleRadioChange">
-                <el-radio-button label="柱状图" />
-                <el-radio-button label="折线图" />
-                <el-radio-button label="表格" />
-              </el-radio-group>
+          <div class="item-wrap">
+            <div class="title">信用卡可用额度</div>
+            <div>
+              <span class="num">{{ accountsBalance.creditAvailableLimit }}</span> <span class="unit"></span>
             </div>
           </div>
-          <div class="content-con">
-            <div v-show="radioVal === '柱状图'" class="chart" id="chartBar" style="height: calc(100% - 170px);"></div>
-            <div v-show="radioVal === '折线图'" class="chart" id="chartLine" style="height: calc(100% - 170px);"></div>
-            <el-table v-show="radioVal === '表格'" v-loading="loading" :data="accountsBalance.accountsBalancesList" height="calc(100% - 170px)">
-              <el-table-column label="序号" width="50" type="index" align="center">
-                <template #default="scope">
-                  <span>{{ scope.$index + 1 }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="记账账户" align="center" prop="account" />
-              <el-table-column label="可用余额" align="center" prop="availableLimit" />
-            </el-table>
-          </div>
         </div>
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">信用卡余额</div>
+            <div>
+              <span class="num">{{ accountsBalance.creditBalance }}</span> <span class="unit"></span>
+            </div>
+          </div>
+        </div>
+        <div class="center-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">投资账户余额</div>
+            <div>
+              <span class="num">{{ accountsBalance.investBalance }}</span>
+            </div>
+          </div>
+        </div>
+        <div class="center-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">借贷账户余额</div>
+            <div>
+              <span class="num">{{ accountsBalance.lendAccountBalance }}</span>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="title-con">
+        <div class="title">记账账户查询统计</div>
+        <div class="operate-btn-con">
+          <el-radio-group v-model="radioVal" @change="handleRadioChange">
+            <el-radio-button label="柱状图" />
+            <el-radio-button label="折线图" />
+            <el-radio-button label="表格" />
+          </el-radio-group>
+        </div>
+      </div>
+      <div class="content-con">
+        <div v-show="radioVal === '柱状图'" class="chart" id="chartBar" style="height: calc(100% - 170px)"></div>
+        <div v-show="radioVal === '折线图'" class="chart" id="chartLine" style="height: calc(100% - 170px)"></div>
+        <el-table v-show="radioVal === '表格'" v-loading="loading" :data="accountsBalance.accountsBalancesList" height="calc(100% - 170px)">
+          <el-table-column label="序号" width="50" type="index" align="center">
+            <template #default="scope">
+              <span>{{ scope.$index + 1 }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="记账账户" align="center" prop="account" />
+          <el-table-column label="可用余额" align="center" prop="availableLimit" />
+        </el-table>
+      </div>
+    </div>
   </div>
 </template>
 
diff --git a/src/views/invest/creditTransferRecord/index.vue b/src/views/invest/creditTransferRecord/index.vue
index 4e3d352..dffdd77 100644
--- a/src/views/invest/creditTransferRecord/index.vue
+++ b/src/views/invest/creditTransferRecord/index.vue
@@ -40,7 +40,7 @@
         <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="储蓄卡" width="200" align="center" prop="outAccountName" />
+          <el-table-column label="储蓄账户" width="200" align="center" prop="outAccountName" />
           <el-table-column label="信用卡" width="200" align="center" prop="inAccountName" />
           <el-table-column label="还款时间" width="180" align="center" prop="createTime" />
           <el-table-column label="还款金额" width="150" align="center" prop="amount" />
@@ -65,8 +65,8 @@
     <!-- 添加或修改信用卡还款对话框 -->
     <el-dialog :title="title" v-model="open" width="600px" append-to-body>
       <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-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.nameCodeAvailableLimit" :value="debitCard.id" />
           </el-select>
         </el-form-item>
@@ -164,12 +164,14 @@ const data = reactive({
   queryDebitParams: {
     pageNum: 1,
     type: '1',
+    repayFlag: '1',
     status: '1',
+    state: '1',
     pageSize: 1000
   },
   rules: {
     inAccountId: [{ required: true, message: '信用卡不能为空', trigger: 'blur' }],
-    outAccountId: [{ required: true, message: '储蓄卡不能为空', trigger: 'blur' }],
+    outAccountId: [{ required: true, message: '储蓄账户不能为空', trigger: 'blur' }],
     amount: [{ required: true, message: '还款金额不能为空', trigger: 'blur' }],
     dealType: [{ required: true, message: '还款方式不能为空', trigger: 'blur' }],
     createTime: [{ required: true, message: '还款时间不能为空', trigger: 'blur' }]
@@ -201,7 +203,7 @@ function getcreditCardList() {
   })
 }
 
-/** 查询储蓄卡卡管理列表 */
+/** 查询储蓄账户卡管理列表 */
 function getDebitList() {
   listAccounts(queryDebitParams.value).then((response) => {
     debitCardList.value = response.rows
diff --git a/src/views/invest/debitTransferRecord/index.vue b/src/views/invest/debitTransferRecord/index.vue
index de2a100..7e420fc 100644
--- a/src/views/invest/debitTransferRecord/index.vue
+++ b/src/views/invest/debitTransferRecord/index.vue
@@ -57,7 +57,7 @@
         <el-pagination small background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" />
       </div>
     </div>
-    <!-- 添加或修改储蓄卡转账对话框 -->
+    <!-- 添加或修改储蓄账户转账对话框 -->
     <el-dialog :title="title" v-model="open" width="600px" append-to-body>
       <el-form ref="accountsTransferRecordRef" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="转出账户" prop="outAccountId">
@@ -80,7 +80,7 @@
           <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
         </el-form-item>
       </el-form>
-      <template v-if="title !== '查看储蓄卡转账'" #footer>
+      <template v-if="title !== '查看储蓄账户转账'" #footer>
         <div class="dialog-footer">
           <el-button type="primary" @click="submitForm">确 定</el-button>
           <el-button @click="cancel">取 消</el-button>
@@ -190,7 +190,7 @@ function getcreditCardList() {
   })
 }
 
-/** 查询储蓄卡卡管理列表 */
+/** 查询储蓄账户卡管理列表 */
 function getDebitList() {
   listAccounts(queryDebitParams.value).then((response) => {
     debitCardList.value = response.rows
@@ -204,7 +204,7 @@ function getFutruesStocksList() {
   })
 }
 
-/** 查询储蓄卡转账列表 */
+/** 查询储蓄账户转账列表 */
 function getList() {
   loading.value = true
   const timeRange = queryParams.value.time
@@ -279,7 +279,7 @@ function handleSelectionChange(selection) {
 
 // 查看
 const handleView = (row) => {
-  title.value = '查看储蓄卡转账'
+  title.value = '查看储蓄账户转账'
   form.value = row
   open.value = true
 }
@@ -288,7 +288,7 @@ const handleView = (row) => {
 function handleAdd() {
   reset()
   open.value = true
-  title.value = '添加储蓄卡转账'
+  title.value = '添加储蓄账户转账'
 }
 
 /** 修改按钮操作 */
@@ -298,7 +298,7 @@ function handleUpdate(row) {
   getAccountsTransferRecord(_id).then((response) => {
     form.value = response.data
     open.value = true
-    title.value = '修改储蓄卡转账'
+    title.value = '修改储蓄账户转账'
   })
 }
 
diff --git a/src/views/invest/lendTransferRecord/index.vue b/src/views/invest/lendTransferRecord/index.vue
index fd23eb2..1e2119a 100644
--- a/src/views/invest/lendTransferRecord/index.vue
+++ b/src/views/invest/lendTransferRecord/index.vue
@@ -71,8 +71,8 @@
             <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-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.nameCodeAvailableLimit" :value="debit.id" />
           </el-select>
         </el-form-item>
@@ -161,11 +161,13 @@ const data = reactive({
     pageNum: 1,
     type: '1',
     status: '1',
+    state: '1',
+    repayFlag: '1',
     pageSize: 1000
   },
   rules: {
     inAccountId: [{ required: true, message: '借贷账户不能为空', trigger: 'blur' }],
-    outAccountId: [{ required: true, message: '储蓄卡不能为空', trigger: 'blur' }],
+    outAccountId: [{ required: true, message: '储蓄账户不能为空', trigger: 'blur' }],
     dealType: [{ required: true, message: '交易类型不能为空', trigger: 'blur' }],
     amount: [{ required: true, message: '借贷金额不能为空', trigger: 'blur' }],
     commission: [{ required: true, message: '还款利息不能为空', trigger: 'blur' }],
@@ -211,7 +213,7 @@ function getLendList() {
   })
 }
 
-/** 查询储蓄卡卡管理列表 */
+/** 查询储蓄账户卡管理列表 */
 function getDebitList() {
   listAccounts(queryDebitParams.value).then((response) => {
     debitCardList.value = response.rows