From d149dec61f4e83fc8cd62fd43de70cac013fb8fe Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Mon, 29 Apr 2024 15:06:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/invest/accountDealRecord/index.vue  |  67 ++-
 src/views/invest/accounts/index.vue           | 277 ++++++------
 src/views/invest/creditCardBill/index.vue     |   2 +-
 .../invest/creditInstallmentHistory/index.vue |   2 +-
 src/views/invest/creditQueryRecord/index.vue  |  62 ++-
 .../invest/creditTransferRecord/index.vue     | 155 ++++---
 src/views/invest/creditcard/index.vue         | 282 ++++++------
 src/views/invest/debitInfors/index.vue        | 293 ++++++-------
 .../invest/debitTransferRecord/index.vue      | 165 ++++---
 src/views/invest/debitcard/index.vue          | 189 ++++----
 src/views/invest/futures/index.vue            | 219 +++++-----
 src/views/invest/futuresBill/index.vue        | 145 +++----
 src/views/invest/heartJourney/index.vue       | 179 ++++----
 src/views/invest/investAccountDeal/index.vue  |  46 +-
 .../invest/investTransferRecord/index.vue     | 174 ++++----
 src/views/invest/lend/index.vue               | 149 +++----
 src/views/invest/lendTransferRecord/index.vue | 184 ++++----
 src/views/invest/onlineLendHistory/index.vue  |  86 ++--
 src/views/invest/peopleLendHistory/index.vue  | 225 +++++-----
 src/views/invest/posTransferRecord/index.vue  | 177 ++++----
 src/views/invest/posmachine/index.vue         | 287 +++++--------
 src/views/invest/stocks/index.vue             | 195 ++++-----
 src/views/invest/stocksBill/index.vue         | 145 +++----
 src/views/monitor/job/index.vue               |   2 +-
 src/views/monitor/job/log.vue                 | 403 ++++++++----------
 src/views/monitor/online/index.vue            |   2 +-
 src/views/system/config/index.vue             |   2 +-
 src/views/system/dict/data.vue                |   2 +-
 src/views/system/dict/index.vue               |   2 +-
 src/views/system/logininfor/index.vue         |   2 +-
 src/views/system/menu/index.vue               |   2 +-
 src/views/system/notice/index.vue             |   2 +-
 src/views/system/operlog/index.vue            |   2 +-
 src/views/system/post/index.vue               |   2 +-
 src/views/system/role/authUser.vue            |   2 +-
 src/views/system/role/index.vue               |   2 +-
 src/views/system/user/index.vue               |   2 +-
 src/views/tool/gen/index.vue                  |   2 +-
 38 files changed, 1832 insertions(+), 2304 deletions(-)

diff --git a/src/views/invest/accountDealRecord/index.vue b/src/views/invest/accountDealRecord/index.vue
index d24494b..92d0efd 100644
--- a/src/views/invest/accountDealRecord/index.vue
+++ b/src/views/invest/accountDealRecord/index.vue
@@ -39,40 +39,38 @@
         </div>
       </div>
       <div class="content-con" v-loading="loading">
-        <el-scrollbar>
-          <el-table v-loading="loading" :data="accountDealRecordList" @selection-change="handleSelectionChange">
-            <el-table-column label="账户名称" align="center" prop="accountName" />
-            <el-table-column label="记账类型" align="center" prop="type">
-              <template #default="scope">
-                <dict-tag :options="account_type" :value="scope.row.type" />
-              </template>
-            </el-table-column>
-            <el-table-column label="交易时间" align="center" 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">
-              <template #default="scope">
-                <dict-tag :options="deal_type" :value="scope.row.dealType" />
-              </template>
-            </el-table-column>
-            <el-table-column label="交易类别" align="center" 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="350" prop="remark" />
-            <el-table-column label="操作" 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">
-                    <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
-                  </el-tooltip>
-                </div>
-              </template>
-            </el-table-column>
-          </el-table>
-          <el-pagination small background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" />
-        </el-scrollbar>
+        <el-table v-loading="loading" :data="accountDealRecordList" @selection-change="handleSelectionChange" height="calc(100% - 0.62rem)">
+          <el-table-column label="账户名称" align="center" prop="accountName" />
+          <el-table-column label="记账类型" align="center" prop="type">
+            <template #default="scope">
+              <dict-tag :options="account_type" :value="scope.row.type" />
+            </template>
+          </el-table-column>
+          <el-table-column label="交易时间" align="center" 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">
+            <template #default="scope">
+              <dict-tag :options="deal_type" :value="scope.row.dealType" />
+            </template>
+          </el-table-column>
+          <el-table-column label="交易类别" align="center" 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" 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">
+                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination small background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" />
       </div>
     </div>
     <!-- 添加或修改账户交易记录对话框 -->
@@ -117,7 +115,6 @@
     </el-dialog>
   </div>
 </template>
-
 <script setup name="AccountDealRecord">
 import {
   listAccountDealRecord,
diff --git a/src/views/invest/accounts/index.vue b/src/views/invest/accounts/index.vue
index b897019..725498a 100644
--- a/src/views/invest/accounts/index.vue
+++ b/src/views/invest/accounts/index.vue
@@ -3,34 +3,19 @@
     <div class="search-con">
       <div class="title">查询条件</div>
       <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
-                    <el-form-item label="名称" prop="name">
-                      <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-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-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 label="名称" prop="name">
+          <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-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-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>
       <div class="search-btn-con">
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -41,46 +26,33 @@
       <div class="title-con">
         <div class="title">基本信息</div>
         <div class="operate-btn-con">
-          <el-button
-              @click="handleAdd"
-              icon="Plus"
-              v-hasPermi="['invest:accounts:add']"
-          >新增</el-button>
-          <el-button
-              :disabled="multiple"
-              icon="Delete"
-              @click="handleDelete"
-              v-hasPermi="['invest:accounts:remove']"
-          >删除</el-button>
-          <el-button
-              @click="handleExport"
-              icon="Download"
-              v-hasPermi="['invest:accounts:export']"
-          >导出</el-button>
+          <el-button @click="handleAdd" icon="Plus" v-hasPermi="['invest:accounts:add']">新增</el-button>
+          <el-button :disabled="multiple" icon="Delete" @click="handleDelete" v-hasPermi="['invest:accounts:remove']">删除</el-button>
+          <el-button @click="handleExport" icon="Download" v-hasPermi="['invest:accounts:export']">导出</el-button>
         </div>
       </div>
       <div class="content-con" v-loading="loading">
-        <el-table v-loading="loading" :data="accountsList" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="accountsList" @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="type">
-                    <template #default="scope">
-                          <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="可用额度" align="center" prop="availableLimit" />
-                  <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" prop="name" />
+          <el-table-column label="账户类型" align="center" prop="type">
+            <template #default="scope">
+              <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="可用额度" align="center" prop="availableLimit" />
+          <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">
             <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">
-                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id,scope.row)"></el-button>
+                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
                 </el-tooltip>
               </div>
             </template>
@@ -92,42 +64,31 @@
     <!-- 添加或修改记账账户对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="accountsRef" :model="form" :rules="rules" label-width="120px">
-                        <el-form-item label="名称" prop="name">
-                          <el-input v-model="form.name" placeholder="请输入名称" />
-                        </el-form-item>
-                        <el-form-item label="账户类型" prop="type">
-                          <el-select v-model="form.type" placeholder="请选择账户类型">
-                            <el-option
-                                v-for="dict in account_type"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"
-                            ></el-option>
-                          </el-select>
-                        </el-form-item>
-                        <el-form-item label="账号" prop="code">
-                          <el-input v-model="form.code" placeholder="请输入账号" />
-                        </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-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 label="备注" prop="remark">
-                          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-                        </el-form-item>
-
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入名称" />
+        </el-form-item>
+        <el-form-item label="账户类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择账户类型">
+            <el-option v-for="dict in account_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="账号" prop="code">
+          <el-input v-model="form.code" placeholder="请输入账号" />
+        </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-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 label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
       </el-form>
       <template v-if="title !== '查看记账账户'" #footer>
         <div class="dialog-footer">
@@ -147,20 +108,20 @@
         </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" prop="amount" />
-                  <el-table-column label="当前余额" align="center" prop="currentBalance" />
-                  <el-table-column label="交易类型" align="center" 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">
-                    <template #default="scope">
-                          <dict-tag :options="deal_category" :value="scope.row.dealCategory"/>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="交易时间" align="center" 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">
+          <template #default="scope">
+            <dict-tag :options="deal_type" :value="scope.row.dealType" />
+          </template>
+        </el-table-column>
+        <el-table-column label="交易类别" align="center" prop="dealCategory">
+          <template #default="scope">
+            <dict-tag :options="deal_category" :value="scope.row.dealCategory" />
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" />
       </el-table>
       <el-pagination small background layout="total, prev, pager, next" :total="dealRecordTotal" @current-change="handleCurrentDealRecordChange" />
     </el-dialog>
@@ -168,7 +129,13 @@
     <el-dialog :title="titleTransferRecord" v-model="openTransferRecord" width="1100px" append-to-body destroy-on-close>
       <el-form :model="queryTransferRecordParams" ref="queryTransferRecordRef" inline>
         <el-form-item label="选择时间" prop="startTime">
-          <el-date-picker v-model="queryTransferRecordParams.time" type="daterange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" />
+          <el-date-picker
+            v-model="queryTransferRecordParams.time"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+          />
         </el-form-item>
         <el-form-item label="">
           <el-button type="primary" icon="Search" @click="handleTransferRecordQuery">搜索</el-button>
@@ -176,12 +143,12 @@
         </el-form-item>
       </el-form>
       <el-table v-loading="loadingTransferRecord" :data="tableTransferRecordData">
-                  <!-- <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" prop="createTime" />
-                  <el-table-column label="转账金额"   align="center" prop="amount" />
+        <!-- <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" prop="createTime" />
+        <el-table-column label="转账金额" align="center" prop="amount" />
       </el-table>
       <el-pagination small background layout="total, prev, pager, next" :total="transferRecordTotal" @current-change="handleCurrentTransferRecordChange" />
     </el-dialog>
@@ -197,7 +164,7 @@ 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 } = proxy.useDict('account_state', 'account_type', 'deal_type', 'deal_category')
 const accountsList = ref([])
 const open = ref(false)
 const loading = ref(true)
@@ -247,18 +214,10 @@ const data = reactive({
     state: null
   },
   rules: {
-    name: [
-      { required: true, message: '名称不能为空', trigger: 'blur' }
-    ],
-    type: [
-      { required: true, message: '账户类型不能为空', trigger: 'change' }
-    ],
-    code: [
-      { required: true, message: '账号不能为空', trigger: 'blur' }
-    ],
-    balance: [
-      { required: true, message: '余额不能为空', trigger: 'blur' }
-    ]
+    name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+    type: [{ required: true, message: '账户类型不能为空', trigger: 'change' }],
+    code: [{ required: true, message: '账号不能为空', trigger: 'blur' }],
+    balance: [{ required: true, message: '余额不能为空', trigger: 'blur' }]
   }
 })
 
@@ -287,9 +246,9 @@ const handleOperate = (operate, row) => {
 const { queryParams, form, rules } = toRefs(data)
 
 /** 查询记账账户列表 */
-function getList () {
+function getList() {
   loading.value = true
-  listAccounts(queryParams.value).then(response => {
+  listAccounts(queryParams.value).then((response) => {
     accountsList.value = response.rows
     total.value = response.total
     loading.value = false
@@ -303,7 +262,7 @@ function cancel() {
 }
 
 // 表单重置
-function reset () {
+function reset() {
   form.value = {
     id: null,
     name: null,
@@ -325,13 +284,13 @@ function reset () {
 }
 
 /** 搜索按钮操作 */
-function handleQuery () {
+function handleQuery() {
   queryParams.value.pageNum = 1
   getList()
 }
 
 /** 重置按钮操作 */
-function resetQuery () {
+function resetQuery() {
   proxy.resetForm('queryRef')
   handleQuery()
 }
@@ -343,8 +302,8 @@ const handleCurrentChange = (val) => {
 }
 
 // 多选框选中数据
-function handleSelectionChange (selection) {
-  ids.value = selection.map(item => item.id)
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id)
   single.value = selection.length !== 1
   multiple.value = !selection.length
 }
@@ -357,17 +316,17 @@ const handleView = (row) => {
 }
 
 /** 新增按钮操作 */
-function handleAdd () {
+function handleAdd() {
   reset()
   open.value = true
   title.value = '添加记账账户'
 }
 
 /** 修改按钮操作 */
-function handleUpdate (row) {
+function handleUpdate(row) {
   reset()
   const _id = row.id || ids.value
-  getAccounts(_id).then(response => {
+  getAccounts(_id).then((response) => {
     form.value = response.data
     open.value = true
     title.value = '修改记账账户'
@@ -375,17 +334,17 @@ function handleUpdate (row) {
 }
 
 /** 提交按钮 */
-function submitForm () {
-  proxy.$refs.accountsRef.validate(valid => {
+function submitForm() {
+  proxy.$refs.accountsRef.validate((valid) => {
     if (valid) {
       if (form.value.id != null) {
-        updateAccounts(form.value).then(response => {
+        updateAccounts(form.value).then((response) => {
           proxy.$modal.msgSuccess('修改成功')
           open.value = false
           getList()
         })
       } else {
-        addAccounts(form.value).then(response => {
+        addAccounts(form.value).then((response) => {
           proxy.$modal.msgSuccess('新增成功')
           open.value = false
           getList()
@@ -396,21 +355,29 @@ function submitForm () {
 }
 
 /** 删除按钮操作 */
-function handleDelete (row) {
+function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除选中的数据项？').then(function() {
-    return delAccounts(_ids)
-  }).then(() => {
-    getList()
-    proxy.$modal.msgSuccess('删除成功')
-  }).catch(() => {})
+  proxy.$modal
+    .confirm('是否确认删除选中的数据项？')
+    .then(function () {
+      return delAccounts(_ids)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('删除成功')
+    })
+    .catch(() => {})
 }
 
 /** 导出按钮操作 */
-function handleExport () {
-  proxy.download('invest/accounts/export', {
-    ...queryParams.value
-  }, `accounts_${new Date().getTime()}.xlsx`)
+function handleExport() {
+  proxy.download(
+    'invest/accounts/export',
+    {
+      ...queryParams.value
+    },
+    `accounts_${new Date().getTime()}.xlsx`
+  )
 }
 
 /** 历史数据按钮操作 */
diff --git a/src/views/invest/creditCardBill/index.vue b/src/views/invest/creditCardBill/index.vue
index 0a6bcb8..d04ce1a 100644
--- a/src/views/invest/creditCardBill/index.vue
+++ b/src/views/invest/creditCardBill/index.vue
@@ -27,7 +27,7 @@
         </div>
       </div>
       <div class="content-con" v-loading="loading">
-        <el-table v-loading="loading" :data="creditCardBillList" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="creditCardBillList" @selection-change="handleSelectionChange" height="calc(100% - 0.62rem)">
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="信用卡" align="center" prop="bankNameCode" />
           <el-table-column label="账单名称" align="center" prop="name" />
diff --git a/src/views/invest/creditInstallmentHistory/index.vue b/src/views/invest/creditInstallmentHistory/index.vue
index 4ac00b0..cf0f2ce 100644
--- a/src/views/invest/creditInstallmentHistory/index.vue
+++ b/src/views/invest/creditInstallmentHistory/index.vue
@@ -29,7 +29,7 @@
         </div>
       </div>
       <div class="content-con" v-loading="loading">
-        <el-table v-loading="loading" :data="installmentHistoryList" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="installmentHistoryList" @selection-change="handleSelectionChange" height="calc(100% - 0.62rem)">
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="信用卡" align="center" width="200" prop="bankNameCode" />
           <el-table-column label="分期金额" align="center" prop="installmentAmount" />
diff --git a/src/views/invest/creditQueryRecord/index.vue b/src/views/invest/creditQueryRecord/index.vue
index fcc1d41..0b16aac 100644
--- a/src/views/invest/creditQueryRecord/index.vue
+++ b/src/views/invest/creditQueryRecord/index.vue
@@ -41,38 +41,36 @@
         </div>
       </div>
       <div class="content-con" v-loading="loading">
-        <el-scrollbar>
-          <el-table v-loading="loading" :data="CreditQueryRecordList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" />
-            <el-table-column label="查询日期" align="center" prop="queryDate" width="150">
-              <template #default="scope">
-                <span>{{ parseTime(scope.row.queryDate, '{y}-{m}-{d}') }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="查询机构" align="center" prop="queryInstitution" />
-            <el-table-column label="查询原因" align="center" width="150" prop="type">
-              <template #default="scope">
-                <dict-tag :options="credit_report_type" :value="scope.row.type" />
-              </template>
-            </el-table-column>
-            <el-table-column label="查询类型" align="center" width="150" prop="queryType">
-              <template #default="scope">
-                <dict-tag :options="credit_query_type" :value="scope.row.queryType" />
-              </template>
-            </el-table-column>
-            <el-table-column label="备注" align="center" width="300" prop="remark" />
-            <el-table-column label="操作" 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">
-                    <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
-                  </el-tooltip>
-                </div>
-              </template>
-            </el-table-column>
-          </el-table>
-          <el-pagination small background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" />
-        </el-scrollbar>
+        <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">
+              <span>{{ parseTime(scope.row.queryDate, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="查询机构" align="center" prop="queryInstitution" />
+          <el-table-column label="查询原因" align="center" width="150" prop="type">
+            <template #default="scope">
+              <dict-tag :options="credit_report_type" :value="scope.row.type" />
+            </template>
+          </el-table-column>
+          <el-table-column label="查询类型" align="center" width="150" prop="queryType">
+            <template #default="scope">
+              <dict-tag :options="credit_query_type" :value="scope.row.queryType" />
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" align="center" width="300" prop="remark" />
+          <el-table-column label="操作" 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">
+                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination small background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" />
       </div>
     </div>
     <!-- 添加或修改征信查询记录对话框 -->
diff --git a/src/views/invest/creditTransferRecord/index.vue b/src/views/invest/creditTransferRecord/index.vue
index 5de2ed7..05bc3fc 100644
--- a/src/views/invest/creditTransferRecord/index.vue
+++ b/src/views/invest/creditTransferRecord/index.vue
@@ -3,11 +3,11 @@
     <div class="search-con">
       <div class="title">查询条件</div>
       <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-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="bankCardLend in creditCardList" :key="bankCardLend.id" :label="bankCardLend.nameCode" :value="bankCardLend.id" />
+          </el-select>
+        </el-form-item>
       </el-form>
       <div class="search-btn-con">
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -18,37 +18,29 @@
       <div class="title-con">
         <div class="title">基本信息</div>
         <div class="operate-btn-con">
-          <el-button
-              @click="handleAdd"
-              icon="Plus"
-              v-hasPermi="['invest:accountsTransferRecord:add']"
-          >新增</el-button>
+          <el-button @click="handleAdd" icon="Plus" v-hasPermi="['invest:accountsTransferRecord:add']">新增</el-button>
           <!-- <el-button
               :disabled="multiple"
               icon="Delete"
               @click="handleDelete"
               v-hasPermi="['invest:accountsTransferRecord:remove']"
           >删除</el-button> -->
-          <el-button
-              @click="handleExport"
-              icon="Download"
-              v-hasPermi="['invest:accountsTransferRecord:export']"
-          >导出</el-button>
+          <el-button @click="handleExport" icon="Download" v-hasPermi="['invest:accountsTransferRecord:export']">导出</el-button>
         </div>
       </div>
       <div class="content-con" v-loading="loading">
-        <el-table v-loading="loading" :data="accountsTransferRecordList" @selection-change="handleSelectionChange">
+        <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="还款时间" width='180'  align="center" prop="createTime" />
-                  <el-table-column label="还款金额" width='150'  align="center" prop="amount" />
+          <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">
             <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">
-                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id,scope.row)"></el-button>
+                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
                 </el-tooltip>
               </div>
             </template>
@@ -60,30 +52,25 @@
     <!-- 添加或修改信用卡还款对话框 -->
     <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-option v-for="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCode" :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-select>
-                        </el-form-item>
-                        <el-form-item label="还款时间" prop="createTime">
-                          <el-date-picker clearable
-                                          v-model="form.createTime"
-                                          type="datetime"
-                                          value-format="YYYY-MM-DD HH:mm:ss"
-                                          placeholder="请选择还款时间">
-                          </el-date-picker>
-                        </el-form-item>
-                        <el-form-item label="还款金额" prop="amount">
-                          <el-input v-model="form.amount" placeholder="请输入还款金额" />
-                        </el-form-item>
-                        <el-form-item label="备注" prop="remark">
-                          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-                        </el-form-item>
+        <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-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-select>
+        </el-form-item>
+        <el-form-item label="还款时间" prop="createTime">
+          <el-date-picker clearable v-model="form.createTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择还款时间"> </el-date-picker>
+        </el-form-item>
+        <el-form-item label="还款金额" prop="amount">
+          <el-input v-model="form.amount" placeholder="请输入还款金额" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
       </el-form>
       <template v-if="title !== '查看信用卡还款'" #footer>
         <div class="dialog-footer">
@@ -96,7 +83,13 @@
 </template>
 
 <script setup name="AccountsTransferRecord">
-import { listAccountsTransferRecord, getAccountsTransferRecord, delAccountsTransferRecord, addAccountsTransferRecord, updateAccountsTransferRecord } from '@/api/invest/accountsTransferRecord'
+import {
+  listAccountsTransferRecord,
+  getAccountsTransferRecord,
+  delAccountsTransferRecord,
+  addAccountsTransferRecord,
+  updateAccountsTransferRecord
+} from '@/api/invest/accountsTransferRecord'
 import { listAccounts } from '@/api/invest/accounts'
 // eslint-disable-next-line no-unused-vars
 import { require } from '@/utils/require'
@@ -155,18 +148,10 @@ const data = reactive({
     pageSize: 1000
   },
   rules: {
-    inAccountId: [
-      { required: true, message: '信用卡不能为空', trigger: 'blur' }
-    ],
-    outAccountId: [
-      { required: true, message: '储蓄卡不能为空', trigger: 'blur' }
-    ],
-    amount: [
-      { required: true, message: '还款金额不能为空', trigger: 'blur' }
-    ],
-    createTime: [
-      { required: true, message: '还款时间不能为空', trigger: 'blur' }
-    ]
+    inAccountId: [{ required: true, message: '信用卡不能为空', trigger: 'blur' }],
+    outAccountId: [{ required: true, message: '储蓄卡不能为空', trigger: 'blur' }],
+    amount: [{ required: true, message: '还款金额不能为空', trigger: 'blur' }],
+    createTime: [{ required: true, message: '还款时间不能为空', trigger: 'blur' }]
   }
 })
 
@@ -210,9 +195,9 @@ function getFutruesStocksList() {
 }
 
 /** 查询信用卡还款列表 */
-function getList () {
+function getList() {
   loading.value = true
-  listAccountsTransferRecord(queryParams.value).then(response => {
+  listAccountsTransferRecord(queryParams.value).then((response) => {
     accountsTransferRecordList.value = response.rows
     total.value = response.total
     loading.value = false
@@ -226,7 +211,7 @@ function cancel() {
 }
 
 // 表单重置
-function reset () {
+function reset() {
   form.value = {
     id: null,
     name: null,
@@ -249,13 +234,13 @@ function reset () {
 }
 
 /** 搜索按钮操作 */
-function handleQuery () {
+function handleQuery() {
   queryParams.value.pageNum = 1
   getList()
 }
 
 /** 重置按钮操作 */
-function resetQuery () {
+function resetQuery() {
   proxy.resetForm('queryRef')
   handleQuery()
 }
@@ -267,8 +252,8 @@ const handleCurrentChange = (val) => {
 }
 
 // 多选框选中数据
-function handleSelectionChange (selection) {
-  ids.value = selection.map(item => item.id)
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id)
   single.value = selection.length !== 1
   multiple.value = !selection.length
 }
@@ -281,17 +266,17 @@ const handleView = (row) => {
 }
 
 /** 新增按钮操作 */
-function handleAdd () {
+function handleAdd() {
   reset()
   open.value = true
   title.value = '添加信用卡还款'
 }
 
 /** 修改按钮操作 */
-function handleUpdate (row) {
+function handleUpdate(row) {
   reset()
   const _id = row.id || ids.value
-  getAccountsTransferRecord(_id).then(response => {
+  getAccountsTransferRecord(_id).then((response) => {
     form.value = response.data
     open.value = true
     title.value = '修改信用卡还款'
@@ -299,17 +284,17 @@ function handleUpdate (row) {
 }
 
 /** 提交按钮 */
-function submitForm () {
-  proxy.$refs.accountsTransferRecordRef.validate(valid => {
+function submitForm() {
+  proxy.$refs.accountsTransferRecordRef.validate((valid) => {
     if (valid) {
       if (form.value.id != null) {
-        updateAccountsTransferRecord(form.value).then(response => {
+        updateAccountsTransferRecord(form.value).then((response) => {
           proxy.$modal.msgSuccess('修改成功')
           open.value = false
           getList()
         })
       } else {
-        addAccountsTransferRecord(form.value).then(response => {
+        addAccountsTransferRecord(form.value).then((response) => {
           proxy.$modal.msgSuccess('新增成功')
           open.value = false
           getList()
@@ -320,21 +305,29 @@ function submitForm () {
 }
 
 /** 删除按钮操作 */
-function handleDelete (row) {
+function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除选中的数据项？').then(function() {
-    return delAccountsTransferRecord(_ids)
-  }).then(() => {
-    getList()
-    proxy.$modal.msgSuccess('删除成功')
-  }).catch(() => {})
+  proxy.$modal
+    .confirm('是否确认删除选中的数据项？')
+    .then(function () {
+      return delAccountsTransferRecord(_ids)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('删除成功')
+    })
+    .catch(() => {})
 }
 
 /** 导出按钮操作 */
-function handleExport () {
-  proxy.download('invest/accountsTransferRecord/export', {
-    ...queryParams.value
-  }, `accountsTransferRecord_${new Date().getTime()}.xlsx`)
+function handleExport() {
+  proxy.download(
+    'invest/accountsTransferRecord/export',
+    {
+      ...queryParams.value
+    },
+    `accountsTransferRecord_${new Date().getTime()}.xlsx`
+  )
 }
 getFutruesStocksList()
 getDebitList()
diff --git a/src/views/invest/creditcard/index.vue b/src/views/invest/creditcard/index.vue
index b8300e0..9391015 100644
--- a/src/views/invest/creditcard/index.vue
+++ b/src/views/invest/creditcard/index.vue
@@ -3,14 +3,9 @@
     <div class="search-con">
       <div class="title">查询条件</div>
       <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
-                    <el-form-item label="信用卡名称" prop="name">
-                      <el-input
-                          v-model="queryParams.name"
-                          placeholder="请输入信用卡名称"
-                          clearable
-                          @keyup.enter="handleQuery"
-                      />
-                    </el-form-item>
+        <el-form-item label="信用卡名称" prop="name">
+          <el-input v-model="queryParams.name" placeholder="请输入信用卡名称" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
       </el-form>
       <div class="search-btn-con">
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -21,58 +16,45 @@
       <div class="title-con">
         <div class="title">基本信息</div>
         <div class="operate-btn-con">
-          <el-button
-              @click="handleAdd"
-              icon="Plus"
-              v-hasPermi="['invest:bankcard:add']"
-          >新增</el-button>
-          <el-button
-              :disabled="multiple"
-              icon="Delete"
-              @click="handleDelete"
-              v-hasPermi="['invest:bankcard:remove']"
-          >删除</el-button>
-          <el-button
-              @click="handleExport"
-              icon="Download"
-              v-hasPermi="['invest:bankcard:export']"
-          >导出</el-button>
+          <el-button @click="handleAdd" icon="Plus" v-hasPermi="['invest:bankcard:add']">新增</el-button>
+          <el-button :disabled="multiple" icon="Delete" @click="handleDelete" v-hasPermi="['invest:bankcard:remove']">删除</el-button>
+          <el-button @click="handleExport" icon="Download" v-hasPermi="['invest:bankcard:export']">导出</el-button>
         </div>
       </div>
       <div class="content-con" v-loading="loading">
-        <el-table v-loading="loading" :data="bankcardList" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="bankcardList" @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="code" />
-                  <el-table-column label="开户日期" align="center" prop="activationDate" width="180">
-                    <template #default="scope">
-                      <span>{{ parseTime(scope.row.activationDate, '{y}-{m}-{d}') }}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="账单日" align="center" width='100' prop="billDateName" />
-                  <el-table-column label="还款日" align="center"  width='100' prop="payDateName" />
-                  <el-table-column label="延缓期限" align="center"  width='100' prop="delayPeriod" />
-                  <el-table-column label="信用卡额度" align="center" prop="creditLimit" />
-                  <el-table-column label="有效期" align="center" prop="effectiveDate" width="180">
-                    <template #default="scope">
-                      <span>{{ parseTime(scope.row.effectiveDate, '{y}-{m}-{d}') }}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="账单日消费" align="center" prop="isNextBillDate">
-                    <template #default="scope">
-                          <dict-tag :options="is_next_bill_date" :value="scope.row.isNextBillDate"/>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="0账单操作" align="center" prop="isZeroBill">
-                    <template #default="scope">
-                          <dict-tag :options="is_zero_bill" :value="scope.row.isZeroBill"/>
-                    </template>
-                  </el-table-column>
+          <el-table-column label="信用卡名称" align="center" prop="name" />
+          <el-table-column label="信用卡卡号" align="center" prop="code" />
+          <el-table-column label="开户日期" align="center" prop="activationDate" width="180">
+            <template #default="scope">
+              <span>{{ parseTime(scope.row.activationDate, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="账单日" align="center" width="100" prop="billDateName" />
+          <el-table-column label="还款日" align="center" width="100" prop="payDateName" />
+          <el-table-column label="延缓期限" align="center" width="100" prop="delayPeriod" />
+          <el-table-column label="信用卡额度" align="center" prop="creditLimit" />
+          <el-table-column label="有效期" align="center" prop="effectiveDate" width="180">
+            <template #default="scope">
+              <span>{{ parseTime(scope.row.effectiveDate, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="账单日消费" align="center" prop="isNextBillDate">
+            <template #default="scope">
+              <dict-tag :options="is_next_bill_date" :value="scope.row.isNextBillDate" />
+            </template>
+          </el-table-column>
+          <el-table-column label="0账单操作" align="center" prop="isZeroBill">
+            <template #default="scope">
+              <dict-tag :options="is_zero_bill" :value="scope.row.isZeroBill" />
+            </template>
+          </el-table-column>
           <el-table-column label="操作" 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">
-                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id,scope.row)"></el-button>
+                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
                 </el-tooltip>
               </div>
             </template>
@@ -83,73 +65,53 @@
     </div>
     <!-- 添加或修改信用卡信息对话框 -->
     <el-dialog :title="title" v-model="open" width="880px" append-to-body>
-      <el-form ref="bankcardRef" :model="form" :rules="rules" :inline="true"  label-width="120px">
-                        <el-form-item label="信用卡名称" prop="name">
-                          <el-input v-model="form.name" placeholder="请输入信用卡名称" />
-                        </el-form-item>
-                        <el-form-item label="信用卡卡号" prop="code">
-                          <el-input v-model="form.code" placeholder="请输入信用卡卡号" />
-                        </el-form-item>
-                        <el-form-item label="信用卡额度" prop="creditLimit">
-                          <el-input v-model="form.creditLimit" placeholder="请输入信用卡额度" />
-                        </el-form-item>
-                        <el-form-item label="账单日" prop="billDate">
-                          <el-input v-model="form.billDate" placeholder="请输入账单日" />
-                        </el-form-item>
-                        <el-form-item label="还款日" prop="payDate">
-                          <el-input v-model="form.payDate" placeholder="请输入还款日" />
-                        </el-form-item>
-                        <el-form-item label="信用卡安全码" prop="cvv">
-                          <el-input v-model="form.cvv" placeholder="请输入信用卡安全码" />
-                        </el-form-item>
-                        <el-form-item label="开户行" prop="openingBank">
-                          <el-input v-model="form.openingBank" placeholder="请输入开户行" />
-                        </el-form-item>
-                        <el-form-item label="开户日期" prop="activationDate">
-                          <el-date-picker clearable
-                                          v-model="form.activationDate"
-                                          type="date"
-                                          value-format="YYYY-MM-DD"
-                                          placeholder="请选择开户日期">
-                          </el-date-picker>
-                        </el-form-item>
-                        <el-form-item label="宽限期" prop="delayPeriod">
-                          <el-input v-model="form.delayPeriod" placeholder="请输入延缓期限" />
-                        </el-form-item>
-                        <el-form-item label="有效期" prop="effectiveDate">
-                          <el-date-picker clearable
-                                          v-model="form.effectiveDate"
-                                          type="date"
-                                          value-format="YYYY-MM-DD"
-                                          placeholder="请选择有效期">
-                          </el-date-picker>
-                        </el-form-item>
-                        <el-form-item label="账单日消费" prop="isNextBillDate">
-                          <el-select v-model="form.isNextBillDate" placeholder="请选择账单日消费">
-                            <el-option
-                                v-for="dict in is_next_bill_date"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"
-                            ></el-option>
-                          </el-select>
-                        </el-form-item>
-                        <el-form-item label="账单日时间" prop="nextBillDateTime">
-                          <el-input v-model="form.nextBillDateTime" placeholder="请输入账单日时间" />
-                        </el-form-item>
-                        <el-form-item label="0账单操作" prop="isZeroBill">
-                          <el-select v-model="form.isZeroBill" placeholder="请选择0账单操作">
-                            <el-option
-                                v-for="dict in is_zero_bill"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"
-                            ></el-option>
-                          </el-select>
-                        </el-form-item>
-                        <el-form-item label="备注" prop="remark">
-                          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-                        </el-form-item>
+      <el-form ref="bankcardRef" :model="form" :rules="rules" :inline="true" label-width="120px">
+        <el-form-item label="信用卡名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入信用卡名称" />
+        </el-form-item>
+        <el-form-item label="信用卡卡号" prop="code">
+          <el-input v-model="form.code" placeholder="请输入信用卡卡号" />
+        </el-form-item>
+        <el-form-item label="信用卡额度" prop="creditLimit">
+          <el-input v-model="form.creditLimit" placeholder="请输入信用卡额度" />
+        </el-form-item>
+        <el-form-item label="账单日" prop="billDate">
+          <el-input v-model="form.billDate" placeholder="请输入账单日" />
+        </el-form-item>
+        <el-form-item label="还款日" prop="payDate">
+          <el-input v-model="form.payDate" placeholder="请输入还款日" />
+        </el-form-item>
+        <el-form-item label="信用卡安全码" prop="cvv">
+          <el-input v-model="form.cvv" placeholder="请输入信用卡安全码" />
+        </el-form-item>
+        <el-form-item label="开户行" prop="openingBank">
+          <el-input v-model="form.openingBank" placeholder="请输入开户行" />
+        </el-form-item>
+        <el-form-item label="开户日期" prop="activationDate">
+          <el-date-picker clearable v-model="form.activationDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择开户日期"> </el-date-picker>
+        </el-form-item>
+        <el-form-item label="宽限期" prop="delayPeriod">
+          <el-input v-model="form.delayPeriod" placeholder="请输入延缓期限" />
+        </el-form-item>
+        <el-form-item label="有效期" prop="effectiveDate">
+          <el-date-picker clearable v-model="form.effectiveDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择有效期"> </el-date-picker>
+        </el-form-item>
+        <el-form-item label="账单日消费" prop="isNextBillDate">
+          <el-select v-model="form.isNextBillDate" placeholder="请选择账单日消费">
+            <el-option v-for="dict in is_next_bill_date" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="账单日时间" prop="nextBillDateTime">
+          <el-input v-model="form.nextBillDateTime" placeholder="请输入账单日时间" />
+        </el-form-item>
+        <el-form-item label="0账单操作" prop="isZeroBill">
+          <el-select v-model="form.isZeroBill" placeholder="请选择0账单操作">
+            <el-option v-for="dict in is_zero_bill" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
       </el-form>
       <template v-if="title !== '查看信用卡信息'" #footer>
         <div class="dialog-footer">
@@ -191,24 +153,12 @@ const data = reactive({
     type: '2'
   },
   rules: {
-    name: [
-      { required: true, message: '信用卡名称不能为空', trigger: 'blur' }
-    ],
-    code: [
-      { required: true, message: '信用卡卡号不能为空', trigger: 'blur' }
-    ],
-    billDate: [
-      { required: true, message: '账单日不能为空', trigger: 'blur' }
-    ],
-    payDate: [
-      { required: true, message: '还款日不能为空', trigger: 'blur' }
-    ],
-    creditLimit: [
-      { required: true, message: '信用卡额度不能为空', trigger: 'blur' }
-    ],
-    cvv: [
-      { required: true, message: '信用卡安全码不能为空', trigger: 'blur' }
-    ]
+    name: [{ required: true, message: '信用卡名称不能为空', trigger: 'blur' }],
+    code: [{ required: true, message: '信用卡卡号不能为空', trigger: 'blur' }],
+    billDate: [{ required: true, message: '账单日不能为空', trigger: 'blur' }],
+    payDate: [{ required: true, message: '还款日不能为空', trigger: 'blur' }],
+    creditLimit: [{ required: true, message: '信用卡额度不能为空', trigger: 'blur' }],
+    cvv: [{ required: true, message: '信用卡安全码不能为空', trigger: 'blur' }]
   }
 })
 
@@ -231,9 +181,9 @@ const handleOperate = (operate, row) => {
 const { queryParams, form, rules } = toRefs(data)
 
 /** 查询信用卡信息列表 */
-function getList () {
+function getList() {
   loading.value = true
-  listBankcardLend(queryParams.value).then(response => {
+  listBankcardLend(queryParams.value).then((response) => {
     bankcardList.value = response.rows
     total.value = response.total
     loading.value = false
@@ -247,7 +197,7 @@ function cancel() {
 }
 
 // 表单重置
-function reset () {
+function reset() {
   form.value = {
     id: null,
     name: null,
@@ -276,13 +226,13 @@ function reset () {
 }
 
 /** 搜索按钮操作 */
-function handleQuery () {
+function handleQuery() {
   queryParams.value.pageNum = 1
   getList()
 }
 
 /** 重置按钮操作 */
-function resetQuery () {
+function resetQuery() {
   proxy.resetForm('queryRef')
   handleQuery()
 }
@@ -294,8 +244,8 @@ const handleCurrentChange = (val) => {
 }
 
 // 多选框选中数据
-function handleSelectionChange (selection) {
-  ids.value = selection.map(item => item.id)
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id)
   single.value = selection.length !== 1
   multiple.value = !selection.length
 }
@@ -308,17 +258,17 @@ const handleView = (row) => {
 }
 
 /** 新增按钮操作 */
-function handleAdd () {
+function handleAdd() {
   reset()
   open.value = true
   title.value = '添加信用卡信息'
 }
 
 /** 修改按钮操作 */
-function handleUpdate (row) {
+function handleUpdate(row) {
   reset()
   const _id = row.id || ids.value
-  getBankcardLend(_id).then(response => {
+  getBankcardLend(_id).then((response) => {
     form.value = response.data
     open.value = true
     title.value = '修改信用卡信息'
@@ -326,17 +276,17 @@ function handleUpdate (row) {
 }
 
 /** 提交按钮 */
-function submitForm () {
-  proxy.$refs.bankcardRef.validate(valid => {
+function submitForm() {
+  proxy.$refs.bankcardRef.validate((valid) => {
     if (valid) {
       if (form.value.id != null) {
-        updateBankcardLend(form.value).then(response => {
+        updateBankcardLend(form.value).then((response) => {
           proxy.$modal.msgSuccess('修改成功')
           open.value = false
           getList()
         })
       } else {
-        addBankcardLend(form.value).then(response => {
+        addBankcardLend(form.value).then((response) => {
           proxy.$modal.msgSuccess('新增成功')
           open.value = false
           getList()
@@ -347,21 +297,29 @@ function submitForm () {
 }
 
 /** 删除按钮操作 */
-function handleDelete (row) {
+function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除选中的数据项？').then(function() {
-    return delBankcardLend(_ids)
-  }).then(() => {
-    getList()
-    proxy.$modal.msgSuccess('删除成功')
-  }).catch(() => {})
+  proxy.$modal
+    .confirm('是否确认删除选中的数据项？')
+    .then(function () {
+      return delBankcardLend(_ids)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('删除成功')
+    })
+    .catch(() => {})
 }
 
 /** 导出按钮操作 */
-function handleExport () {
-  proxy.download('invest/bankcard/export', {
-    ...queryParams.value
-  }, `bankcard_${new Date().getTime()}.xlsx`)
+function handleExport() {
+  proxy.download(
+    'invest/bankcard/export',
+    {
+      ...queryParams.value
+    },
+    `bankcard_${new Date().getTime()}.xlsx`
+  )
 }
 
 getList()
diff --git a/src/views/invest/debitInfors/index.vue b/src/views/invest/debitInfors/index.vue
index 3162ce7..ebf6fa3 100644
--- a/src/views/invest/debitInfors/index.vue
+++ b/src/views/invest/debitInfors/index.vue
@@ -3,32 +3,17 @@
     <div class="search-con">
       <div class="title">查询条件</div>
       <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
-                    <el-form-item label="名称" prop="name">
-                      <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-option
-                            v-for="dict in debit_infors_type"
-                            :key="dict.value"
-                            :label="dict.label"
-                            :value="dict.value"
-                        />
-                      </el-select>
-                    </el-form-item>
-                    <el-form-item label="放贷机构" prop="lenders">
-                      <el-input
-                          v-model="queryParams.lenders"
-                          placeholder="请输入放贷机构"
-                          clearable
-                          @keyup.enter="handleQuery"
-                      />
-                    </el-form-item>
+        <el-form-item label="名称" prop="name">
+          <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-option v-for="dict in debit_infors_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="放贷机构" prop="lenders">
+          <el-input v-model="queryParams.lenders" placeholder="请输入放贷机构" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
       </el-form>
       <div class="search-btn-con">
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -39,117 +24,97 @@
       <div class="title-con">
         <div class="title">基本信息</div>
         <div class="operate-btn-con">
-          <el-button
-              @click="handleAdd"
-              icon="Plus"
-              v-hasPermi="['invest:debitInfors:add']"
-          >新增</el-button>
-          <el-button
-              :disabled="multiple"
-              icon="Delete"
-              @click="handleDelete"
-              v-hasPermi="['invest:debitInfors:remove']"
-          >删除</el-button>
-          <el-button
-              @click="handleExport"
-              icon="Download"
-              v-hasPermi="['invest:debitInfors:export']"
-          >导出</el-button>
+          <el-button @click="handleAdd" icon="Plus" v-hasPermi="['invest:debitInfors:add']">新增</el-button>
+          <el-button :disabled="multiple" icon="Delete" @click="handleDelete" v-hasPermi="['invest:debitInfors:remove']">删除</el-button>
+          <el-button @click="handleExport" icon="Download" v-hasPermi="['invest:debitInfors:export']">导出</el-button>
         </div>
       </div>
       <div class="content-con" v-loading="loading">
-        <el-scrollbar>
-        <el-table v-loading="loading" :data="debitInforsList" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="debitInforsList" @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" width="100" prop="type">
-                    <template #default="scope">
-                          <dict-tag :options="debit_infors_type" :value="scope.row.type"/>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="放贷机构" align="center" prop="lenders" />
-                  <el-table-column label="贷款额度" align="center" width="120" prop="loanLimit" />
-                  <el-table-column label="贷款利率" align="center" width="120" prop="lendingRate" />
-                  <el-table-column label="贷款期限" align="center" width="120" prop="loanTerm" />
-                  <el-table-column label="还款方式" align="center" prop="repaymentMethod" />
+          <el-table-column label="名称" align="center" prop="name" />
+          <el-table-column label="类型" align="center" width="100" prop="type">
+            <template #default="scope">
+              <dict-tag :options="debit_infors_type" :value="scope.row.type" />
+            </template>
+          </el-table-column>
+          <el-table-column label="放贷机构" align="center" prop="lenders" />
+          <el-table-column label="贷款额度" align="center" width="120" prop="loanLimit" />
+          <el-table-column label="贷款利率" align="center" width="120" prop="lendingRate" />
+          <el-table-column label="贷款期限" align="center" width="120" prop="loanTerm" />
+          <el-table-column label="还款方式" align="center" prop="repaymentMethod" />
           <el-table-column label="操作" 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">
-                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id,scope.row)"></el-button>
+                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
                 </el-tooltip>
               </div>
             </template>
           </el-table-column>
         </el-table>
         <el-pagination small background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" />
-      </el-scrollbar>
       </div>
     </div>
     <!-- 添加或修改信贷产品管理对话框 -->
     <el-dialog :title="title" v-model="open" width="50%" append-to-body destroy-on-close>
-      <el-form ref="debitInforsRef" :model="form" :rules="rules"  :inline="true"  label-width="150px">
-                        <el-form-item label="名称" prop="name">
-                          <el-input v-model="form.name" placeholder="请输入名称" />
-                        </el-form-item>
-                        <el-form-item label="类型" prop="type">
-                          <el-select v-model="form.type" placeholder="请选择类型">
-                            <el-option
-                                v-for="dict in debit_infors_type"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"
-                            ></el-option>
-                          </el-select>
-                        </el-form-item>
-                        <el-form-item label="放贷机构" prop="lenders">
-                          <el-input v-model="form.lenders" placeholder="请输入放贷机构" />
-                        </el-form-item>
-                        <el-form-item label="贷款额度" prop="loanLimit">
-                          <el-input v-model="form.loanLimit" placeholder="请输入贷款额度" />
-                        </el-form-item>
-                        <el-form-item label="贷款利率" prop="lendingRate">
-                          <el-input v-model="form.lendingRate" placeholder="请输入贷款利率" />
-                        </el-form-item>
-                        <el-form-item label="贷款期限" prop="loanTerm">
-                          <el-input v-model="form.loanTerm" placeholder="请输入贷款期限" />
-                        </el-form-item>
-                        <el-form-item label="还款方式" prop="repaymentMethod">
-                          <el-input v-model="form.repaymentMethod" placeholder="请输入还款方式" />
-                        </el-form-item>
-                        <el-form-item label="申请方式" prop="applyMethod">
-                          <el-input v-model="form.applyMethod" placeholder="请输入申请方式" />
-                        </el-form-item>
-                        <el-form-item label="贷款用途" prop="loanPurpose">
-                          <el-input v-model="form.loanPurpose" placeholder="请输入贷款用途" />
-                        </el-form-item>
-                        <el-form-item label="查询次数" prop="creditQueryCount">
-                          <el-input v-model="form.creditQueryCount" placeholder="请输入查询次数" />
-                        </el-form-item>
-                        <el-form-item label="负债机构数" prop="debtCount">
-                          <el-input v-model="form.debtCount" placeholder="请输入负债机构数" />
-                        </el-form-item>
-                        <el-form-item label="信用卡张数" prop="creditCardCount">
-                          <el-input v-model="form.creditCardCount" placeholder="请输入信用卡张数" />
-                        </el-form-item>
-                        <el-form-item label="信用卡使用率" prop="creditCardUsageRate">
-                          <el-input v-model="form.creditCardUsageRate" placeholder="请输入信用卡使用率" />
-                        </el-form-item>
-                        <el-form-item label="贷款余额" prop="loanBalance">
-                          <el-input v-model="form.loanBalance" placeholder="请输入贷款余额" />
-                        </el-form-item>
-                        <el-form-item label="适用客群" style="width: 850px;" prop="applicableCustomerGroups">
-                          <el-input v-model="form.applicableCustomerGroups" rows='3' type="textarea" placeholder="请输入适用客群" />
-                        </el-form-item>
-                        <el-form-item label="征信条件" style="width: 850px;" prop="creditConditions">
-                          <el-input v-model="form.creditConditions" rows='3'  type="textarea" placeholder="请输入征信条件" />
-                        </el-form-item>
-                        <el-form-item label="所需材料" style="width: 850px;" prop="requiredMaterials">
-                          <el-input v-model="form.requiredMaterials" rows='2'  type="textarea" placeholder="请输入所需材料" />
-                        </el-form-item>
-                        <el-form-item label="负债要求" style="width: 850px;" prop="debtRequirements">
-                          <el-input v-model="form.debtRequirements" rows='2'  type="textarea" placeholder="请输入负债要求" />
-                        </el-form-item>
+      <el-form ref="debitInforsRef" :model="form" :rules="rules" :inline="true" label-width="150px">
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入名称" />
+        </el-form-item>
+        <el-form-item label="类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择类型">
+            <el-option v-for="dict in debit_infors_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="放贷机构" prop="lenders">
+          <el-input v-model="form.lenders" placeholder="请输入放贷机构" />
+        </el-form-item>
+        <el-form-item label="贷款额度" prop="loanLimit">
+          <el-input v-model="form.loanLimit" placeholder="请输入贷款额度" />
+        </el-form-item>
+        <el-form-item label="贷款利率" prop="lendingRate">
+          <el-input v-model="form.lendingRate" placeholder="请输入贷款利率" />
+        </el-form-item>
+        <el-form-item label="贷款期限" prop="loanTerm">
+          <el-input v-model="form.loanTerm" placeholder="请输入贷款期限" />
+        </el-form-item>
+        <el-form-item label="还款方式" prop="repaymentMethod">
+          <el-input v-model="form.repaymentMethod" placeholder="请输入还款方式" />
+        </el-form-item>
+        <el-form-item label="申请方式" prop="applyMethod">
+          <el-input v-model="form.applyMethod" placeholder="请输入申请方式" />
+        </el-form-item>
+        <el-form-item label="贷款用途" prop="loanPurpose">
+          <el-input v-model="form.loanPurpose" placeholder="请输入贷款用途" />
+        </el-form-item>
+        <el-form-item label="查询次数" prop="creditQueryCount">
+          <el-input v-model="form.creditQueryCount" placeholder="请输入查询次数" />
+        </el-form-item>
+        <el-form-item label="负债机构数" prop="debtCount">
+          <el-input v-model="form.debtCount" placeholder="请输入负债机构数" />
+        </el-form-item>
+        <el-form-item label="信用卡张数" prop="creditCardCount">
+          <el-input v-model="form.creditCardCount" placeholder="请输入信用卡张数" />
+        </el-form-item>
+        <el-form-item label="信用卡使用率" prop="creditCardUsageRate">
+          <el-input v-model="form.creditCardUsageRate" placeholder="请输入信用卡使用率" />
+        </el-form-item>
+        <el-form-item label="贷款余额" prop="loanBalance">
+          <el-input v-model="form.loanBalance" placeholder="请输入贷款余额" />
+        </el-form-item>
+        <el-form-item label="适用客群" style="width: 850px" prop="applicableCustomerGroups">
+          <el-input v-model="form.applicableCustomerGroups" rows="3" type="textarea" placeholder="请输入适用客群" />
+        </el-form-item>
+        <el-form-item label="征信条件" style="width: 850px" prop="creditConditions">
+          <el-input v-model="form.creditConditions" rows="3" type="textarea" placeholder="请输入征信条件" />
+        </el-form-item>
+        <el-form-item label="所需材料" style="width: 850px" prop="requiredMaterials">
+          <el-input v-model="form.requiredMaterials" rows="2" type="textarea" placeholder="请输入所需材料" />
+        </el-form-item>
+        <el-form-item label="负债要求" style="width: 850px" prop="debtRequirements">
+          <el-input v-model="form.debtRequirements" rows="2" type="textarea" placeholder="请输入负债要求" />
+        </el-form-item>
       </el-form>
       <template v-if="title !== '查看信贷产品管理'" #footer>
         <div class="dialog-footer">
@@ -192,30 +157,14 @@ const data = reactive({
     lenders: null
   },
   rules: {
-    name: [
-      { required: true, message: '名称不能为空', trigger: 'blur' }
-    ],
-    lenders: [
-      { required: true, message: '放贷机构不能为空', trigger: 'blur' }
-    ],
-    type: [
-      { required: true, message: '类型不能为空', trigger: 'blur' }
-    ],
-    loanLimit: [
-      { required: true, message: '贷款额度不能为空', trigger: 'blur' }
-    ],
-    lendingRate: [
-      { required: true, message: '贷款利率不能为空', trigger: 'blur' }
-    ],
-    loanTerm: [
-      { required: true, message: '贷款期限不能为空', trigger: 'blur' }
-    ],
-    repaymentMethod: [
-      { required: true, message: '还款方式不能为空', trigger: 'blur' }
-    ],
-    applyMethod: [
-      { required: true, message: '申请方式不能为空', trigger: 'blur' }
-    ]
+    name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+    lenders: [{ required: true, message: '放贷机构不能为空', trigger: 'blur' }],
+    type: [{ required: true, message: '类型不能为空', trigger: 'blur' }],
+    loanLimit: [{ required: true, message: '贷款额度不能为空', trigger: 'blur' }],
+    lendingRate: [{ required: true, message: '贷款利率不能为空', trigger: 'blur' }],
+    loanTerm: [{ required: true, message: '贷款期限不能为空', trigger: 'blur' }],
+    repaymentMethod: [{ required: true, message: '还款方式不能为空', trigger: 'blur' }],
+    applyMethod: [{ required: true, message: '申请方式不能为空', trigger: 'blur' }]
   }
 })
 
@@ -238,9 +187,9 @@ const handleOperate = (operate, row) => {
 const { queryParams, form, rules } = toRefs(data)
 
 /** 查询信贷产品管理列表 */
-function getList () {
+function getList() {
   loading.value = true
-  listDebitInfors(queryParams.value).then(response => {
+  listDebitInfors(queryParams.value).then((response) => {
     debitInforsList.value = response.rows
     total.value = response.total
     loading.value = false
@@ -254,7 +203,7 @@ function cancel() {
 }
 
 // 表单重置
-function reset () {
+function reset() {
   form.value = {
     id: null,
     name: null,
@@ -286,13 +235,13 @@ function reset () {
 }
 
 /** 搜索按钮操作 */
-function handleQuery () {
+function handleQuery() {
   queryParams.value.pageNum = 1
   getList()
 }
 
 /** 重置按钮操作 */
-function resetQuery () {
+function resetQuery() {
   proxy.resetForm('queryRef')
   handleQuery()
 }
@@ -304,8 +253,8 @@ const handleCurrentChange = (val) => {
 }
 
 // 多选框选中数据
-function handleSelectionChange (selection) {
-  ids.value = selection.map(item => item.id)
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id)
   single.value = selection.length !== 1
   multiple.value = !selection.length
 }
@@ -318,17 +267,17 @@ const handleView = (row) => {
 }
 
 /** 新增按钮操作 */
-function handleAdd () {
+function handleAdd() {
   reset()
   open.value = true
   title.value = '添加信贷产品管理'
 }
 
 /** 修改按钮操作 */
-function handleUpdate (row) {
+function handleUpdate(row) {
   reset()
   const _id = row.id || ids.value
-  getDebitInfors(_id).then(response => {
+  getDebitInfors(_id).then((response) => {
     form.value = response.data
     open.value = true
     title.value = '修改信贷产品管理'
@@ -336,17 +285,17 @@ function handleUpdate (row) {
 }
 
 /** 提交按钮 */
-function submitForm () {
-  proxy.$refs.debitInforsRef.validate(valid => {
+function submitForm() {
+  proxy.$refs.debitInforsRef.validate((valid) => {
     if (valid) {
       if (form.value.id != null) {
-        updateDebitInfors(form.value).then(response => {
+        updateDebitInfors(form.value).then((response) => {
           proxy.$modal.msgSuccess('修改成功')
           open.value = false
           getList()
         })
       } else {
-        addDebitInfors(form.value).then(response => {
+        addDebitInfors(form.value).then((response) => {
           proxy.$modal.msgSuccess('新增成功')
           open.value = false
           getList()
@@ -357,21 +306,29 @@ function submitForm () {
 }
 
 /** 删除按钮操作 */
-function handleDelete (row) {
+function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除选中的数据项？').then(function() {
-    return delDebitInfors(_ids)
-  }).then(() => {
-    getList()
-    proxy.$modal.msgSuccess('删除成功')
-  }).catch(() => {})
+  proxy.$modal
+    .confirm('是否确认删除选中的数据项？')
+    .then(function () {
+      return delDebitInfors(_ids)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('删除成功')
+    })
+    .catch(() => {})
 }
 
 /** 导出按钮操作 */
-function handleExport () {
-  proxy.download('invest/debitInfors/export', {
-    ...queryParams.value
-  }, `debitInfors_${new Date().getTime()}.xlsx`)
+function handleExport() {
+  proxy.download(
+    'invest/debitInfors/export',
+    {
+      ...queryParams.value
+    },
+    `debitInfors_${new Date().getTime()}.xlsx`
+  )
 }
 
 getList()
diff --git a/src/views/invest/debitTransferRecord/index.vue b/src/views/invest/debitTransferRecord/index.vue
index b5894a2..8ee2518 100644
--- a/src/views/invest/debitTransferRecord/index.vue
+++ b/src/views/invest/debitTransferRecord/index.vue
@@ -3,16 +3,16 @@
     <div class="search-con">
       <div class="title">查询条件</div>
       <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="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCode" :value="debitCard.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="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCode" :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-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="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCode" :value="debitCard.id" />
+          </el-select>
+        </el-form-item>
       </el-form>
       <div class="search-btn-con">
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -23,37 +23,29 @@
       <div class="title-con">
         <div class="title">基本信息</div>
         <div class="operate-btn-con">
-          <el-button
-              @click="handleAdd"
-              icon="Plus"
-              v-hasPermi="['invest:accountsTransferRecord:add']"
-          >新增</el-button>
+          <el-button @click="handleAdd" icon="Plus" v-hasPermi="['invest:accountsTransferRecord:add']">新增</el-button>
           <!-- <el-button
               :disabled="multiple"
               icon="Delete"
               @click="handleDelete"
               v-hasPermi="['invest:accountsTransferRecord:remove']"
           >删除</el-button> -->
-          <el-button
-              @click="handleExport"
-              icon="Download"
-              v-hasPermi="['invest:accountsTransferRecord:export']"
-          >导出</el-button>
+          <el-button @click="handleExport" icon="Download" v-hasPermi="['invest:accountsTransferRecord:export']">导出</el-button>
         </div>
       </div>
       <div class="content-con" v-loading="loading">
-        <el-table v-loading="loading" :data="accountsTransferRecordList" @selection-change="handleSelectionChange">
+        <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="转账时间" width='180'  align="center" prop="createTime" />
-                  <el-table-column label="转账金额" width='150'  align="center" prop="amount" />
+          <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">
             <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">
-                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id,scope.row)"></el-button>
+                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
                 </el-tooltip>
               </div>
             </template>
@@ -65,30 +57,25 @@
     <!-- 添加或修改储蓄卡转账对话框 -->
     <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-option v-for="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCode" :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-select>
-                        </el-form-item>
-                        <el-form-item label="转账时间" prop="createTime">
-                          <el-date-picker clearable
-                                          v-model="form.createTime"
-                                          type="datetime"
-                                          value-format="YYYY-MM-DD HH:mm:ss"
-                                          placeholder="请选择转账时间">
-                          </el-date-picker>
-                        </el-form-item>
-                        <el-form-item label="转账金额" prop="amount">
-                          <el-input v-model="form.amount" placeholder="请输入转账金额" />
-                        </el-form-item>
-                        <el-form-item label="备注" prop="remark">
-                          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-                        </el-form-item>
+        <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-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-select>
+        </el-form-item>
+        <el-form-item label="转账时间" prop="createTime">
+          <el-date-picker clearable v-model="form.createTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择转账时间"> </el-date-picker>
+        </el-form-item>
+        <el-form-item label="转账金额" prop="amount">
+          <el-input v-model="form.amount" placeholder="请输入转账金额" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
       </el-form>
       <template v-if="title !== '查看储蓄卡转账'" #footer>
         <div class="dialog-footer">
@@ -101,7 +88,13 @@
 </template>
 
 <script setup name="AccountsTransferRecord">
-import { listAccountsTransferRecord, getAccountsTransferRecord, delAccountsTransferRecord, addAccountsTransferRecord, updateAccountsTransferRecord } from '@/api/invest/accountsTransferRecord'
+import {
+  listAccountsTransferRecord,
+  getAccountsTransferRecord,
+  delAccountsTransferRecord,
+  addAccountsTransferRecord,
+  updateAccountsTransferRecord
+} from '@/api/invest/accountsTransferRecord'
 import { listAccounts } from '@/api/invest/accounts'
 // eslint-disable-next-line no-unused-vars
 import { require } from '@/utils/require'
@@ -160,18 +153,10 @@ const data = reactive({
     pageSize: 1000
   },
   rules: {
-    inAccountId: [
-      { required: true, message: '转入账户不能为空', trigger: 'blur' }
-    ],
-    outAccountId: [
-      { required: true, message: '转出账户不能为空', trigger: 'blur' }
-    ],
-    amount: [
-      { required: true, message: '转账金额不能为空', trigger: 'blur' }
-    ],
-    createTime: [
-      { required: true, message: '转账时间不能为空', trigger: 'blur' }
-    ]
+    inAccountId: [{ required: true, message: '转入账户不能为空', trigger: 'blur' }],
+    outAccountId: [{ required: true, message: '转出账户不能为空', trigger: 'blur' }],
+    amount: [{ required: true, message: '转账金额不能为空', trigger: 'blur' }],
+    createTime: [{ required: true, message: '转账时间不能为空', trigger: 'blur' }]
   }
 })
 
@@ -215,9 +200,9 @@ function getFutruesStocksList() {
 }
 
 /** 查询储蓄卡转账列表 */
-function getList () {
+function getList() {
   loading.value = true
-  listAccountsTransferRecord(queryParams.value).then(response => {
+  listAccountsTransferRecord(queryParams.value).then((response) => {
     accountsTransferRecordList.value = response.rows
     total.value = response.total
     loading.value = false
@@ -231,7 +216,7 @@ function cancel() {
 }
 
 // 表单重置
-function reset () {
+function reset() {
   form.value = {
     id: null,
     name: null,
@@ -254,13 +239,13 @@ function reset () {
 }
 
 /** 搜索按钮操作 */
-function handleQuery () {
+function handleQuery() {
   queryParams.value.pageNum = 1
   getList()
 }
 
 /** 重置按钮操作 */
-function resetQuery () {
+function resetQuery() {
   proxy.resetForm('queryRef')
   handleQuery()
 }
@@ -272,8 +257,8 @@ const handleCurrentChange = (val) => {
 }
 
 // 多选框选中数据
-function handleSelectionChange (selection) {
-  ids.value = selection.map(item => item.id)
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id)
   single.value = selection.length !== 1
   multiple.value = !selection.length
 }
@@ -286,17 +271,17 @@ const handleView = (row) => {
 }
 
 /** 新增按钮操作 */
-function handleAdd () {
+function handleAdd() {
   reset()
   open.value = true
   title.value = '添加储蓄卡转账'
 }
 
 /** 修改按钮操作 */
-function handleUpdate (row) {
+function handleUpdate(row) {
   reset()
   const _id = row.id || ids.value
-  getAccountsTransferRecord(_id).then(response => {
+  getAccountsTransferRecord(_id).then((response) => {
     form.value = response.data
     open.value = true
     title.value = '修改储蓄卡转账'
@@ -304,21 +289,21 @@ function handleUpdate (row) {
 }
 
 /** 提交按钮 */
-function submitForm () {
-  proxy.$refs.accountsTransferRecordRef.validate(valid => {
+function submitForm() {
+  proxy.$refs.accountsTransferRecordRef.validate((valid) => {
     if (valid) {
       if (form.value.outAccountId === form.value.inAccountId) {
         proxy.$modal.msgError('转入转出账户不能是同一个账户。')
         return
       }
       if (form.value.id != null) {
-        updateAccountsTransferRecord(form.value).then(response => {
+        updateAccountsTransferRecord(form.value).then((response) => {
           proxy.$modal.msgSuccess('修改成功')
           open.value = false
           getList()
         })
       } else {
-        addAccountsTransferRecord(form.value).then(response => {
+        addAccountsTransferRecord(form.value).then((response) => {
           proxy.$modal.msgSuccess('新增成功')
           open.value = false
           getList()
@@ -329,21 +314,29 @@ function submitForm () {
 }
 
 /** 删除按钮操作 */
-function handleDelete (row) {
+function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除选中的数据项？').then(function() {
-    return delAccountsTransferRecord(_ids)
-  }).then(() => {
-    getList()
-    proxy.$modal.msgSuccess('删除成功')
-  }).catch(() => {})
+  proxy.$modal
+    .confirm('是否确认删除选中的数据项？')
+    .then(function () {
+      return delAccountsTransferRecord(_ids)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('删除成功')
+    })
+    .catch(() => {})
 }
 
 /** 导出按钮操作 */
-function handleExport () {
-  proxy.download('invest/accountsTransferRecord/export', {
-    ...queryParams.value
-  }, `accountsTransferRecord_${new Date().getTime()}.xlsx`)
+function handleExport() {
+  proxy.download(
+    'invest/accountsTransferRecord/export',
+    {
+      ...queryParams.value
+    },
+    `accountsTransferRecord_${new Date().getTime()}.xlsx`
+  )
 }
 getFutruesStocksList()
 getDebitList()
diff --git a/src/views/invest/debitcard/index.vue b/src/views/invest/debitcard/index.vue
index f3dc484..881977c 100644
--- a/src/views/invest/debitcard/index.vue
+++ b/src/views/invest/debitcard/index.vue
@@ -3,14 +3,9 @@
     <div class="search-con">
       <div class="title">查询条件</div>
       <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
-                    <el-form-item label="储蓄卡名称" prop="name">
-                      <el-input
-                          v-model="queryParams.name"
-                          placeholder="请输入储蓄卡名称"
-                          clearable
-                          @keyup.enter="handleQuery"
-                      />
-                    </el-form-item>
+        <el-form-item label="储蓄卡名称" prop="name">
+          <el-input v-model="queryParams.name" placeholder="请输入储蓄卡名称" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
       </el-form>
       <div class="search-btn-con">
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -21,46 +16,33 @@
       <div class="title-con">
         <div class="title">基本信息</div>
         <div class="operate-btn-con">
-          <el-button
-              @click="handleAdd"
-              icon="Plus"
-              v-hasPermi="['invest:bankcard:add']"
-          >新增</el-button>
-          <el-button
-              :disabled="multiple"
-              icon="Delete"
-              @click="handleDelete"
-              v-hasPermi="['invest:bankcard:remove']"
-          >删除</el-button>
-          <el-button
-              @click="handleExport"
-              icon="Download"
-              v-hasPermi="['invest:bankcard:export']"
-          >导出</el-button>
+          <el-button @click="handleAdd" icon="Plus" v-hasPermi="['invest:bankcard:add']">新增</el-button>
+          <el-button :disabled="multiple" icon="Delete" @click="handleDelete" v-hasPermi="['invest:bankcard:remove']">删除</el-button>
+          <el-button @click="handleExport" icon="Download" v-hasPermi="['invest:bankcard:export']">导出</el-button>
         </div>
       </div>
       <div class="content-con" v-loading="loading">
-        <el-table v-loading="loading" :data="bankcardList" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="bankcardList" @selection-change="handleSelectionChange" height="calc(100% - 0.62rem)">
           <el-table-column type="selection" width="55" align="center" />
-                  <el-table-column label="储蓄卡名称" align="center" width="180" prop="name" />
-                  <el-table-column label="储蓄卡卡号" align="center" prop="code" />
-                  <el-table-column label="开户行" align="center" prop="openingBank" />
-                  <el-table-column label="开户日期" align="center" prop="activationDate" width="150">
-                    <template #default="scope">
-                      <span>{{ parseTime(scope.row.activationDate, '{y}-{m}-{d}') }}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="储蓄卡类型" width="150" align="center" prop="debitType">
-                    <template #default="scope">
-                          <dict-tag :options="debit_type" :value="scope.row.debitType"/>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="备注" align="center" prop="remark" />
+          <el-table-column label="储蓄卡名称" align="center" width="180" prop="name" />
+          <el-table-column label="储蓄卡卡号" align="center" prop="code" />
+          <el-table-column label="开户行" align="center" prop="openingBank" />
+          <el-table-column label="开户日期" align="center" prop="activationDate" width="150">
+            <template #default="scope">
+              <span>{{ parseTime(scope.row.activationDate, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="储蓄卡类型" width="150" align="center" prop="debitType">
+            <template #default="scope">
+              <dict-tag :options="debit_type" :value="scope.row.debitType" />
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" align="center" prop="remark" />
           <el-table-column label="操作" 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">
-                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id,scope.row)"></el-button>
+                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
                 </el-tooltip>
               </div>
             </template>
@@ -72,44 +54,29 @@
     <!-- 添加或修改储蓄卡信息对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="bankcardRef" :model="form" :rules="rules" label-width="120px">
-                        <el-form-item label="储蓄卡名称" prop="name">
-                          <el-input v-model="form.name" placeholder="请输入储蓄卡名称" />
-                        </el-form-item>
-                        <el-form-item label="储蓄卡卡号" prop="code">
-                          <el-input v-model="form.code" placeholder="请输入储蓄卡卡号" />
-                        </el-form-item>
-                        <el-form-item label="开户行" prop="openingBank">
-                          <el-input v-model="form.openingBank" placeholder="请输入开户行" />
-                        </el-form-item>
-                        <el-form-item label="开户日期" prop="activationDate">
-                          <el-date-picker clearable
-                                          v-model="form.activationDate"
-                                          type="date"
-                                          value-format="YYYY-MM-DD"
-                                          placeholder="请选择开户日期">
-                          </el-date-picker>
-                        </el-form-item>
-                        <el-form-item label="有效期" prop="effectiveDate">
-                          <el-date-picker clearable
-                                          v-model="form.effectiveDate"
-                                          type="date"
-                                          value-format="YYYY-MM-DD"
-                                          placeholder="请选择有效期">
-                          </el-date-picker>
-                        </el-form-item>
-                        <el-form-item label="储蓄卡类型" prop="debitType">
-                          <el-select v-model="form.debitType" placeholder="请选择储蓄卡类型">
-                            <el-option
-                                v-for="dict in debit_type"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"
-                            ></el-option>
-                          </el-select>
-                        </el-form-item>
-                        <el-form-item label="备注" prop="remark">
-                          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-                        </el-form-item>
+        <el-form-item label="储蓄卡名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入储蓄卡名称" />
+        </el-form-item>
+        <el-form-item label="储蓄卡卡号" prop="code">
+          <el-input v-model="form.code" placeholder="请输入储蓄卡卡号" />
+        </el-form-item>
+        <el-form-item label="开户行" prop="openingBank">
+          <el-input v-model="form.openingBank" placeholder="请输入开户行" />
+        </el-form-item>
+        <el-form-item label="开户日期" prop="activationDate">
+          <el-date-picker clearable v-model="form.activationDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择开户日期"> </el-date-picker>
+        </el-form-item>
+        <el-form-item label="有效期" prop="effectiveDate">
+          <el-date-picker clearable v-model="form.effectiveDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择有效期"> </el-date-picker>
+        </el-form-item>
+        <el-form-item label="储蓄卡类型" prop="debitType">
+          <el-select v-model="form.debitType" placeholder="请选择储蓄卡类型">
+            <el-option v-for="dict in debit_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
       </el-form>
       <template v-if="title !== '查看储蓄卡信息'" #footer>
         <div class="dialog-footer">
@@ -151,12 +118,8 @@ const data = reactive({
     type: '1'
   },
   rules: {
-    name: [
-      { required: true, message: '储蓄卡名称不能为空', trigger: 'blur' }
-    ],
-    code: [
-      { required: true, message: '储蓄卡卡号不能为空', trigger: 'blur' }
-    ]
+    name: [{ required: true, message: '储蓄卡名称不能为空', trigger: 'blur' }],
+    code: [{ required: true, message: '储蓄卡卡号不能为空', trigger: 'blur' }]
   }
 })
 
@@ -179,9 +142,9 @@ const handleOperate = (operate, row) => {
 const { queryParams, form, rules } = toRefs(data)
 
 /** 查询储蓄卡信息列表 */
-function getList () {
+function getList() {
   loading.value = true
-  listBankcardLend(queryParams.value).then(response => {
+  listBankcardLend(queryParams.value).then((response) => {
     bankcardList.value = response.rows
     total.value = response.total
     loading.value = false
@@ -195,7 +158,7 @@ function cancel() {
 }
 
 // 表单重置
-function reset () {
+function reset() {
   form.value = {
     id: null,
     name: null,
@@ -221,13 +184,13 @@ function reset () {
 }
 
 /** 搜索按钮操作 */
-function handleQuery () {
+function handleQuery() {
   queryParams.value.pageNum = 1
   getList()
 }
 
 /** 重置按钮操作 */
-function resetQuery () {
+function resetQuery() {
   proxy.resetForm('queryRef')
   handleQuery()
 }
@@ -239,8 +202,8 @@ const handleCurrentChange = (val) => {
 }
 
 // 多选框选中数据
-function handleSelectionChange (selection) {
-  ids.value = selection.map(item => item.id)
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id)
   single.value = selection.length !== 1
   multiple.value = !selection.length
 }
@@ -253,17 +216,17 @@ const handleView = (row) => {
 }
 
 /** 新增按钮操作 */
-function handleAdd () {
+function handleAdd() {
   reset()
   open.value = true
   title.value = '添加储蓄卡信息'
 }
 
 /** 修改按钮操作 */
-function handleUpdate (row) {
+function handleUpdate(row) {
   reset()
   const _id = row.id || ids.value
-  getBankcardLend(_id).then(response => {
+  getBankcardLend(_id).then((response) => {
     form.value = response.data
     open.value = true
     title.value = '修改储蓄卡信息'
@@ -271,17 +234,17 @@ function handleUpdate (row) {
 }
 
 /** 提交按钮 */
-function submitForm () {
-  proxy.$refs.bankcardRef.validate(valid => {
+function submitForm() {
+  proxy.$refs.bankcardRef.validate((valid) => {
     if (valid) {
       if (form.value.id != null) {
-        updateBankcardLend(form.value).then(response => {
+        updateBankcardLend(form.value).then((response) => {
           proxy.$modal.msgSuccess('修改成功')
           open.value = false
           getList()
         })
       } else {
-        addBankcardLend(form.value).then(response => {
+        addBankcardLend(form.value).then((response) => {
           proxy.$modal.msgSuccess('新增成功')
           open.value = false
           getList()
@@ -292,21 +255,29 @@ function submitForm () {
 }
 
 /** 删除按钮操作 */
-function handleDelete (row) {
+function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除选中的数据项？').then(function() {
-    return delBankcardLend(_ids)
-  }).then(() => {
-    getList()
-    proxy.$modal.msgSuccess('删除成功')
-  }).catch(() => {})
+  proxy.$modal
+    .confirm('是否确认删除选中的数据项？')
+    .then(function () {
+      return delBankcardLend(_ids)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('删除成功')
+    })
+    .catch(() => {})
 }
 
 /** 导出按钮操作 */
-function handleExport () {
-  proxy.download('invest/bankcard/export', {
-    ...queryParams.value
-  }, `bankcard_${new Date().getTime()}.xlsx`)
+function handleExport() {
+  proxy.download(
+    'invest/bankcard/export',
+    {
+      ...queryParams.value
+    },
+    `bankcard_${new Date().getTime()}.xlsx`
+  )
 }
 
 getList()
diff --git a/src/views/invest/futures/index.vue b/src/views/invest/futures/index.vue
index 8abb81f..a9e75b1 100644
--- a/src/views/invest/futures/index.vue
+++ b/src/views/invest/futures/index.vue
@@ -3,14 +3,9 @@
     <div class="search-con">
       <div class="title">查询条件</div>
       <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
-                    <el-form-item label="名称" prop="name">
-                      <el-input
-                          v-model="queryParams.name"
-                          placeholder="请输入名称"
-                          clearable
-                          @keyup.enter="handleQuery"
-                      />
-                    </el-form-item>
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="queryParams.name" placeholder="请输入名称" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
       </el-form>
       <div class="search-btn-con">
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -21,44 +16,31 @@
       <div class="title-con">
         <div class="title">基本信息</div>
         <div class="operate-btn-con">
-          <el-button
-              @click="handleAdd"
-              icon="Plus"
-              v-hasPermi="['invest:futureStocks:add']"
-          >新增</el-button>
-          <el-button
-              :disabled="multiple"
-              icon="Delete"
-              @click="handleDelete"
-              v-hasPermi="['invest:futureStocks:remove']"
-          >删除</el-button>
-          <el-button
-              @click="handleExport"
-              icon="Download"
-              v-hasPermi="['invest:futureStocks:export']"
-          >导出</el-button>
+          <el-button @click="handleAdd" icon="Plus" v-hasPermi="['invest:futureStocks:add']">新增</el-button>
+          <el-button :disabled="multiple" icon="Delete" @click="handleDelete" v-hasPermi="['invest:futureStocks:remove']">删除</el-button>
+          <el-button @click="handleExport" icon="Download" v-hasPermi="['invest:futureStocks:export']">导出</el-button>
         </div>
       </div>
       <div class="content-con" v-loading="loading">
-        <el-table v-loading="loading" :data="futureStocksList" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="futureStocksList" @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="code" />
-                  <el-table-column label="期货交易中心账号" align="center" prop="tradingCenterCode" />
-                  <el-table-column label="手续费" align="center" prop="commission" />
-                  <el-table-column label="保证金" align="center" prop="bond" />
-                  <el-table-column label="关联储蓄卡" align="center" prop="bankNameCode" />
-                  <el-table-column label="开户日期" align="center" prop="activationDate" width="180">
-                    <template #default="scope">
-                      <span>{{ parseTime(scope.row.activationDate, '{y}-{m}-{d}') }}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="备注" align="center" prop="remark" />
+          <el-table-column label="名称" align="center" prop="name" />
+          <el-table-column label="账号" align="center" prop="code" />
+          <el-table-column label="期货交易中心账号" align="center" prop="tradingCenterCode" />
+          <el-table-column label="手续费" align="center" prop="commission" />
+          <el-table-column label="保证金" align="center" prop="bond" />
+          <el-table-column label="关联储蓄卡" align="center" prop="bankNameCode" />
+          <el-table-column label="开户日期" align="center" prop="activationDate" width="180">
+            <template #default="scope">
+              <span>{{ parseTime(scope.row.activationDate, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" align="center" prop="remark" />
           <el-table-column label="操作" 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">
-                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id,scope.row)"></el-button>
+                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
                 </el-tooltip>
               </div>
             </template>
@@ -70,46 +52,41 @@
     <!-- 添加或修改期货对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="futureStocksRef" :model="form" :rules="rules" label-width="140px">
-                        <el-form-item label="名称" prop="name">
-                          <el-input v-model="form.name" placeholder="请输入名称" />
-                        </el-form-item>
-                        <el-form-item label="账号" prop="code">
-                          <el-input v-model="form.code" placeholder="请输入账号" />
-                        </el-form-item>
-                        <el-form-item label="密码" prop="password">
-                          <el-input v-model="form.password" placeholder="请输入密码" />
-                        </el-form-item>
-                        <el-form-item label="期货交易中心账号" prop="tradingCenterCode">
-                          <el-input v-model="form.tradingCenterCode" placeholder="请输入期货交易中心账号" />
-                        </el-form-item>
-                        <el-form-item label="期货交易中心密码" prop="tradingCenterPassword">
-                          <el-input v-model="form.tradingCenterPassword" placeholder="请输入期货交易中心密码" />
-                        </el-form-item>
-                        <el-form-item label="关联储蓄卡" prop="debitCard">
-                          <el-select v-model="form.debitCard" placeholder="请选择关联储蓄卡" clearable>
-                          <el-option v-for="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCode" :value="debitCard.id" />
-                         </el-select>
-                        </el-form-item>
-                        <el-form-item label="资金密码" prop="fundPassword">
-                          <el-input v-model="form.fundPassword" placeholder="请输入资金密码" />
-                        </el-form-item>
-                        <el-form-item label="开户日期" prop="activationDate">
-                          <el-date-picker clearable
-                                          v-model="form.activationDate"
-                                          type="date"
-                                          value-format="YYYY-MM-DD"
-                                          placeholder="请选择开户日期">
-                          </el-date-picker>
-                        </el-form-item>
-                        <el-form-item label="手续费" prop="commission">
-                          <el-input v-model="form.commission" placeholder="请输入手续费" />
-                        </el-form-item>
-                        <el-form-item label="保证金" prop="bond">
-                          <el-input v-model="form.bond" placeholder="请输入保证金" />
-                        </el-form-item>
-                        <el-form-item label="备注" prop="remark">
-                          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-                        </el-form-item>
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入名称" />
+        </el-form-item>
+        <el-form-item label="账号" prop="code">
+          <el-input v-model="form.code" placeholder="请输入账号" />
+        </el-form-item>
+        <el-form-item label="密码" prop="password">
+          <el-input v-model="form.password" placeholder="请输入密码" />
+        </el-form-item>
+        <el-form-item label="期货交易中心账号" prop="tradingCenterCode">
+          <el-input v-model="form.tradingCenterCode" placeholder="请输入期货交易中心账号" />
+        </el-form-item>
+        <el-form-item label="期货交易中心密码" prop="tradingCenterPassword">
+          <el-input v-model="form.tradingCenterPassword" placeholder="请输入期货交易中心密码" />
+        </el-form-item>
+        <el-form-item label="关联储蓄卡" prop="debitCard">
+          <el-select v-model="form.debitCard" placeholder="请选择关联储蓄卡" clearable>
+            <el-option v-for="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCode" :value="debitCard.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="资金密码" prop="fundPassword">
+          <el-input v-model="form.fundPassword" placeholder="请输入资金密码" />
+        </el-form-item>
+        <el-form-item label="开户日期" prop="activationDate">
+          <el-date-picker clearable v-model="form.activationDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择开户日期"> </el-date-picker>
+        </el-form-item>
+        <el-form-item label="手续费" prop="commission">
+          <el-input v-model="form.commission" placeholder="请输入手续费" />
+        </el-form-item>
+        <el-form-item label="保证金" prop="bond">
+          <el-input v-model="form.bond" placeholder="请输入保证金" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
       </el-form>
       <template v-if="title !== '查看期货信息'" #footer>
         <div class="dialog-footer">
@@ -158,30 +135,16 @@ const data = reactive({
     pageSize: 1000
   },
   rules: {
-    name: [
-      { required: true, message: '名称不能为空', trigger: 'blur' }
-    ],
-    code: [
-      { required: true, message: '账号不能为空', trigger: 'blur' }
-    ],
-    password: [
-      { required: true, message: '密码不能为空', trigger: 'blur' }
-    ],
-    tradingCenterCode: [
-      { required: true, message: '期货交易中心账号不能为空', trigger: 'blur' }
-    ],
-    tradingCenterPassword: [
-      { required: true, message: '期货交易中心密码不能为空', trigger: 'blur' }
-    ],
-    fundPassword: [
-      { required: true, message: '资金密码不能为空', trigger: 'blur' }
-    ],
+    name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+    code: [{ required: true, message: '账号不能为空', trigger: 'blur' }],
+    password: [{ required: true, message: '密码不能为空', trigger: 'blur' }],
+    tradingCenterCode: [{ required: true, message: '期货交易中心账号不能为空', trigger: 'blur' }],
+    tradingCenterPassword: [{ required: true, message: '期货交易中心密码不能为空', trigger: 'blur' }],
+    fundPassword: [{ required: true, message: '资金密码不能为空', trigger: 'blur' }],
     // debitCard: [
     //   { required: true, message: '关联储蓄卡不能为空', trigger: 'blur' }
     // ],
-    activationDate: [
-      { required: true, message: '开户日期不能为空', trigger: 'blur' }
-    ]
+    activationDate: [{ required: true, message: '开户日期不能为空', trigger: 'blur' }]
   }
 })
 
@@ -211,9 +174,9 @@ function getDebitCardList() {
 }
 
 /** 查询期货信息列表 */
-function getList () {
+function getList() {
   loading.value = true
-  listFutureStocks(queryParams.value).then(response => {
+  listFutureStocks(queryParams.value).then((response) => {
     futureStocksList.value = response.rows
     total.value = response.total
     loading.value = false
@@ -227,7 +190,7 @@ function cancel() {
 }
 
 // 表单重置
-function reset () {
+function reset() {
   form.value = {
     id: null,
     name: null,
@@ -252,13 +215,13 @@ function reset () {
 }
 
 /** 搜索按钮操作 */
-function handleQuery () {
+function handleQuery() {
   queryParams.value.pageNum = 1
   getList()
 }
 
 /** 重置按钮操作 */
-function resetQuery () {
+function resetQuery() {
   proxy.resetForm('queryRef')
   handleQuery()
 }
@@ -270,8 +233,8 @@ const handleCurrentChange = (val) => {
 }
 
 // 多选框选中数据
-function handleSelectionChange (selection) {
-  ids.value = selection.map(item => item.id)
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id)
   single.value = selection.length !== 1
   multiple.value = !selection.length
 }
@@ -284,17 +247,17 @@ const handleView = (row) => {
 }
 
 /** 新增按钮操作 */
-function handleAdd () {
+function handleAdd() {
   reset()
   open.value = true
   title.value = '添加期货信息'
 }
 
 /** 修改按钮操作 */
-function handleUpdate (row) {
+function handleUpdate(row) {
   reset()
   const _id = row.id || ids.value
-  getFutureStocks(_id).then(response => {
+  getFutureStocks(_id).then((response) => {
     form.value = response.data
     open.value = true
     title.value = '修改期货信息'
@@ -302,17 +265,17 @@ function handleUpdate (row) {
 }
 
 /** 提交按钮 */
-function submitForm () {
-  proxy.$refs.futureStocksRef.validate(valid => {
+function submitForm() {
+  proxy.$refs.futureStocksRef.validate((valid) => {
     if (valid) {
       if (form.value.id != null) {
-        updateFutureStocks(form.value).then(response => {
+        updateFutureStocks(form.value).then((response) => {
           proxy.$modal.msgSuccess('修改成功')
           open.value = false
           getList()
         })
       } else {
-        addFutureStocks(form.value).then(response => {
+        addFutureStocks(form.value).then((response) => {
           proxy.$modal.msgSuccess('新增成功')
           open.value = false
           getList()
@@ -323,21 +286,29 @@ function submitForm () {
 }
 
 /** 删除按钮操作 */
-function handleDelete (row) {
+function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除选中的数据项？').then(function() {
-    return delFutureStocks(_ids)
-  }).then(() => {
-    getList()
-    proxy.$modal.msgSuccess('删除成功')
-  }).catch(() => {})
+  proxy.$modal
+    .confirm('是否确认删除选中的数据项？')
+    .then(function () {
+      return delFutureStocks(_ids)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('删除成功')
+    })
+    .catch(() => {})
 }
 
 /** 导出按钮操作 */
-function handleExport () {
-  proxy.download('invest/futureStocks/export', {
-    ...queryParams.value
-  }, `futureStocks_${new Date().getTime()}.xlsx`)
+function handleExport() {
+  proxy.download(
+    'invest/futureStocks/export',
+    {
+      ...queryParams.value
+    },
+    `futureStocks_${new Date().getTime()}.xlsx`
+  )
 }
 getDebitCardList()
 getList()
diff --git a/src/views/invest/futuresBill/index.vue b/src/views/invest/futuresBill/index.vue
index 05b839d..ddd388d 100644
--- a/src/views/invest/futuresBill/index.vue
+++ b/src/views/invest/futuresBill/index.vue
@@ -4,18 +4,13 @@
       <div class="title">查询条件</div>
       <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
         <el-form-item label="期货账户" prop="futureStocksId">
-                      <el-select v-model="queryParams.futureStocksId" placeholder="请选择期货账户" clearable>
-                          <el-option v-for="futureStocks in futureStocksList" :key="futureStocks.id" :label="futureStocks.nameCode" :value="futureStocks.id" />
-                         </el-select>
-                    </el-form-item>
-                    <el-form-item label="账单名称" prop="name">
-                      <el-input
-                          v-model="queryParams.name"
-                          placeholder="请输入账单名称"
-                          clearable
-                          @keyup.enter="handleQuery"
-                      />
-                    </el-form-item>
+          <el-select v-model="queryParams.futureStocksId" placeholder="请选择期货账户" clearable>
+            <el-option v-for="futureStocks in futureStocksList" :key="futureStocks.id" :label="futureStocks.nameCode" :value="futureStocks.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="账单名称" prop="name">
+          <el-input v-model="queryParams.name" placeholder="请输入账单名称" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
       </el-form>
       <div class="search-btn-con">
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -26,36 +21,23 @@
       <div class="title-con">
         <div class="title">基本信息</div>
         <div class="operate-btn-con">
-          <el-button
-              @click="handleAdd"
-              icon="Plus"
-              v-hasPermi="['invest:futureStocksBill:add']"
-          >新增</el-button>
-          <el-button
-              :disabled="multiple"
-              icon="Delete"
-              @click="handleDelete"
-              v-hasPermi="['invest:futureStocksBill:remove']"
-          >删除</el-button>
-          <el-button
-              @click="handleExport"
-              icon="Download"
-              v-hasPermi="['invest:futureStocksBill:export']"
-          >导出</el-button>
+          <el-button @click="handleAdd" icon="Plus" v-hasPermi="['invest:futureStocksBill:add']">新增</el-button>
+          <el-button :disabled="multiple" icon="Delete" @click="handleDelete" v-hasPermi="['invest:futureStocksBill:remove']">删除</el-button>
+          <el-button @click="handleExport" icon="Download" v-hasPermi="['invest:futureStocksBill:export']">导出</el-button>
         </div>
       </div>
       <div class="content-con" v-loading="loading">
-        <el-table v-loading="loading" :data="futureStocksBillList" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="futureStocksBillList" @selection-change="handleSelectionChange" height="calc(100% - 0.62rem)">
           <el-table-column type="selection" width="55" align="center" />
-                  <el-table-column label="期货账户" align="center" prop="futureStocksNameCode" />
-                  <el-table-column label="账单名称" align="center" prop="name" />
-                  <el-table-column label="账单周期" align="center" prop="billDatePeriod" />
-                  <el-table-column label="期货收益" align="center" prop="billAmount" />
+          <el-table-column label="期货账户" align="center" prop="futureStocksNameCode" />
+          <el-table-column label="账单名称" align="center" prop="name" />
+          <el-table-column label="账单周期" align="center" prop="billDatePeriod" />
+          <el-table-column label="期货收益" align="center" prop="billAmount" />
           <el-table-column label="操作" 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">
-                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id,scope.row)"></el-button>
+                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
                 </el-tooltip>
               </div>
             </template>
@@ -68,21 +50,16 @@
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="futureStocksBillRef" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="期货账户" prop="futureStocksId">
-                          <el-select v-model="form.futureStocksId" placeholder="请选择期货账户" clearable>
-                            <el-option v-for="futureStocks in futureStocksList" :key="futureStocks.id" :label="futureStocks.nameCode" :value="futureStocks.id" />
-                         </el-select>
-                        </el-form-item>
-                        <el-form-item label="账单日" prop="billDate">
-                          <el-date-picker clearable
-                                          v-model="form.billDate"
-                                          type="date"
-                                          value-format="YYYY-MM-DD"
-                                          placeholder="请选择账单日">
-                          </el-date-picker>
-                        </el-form-item>
-                        <el-form-item label="期货收益" prop="billAmount">
-                          <el-input v-model="form.billAmount" placeholder="请输入期货收益" />
-                        </el-form-item>
+          <el-select v-model="form.futureStocksId" placeholder="请选择期货账户" clearable>
+            <el-option v-for="futureStocks in futureStocksList" :key="futureStocks.id" :label="futureStocks.nameCode" :value="futureStocks.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="账单日" prop="billDate">
+          <el-date-picker clearable v-model="form.billDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择账单日"> </el-date-picker>
+        </el-form-item>
+        <el-form-item label="期货收益" prop="billAmount">
+          <el-input v-model="form.billAmount" placeholder="请输入期货收益" />
+        </el-form-item>
       </el-form>
       <template v-if="title !== '查看期货账单'" #footer>
         <div class="dialog-footer">
@@ -135,15 +112,9 @@ const data = reactive({
     pageSize: 1000
   },
   rules: {
-    billDate: [
-      { required: true, message: '账单日不能为空', trigger: 'blur' }
-    ],
-    futureStocksId: [
-      { required: true, message: '期货账户不能为空', trigger: 'blur' }
-    ],
-    billAmount: [
-      { required: true, message: '期货收益不能为空', trigger: 'blur' }
-    ]
+    billDate: [{ required: true, message: '账单日不能为空', trigger: 'blur' }],
+    futureStocksId: [{ required: true, message: '期货账户不能为空', trigger: 'blur' }],
+    billAmount: [{ required: true, message: '期货收益不能为空', trigger: 'blur' }]
   }
 })
 
@@ -173,9 +144,9 @@ function getFutureStocksList() {
 }
 
 /** 查询期货账单列表 */
-function getList () {
+function getList() {
   loading.value = true
-  listFutureStocksBill(queryParams.value).then(response => {
+  listFutureStocksBill(queryParams.value).then((response) => {
     futureStocksBillList.value = response.rows
     total.value = response.total
     loading.value = false
@@ -189,7 +160,7 @@ function cancel() {
 }
 
 // 表单重置
-function reset () {
+function reset() {
   form.value = {
     id: null,
     name: null,
@@ -210,13 +181,13 @@ function reset () {
 }
 
 /** 搜索按钮操作 */
-function handleQuery () {
+function handleQuery() {
   queryParams.value.pageNum = 1
   getList()
 }
 
 /** 重置按钮操作 */
-function resetQuery () {
+function resetQuery() {
   proxy.resetForm('queryRef')
   handleQuery()
 }
@@ -228,8 +199,8 @@ const handleCurrentChange = (val) => {
 }
 
 // 多选框选中数据
-function handleSelectionChange (selection) {
-  ids.value = selection.map(item => item.id)
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id)
   single.value = selection.length !== 1
   multiple.value = !selection.length
 }
@@ -242,17 +213,17 @@ const handleView = (row) => {
 }
 
 /** 新增按钮操作 */
-function handleAdd () {
+function handleAdd() {
   reset()
   open.value = true
   title.value = '添加期货账单'
 }
 
 /** 修改按钮操作 */
-function handleUpdate (row) {
+function handleUpdate(row) {
   reset()
   const _id = row.id || ids.value
-  getFutureStocksBill(_id).then(response => {
+  getFutureStocksBill(_id).then((response) => {
     form.value = response.data
     open.value = true
     title.value = '修改期货账单'
@@ -260,17 +231,17 @@ function handleUpdate (row) {
 }
 
 /** 提交按钮 */
-function submitForm () {
-  proxy.$refs.futureStocksBillRef.validate(valid => {
+function submitForm() {
+  proxy.$refs.futureStocksBillRef.validate((valid) => {
     if (valid) {
       if (form.value.id != null) {
-        updateFutureStocksBill(form.value).then(response => {
+        updateFutureStocksBill(form.value).then((response) => {
           proxy.$modal.msgSuccess('修改成功')
           open.value = false
           getList()
         })
       } else {
-        addFutureStocksBill(form.value).then(response => {
+        addFutureStocksBill(form.value).then((response) => {
           proxy.$modal.msgSuccess('新增成功')
           open.value = false
           getList()
@@ -281,21 +252,29 @@ function submitForm () {
 }
 
 /** 删除按钮操作 */
-function handleDelete (row) {
+function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除选中的数据项？').then(function() {
-    return delFutureStocksBill(_ids)
-  }).then(() => {
-    getList()
-    proxy.$modal.msgSuccess('删除成功')
-  }).catch(() => {})
+  proxy.$modal
+    .confirm('是否确认删除选中的数据项？')
+    .then(function () {
+      return delFutureStocksBill(_ids)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('删除成功')
+    })
+    .catch(() => {})
 }
 
 /** 导出按钮操作 */
-function handleExport () {
-  proxy.download('invest/futureStocksBill/export', {
-    ...queryParams.value
-  }, `futureStocksBill_${new Date().getTime()}.xlsx`)
+function handleExport() {
+  proxy.download(
+    'invest/futureStocksBill/export',
+    {
+      ...queryParams.value
+    },
+    `futureStocksBill_${new Date().getTime()}.xlsx`
+  )
 }
 getFutureStocksList()
 getList()
diff --git a/src/views/invest/heartJourney/index.vue b/src/views/invest/heartJourney/index.vue
index 364d3bc..48008a8 100644
--- a/src/views/invest/heartJourney/index.vue
+++ b/src/views/invest/heartJourney/index.vue
@@ -3,24 +3,14 @@
     <div class="search-con">
       <div class="title">查询条件</div>
       <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
-                    <el-form-item label="标题" prop="name">
-                      <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-option
-                            v-for="dict in journey_type"
-                            :key="dict.value"
-                            :label="dict.label"
-                            :value="dict.value"
-                        />
-                      </el-select>
-                    </el-form-item>
+        <el-form-item label="标题" prop="name">
+          <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-option v-for="dict in journey_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
       </el-form>
       <div class="search-btn-con">
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -31,77 +21,52 @@
       <div class="title-con">
         <div class="title">基本信息</div>
         <div class="operate-btn-con">
-          <el-button
-              @click="handleAdd"
-              icon="Plus"
-              v-hasPermi="['invest:heartJourney:add']"
-          >新增</el-button>
-          <el-button
-              :disabled="multiple"
-              icon="Delete"
-              @click="handleDelete"
-              v-hasPermi="['invest:heartJourney:remove']"
-          >删除</el-button>
-          <el-button
-              @click="handleExport"
-              icon="Download"
-              v-hasPermi="['invest:heartJourney:export']"
-          >导出</el-button>
+          <el-button @click="handleAdd" icon="Plus" v-hasPermi="['invest:heartJourney:add']">新增</el-button>
+          <el-button :disabled="multiple" icon="Delete" @click="handleDelete" v-hasPermi="['invest:heartJourney:remove']">删除</el-button>
+          <el-button @click="handleExport" icon="Download" v-hasPermi="['invest:heartJourney:export']">导出</el-button>
         </div>
       </div>
       <div class="content-con" v-loading="loading">
-        <el-scrollbar>
-        <el-table v-loading="loading" :data="heartJourneyList" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="heartJourneyList" @selection-change="handleSelectionChange" height="calc(100% - 0.62rem)">
           <el-table-column type="selection" width="55" align="center" />
-                  <el-table-column label="标题" align="center" width="200" prop="name" />
-                  <el-table-column label="类型" align="center" width="100" prop="type">
-                    <template #default="scope">
-                          <dict-tag :options="journey_type" :value="scope.row.type"/>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="记录时间" align="center" width="160" prop="createTime" />
-                  <el-table-column label="内容" align="center" prop="remark" />
+          <el-table-column label="标题" align="center" width="200" prop="name" />
+          <el-table-column label="类型" align="center" width="100" prop="type">
+            <template #default="scope">
+              <dict-tag :options="journey_type" :value="scope.row.type" />
+            </template>
+          </el-table-column>
+          <el-table-column label="记录时间" align="center" width="160" prop="createTime" />
+          <el-table-column label="内容" align="center" prop="remark" />
           <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">
-                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id,scope.row)"></el-button>
+                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
                 </el-tooltip>
               </div>
             </template>
           </el-table-column>
         </el-table>
         <el-pagination small background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" />
-      </el-scrollbar>
       </div>
     </div>
     <!-- 添加或修改心路历程对话框 -->
     <el-dialog :title="title" v-model="open" width="650px" append-to-body>
       <el-form ref="heartJourneyRef" :model="form" :rules="rules" label-width="80px">
-                        <el-form-item label="标题" prop="name">
-                          <el-input v-model="form.name" placeholder="请输入标题" />
-                        </el-form-item>
-                        <el-form-item label="类型" prop="type">
-                          <el-select v-model="form.type" placeholder="请选择类型">
-                            <el-option
-                                v-for="dict in journey_type"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"
-                            ></el-option>
-                          </el-select>
-                        </el-form-item>
-                        <el-form-item label="时间" prop="createTime">
-                          <el-date-picker clearable
-                                          v-model="form.createTime"
-                                          type="datetime"
-                                          value-format="YYYY-MM-DD HH:mm:ss"
-                                          placeholder="请选择时间">
-                          </el-date-picker>
-                        </el-form-item>
-                        <el-form-item label="内容">
-                          <el-input v-model="form.remark" type="textarea" rows="12" placeholder="请输入内容" />
-                        </el-form-item>
+        <el-form-item label="标题" prop="name">
+          <el-input v-model="form.name" placeholder="请输入标题" />
+        </el-form-item>
+        <el-form-item label="类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择类型">
+            <el-option v-for="dict in journey_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="时间" prop="createTime">
+          <el-date-picker clearable v-model="form.createTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择时间"> </el-date-picker>
+        </el-form-item>
+        <el-form-item label="内容">
+          <el-input v-model="form.remark" type="textarea" rows="12" placeholder="请输入内容" />
+        </el-form-item>
       </el-form>
       <template v-if="title !== '查看心路历程'" #footer>
         <div class="dialog-footer">
@@ -143,18 +108,10 @@ const data = reactive({
     type: null
   },
   rules: {
-    name: [
-      { required: true, message: '标题不能为空', trigger: 'blur' }
-    ],
-    type: [
-      { required: true, message: '类型不能为空', trigger: 'change' }
-    ],
-    createTime: [
-      { required: true, message: '创建时间不能为空', trigger: 'blur' }
-    ],
-    remark: [
-      { required: true, message: '内容不能为空', trigger: 'blur' }
-    ]
+    name: [{ required: true, message: '标题不能为空', trigger: 'blur' }],
+    type: [{ required: true, message: '类型不能为空', trigger: 'change' }],
+    createTime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
+    remark: [{ required: true, message: '内容不能为空', trigger: 'blur' }]
   }
 })
 
@@ -177,9 +134,9 @@ const handleOperate = (operate, row) => {
 const { queryParams, form, rules } = toRefs(data)
 
 /** 查询心路历程列表 */
-function getList () {
+function getList() {
   loading.value = true
-  listHeartJourney(queryParams.value).then(response => {
+  listHeartJourney(queryParams.value).then((response) => {
     heartJourneyList.value = response.rows
     total.value = response.total
     loading.value = false
@@ -193,7 +150,7 @@ function cancel() {
 }
 
 // 表单重置
-function reset () {
+function reset() {
   form.value = {
     id: null,
     name: null,
@@ -209,13 +166,13 @@ function reset () {
 }
 
 /** 搜索按钮操作 */
-function handleQuery () {
+function handleQuery() {
   queryParams.value.pageNum = 1
   getList()
 }
 
 /** 重置按钮操作 */
-function resetQuery () {
+function resetQuery() {
   proxy.resetForm('queryRef')
   handleQuery()
 }
@@ -227,8 +184,8 @@ const handleCurrentChange = (val) => {
 }
 
 // 多选框选中数据
-function handleSelectionChange (selection) {
-  ids.value = selection.map(item => item.id)
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id)
   single.value = selection.length !== 1
   multiple.value = !selection.length
 }
@@ -241,17 +198,17 @@ const handleView = (row) => {
 }
 
 /** 新增按钮操作 */
-function handleAdd () {
+function handleAdd() {
   reset()
   open.value = true
   title.value = '添加心路历程'
 }
 
 /** 修改按钮操作 */
-function handleUpdate (row) {
+function handleUpdate(row) {
   reset()
   const _id = row.id || ids.value
-  getHeartJourney(_id).then(response => {
+  getHeartJourney(_id).then((response) => {
     form.value = response.data
     open.value = true
     title.value = '修改心路历程'
@@ -259,17 +216,17 @@ function handleUpdate (row) {
 }
 
 /** 提交按钮 */
-function submitForm () {
-  proxy.$refs.heartJourneyRef.validate(valid => {
+function submitForm() {
+  proxy.$refs.heartJourneyRef.validate((valid) => {
     if (valid) {
       if (form.value.id != null) {
-        updateHeartJourney(form.value).then(response => {
+        updateHeartJourney(form.value).then((response) => {
           proxy.$modal.msgSuccess('修改成功')
           open.value = false
           getList()
         })
       } else {
-        addHeartJourney(form.value).then(response => {
+        addHeartJourney(form.value).then((response) => {
           proxy.$modal.msgSuccess('新增成功')
           open.value = false
           getList()
@@ -280,21 +237,29 @@ function submitForm () {
 }
 
 /** 删除按钮操作 */
-function handleDelete (row) {
+function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除选中的数据项？').then(function() {
-    return delHeartJourney(_ids)
-  }).then(() => {
-    getList()
-    proxy.$modal.msgSuccess('删除成功')
-  }).catch(() => {})
+  proxy.$modal
+    .confirm('是否确认删除选中的数据项？')
+    .then(function () {
+      return delHeartJourney(_ids)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('删除成功')
+    })
+    .catch(() => {})
 }
 
 /** 导出按钮操作 */
-function handleExport () {
-  proxy.download('invest/heartJourney/export', {
-    ...queryParams.value
-  }, `heartJourney_${new Date().getTime()}.xlsx`)
+function handleExport() {
+  proxy.download(
+    'invest/heartJourney/export',
+    {
+      ...queryParams.value
+    },
+    `heartJourney_${new Date().getTime()}.xlsx`
+  )
 }
 
 getList()
diff --git a/src/views/invest/investAccountDeal/index.vue b/src/views/invest/investAccountDeal/index.vue
index 2c59d7a..4d71cab 100644
--- a/src/views/invest/investAccountDeal/index.vue
+++ b/src/views/invest/investAccountDeal/index.vue
@@ -29,30 +29,28 @@
         </div>
       </div>
       <div class="content-con" v-loading="loading">
-        <el-scrollbar>
-          <el-table v-loading="loading" :data="accountDealRecordList" @selection-change="handleSelectionChange">
-            <el-table-column label="账户名称" align="center" prop="accountName" />
-            <el-table-column label="交易时间" align="center" 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">
-              <template #default="scope">
-                <dict-tag :options="profit_loss" :value="scope.row.dealType" />
-              </template>
-            </el-table-column>
-            <el-table-column label="备注" align="center" width="350" prop="remark" />
-            <el-table-column label="操作" 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">
-                    <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
-                  </el-tooltip>
-                </div>
-              </template>
-            </el-table-column>
-          </el-table>
-          <el-pagination small background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" />
-        </el-scrollbar>
+        <el-table v-loading="loading" :data="accountDealRecordList" @selection-change="handleSelectionChange" height="calc(100% - 0.62rem)">
+          <el-table-column label="账户名称" align="center" prop="accountName" />
+          <el-table-column label="交易时间" align="center" 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">
+            <template #default="scope">
+              <dict-tag :options="profit_loss" :value="scope.row.dealType" />
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" align="center" prop="remark" />
+          <el-table-column label="操作" 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">
+                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination small background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" />
       </div>
     </div>
     <!-- 添加或修改投资交易记录对话框 -->
diff --git a/src/views/invest/investTransferRecord/index.vue b/src/views/invest/investTransferRecord/index.vue
index a08109c..3596ffd 100644
--- a/src/views/invest/investTransferRecord/index.vue
+++ b/src/views/invest/investTransferRecord/index.vue
@@ -3,16 +3,16 @@
     <div class="search-con">
       <div class="title">查询条件</div>
       <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="futruesStocks in futruesStocksList" :key="futruesStocks.id" :label="futruesStocks.nameDebitNameCode" :value="futruesStocks.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="futruesStocks in futruesStocksList" :key="futruesStocks.id" :label="futruesStocks.nameDebitNameCode" :value="futruesStocks.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="futruesStocks in futruesStocksList" :key="futruesStocks.id" :label="futruesStocks.nameDebitNameCode" :value="futruesStocks.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="futruesStocks in futruesStocksList" :key="futruesStocks.id" :label="futruesStocks.nameDebitNameCode" :value="futruesStocks.id" />
+          </el-select>
+        </el-form-item>
       </el-form>
       <div class="search-btn-con">
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -23,37 +23,29 @@
       <div class="title-con">
         <div class="title">基本信息</div>
         <div class="operate-btn-con">
-          <el-button
-              @click="handleAdd"
-              icon="Plus"
-              v-hasPermi="['invest:accountsTransferRecord:add']"
-          >新增</el-button>
+          <el-button @click="handleAdd" icon="Plus" v-hasPermi="['invest:accountsTransferRecord:add']">新增</el-button>
           <!-- <el-button
               :disabled="multiple"
               icon="Delete"
               @click="handleDelete"
               v-hasPermi="['invest:accountsTransferRecord:remove']"
           >删除</el-button> -->
-          <el-button
-              @click="handleExport"
-              icon="Download"
-              v-hasPermi="['invest:accountsTransferRecord:export']"
-          >导出</el-button>
+          <el-button @click="handleExport" icon="Download" v-hasPermi="['invest:accountsTransferRecord:export']">导出</el-button>
         </div>
       </div>
       <div class="content-con" v-loading="loading">
-        <el-table v-loading="loading" :data="accountsTransferRecordList" @selection-change="handleSelectionChange">
+        <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="转账时间" width='180' align="center" prop="createTime" />
-                  <el-table-column label="转账金额" width='150' align="center" prop="amount" />
+          <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">
             <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">
-                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id,scope.row)"></el-button>
+                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
                 </el-tooltip>
               </div>
             </template>
@@ -65,35 +57,25 @@
     <!-- 添加或修改投资账户记账对话框 -->
     <el-dialog :title="title" v-model="open" width="550px" append-to-body>
       <el-form ref="accountsTransferRecordRef" :model="form" :rules="rules" label-width="100px">
-                        <el-form-item label="投资账户" prop="inAccountId">
-                          <el-select v-model="form.inAccountId" placeholder="请选择投资账户" clearable>
-                            <el-option v-for="futruesStocks in futruesStocksList" :key="futruesStocks.id" :label="futruesStocks.nameDebitNameCode" :value="futruesStocks.id" />
-                         </el-select>
-                        </el-form-item>
-                        <el-form-item label="交易类型" prop="dealType">
-                          <el-select v-model="form.dealType" placeholder="请选择交易类型">
-                            <el-option
-                                v-for="dict in in_out"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"
-                            ></el-option>
-                          </el-select>
-                        </el-form-item>
-                        <el-form-item label="转账时间" prop="createTime">
-                          <el-date-picker clearable
-                                          v-model="form.createTime"
-                                          type="datetime"
-                                          value-format="YYYY-MM-DD HH:mm:ss"
-                                          placeholder="请选择转账时间">
-                          </el-date-picker>
-                        </el-form-item>
-                        <el-form-item label="转账金额" prop="amount">
-                          <el-input v-model="form.amount" placeholder="请输入转账金额" />
-                        </el-form-item>
-                        <el-form-item label="备注" prop="remark">
-                          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-                        </el-form-item>
+        <el-form-item label="投资账户" prop="inAccountId">
+          <el-select v-model="form.inAccountId" placeholder="请选择投资账户" clearable>
+            <el-option v-for="futruesStocks in futruesStocksList" :key="futruesStocks.id" :label="futruesStocks.nameDebitNameCode" :value="futruesStocks.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="交易类型" prop="dealType">
+          <el-select v-model="form.dealType" placeholder="请选择交易类型">
+            <el-option v-for="dict in in_out" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="转账时间" prop="createTime">
+          <el-date-picker clearable v-model="form.createTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择转账时间"> </el-date-picker>
+        </el-form-item>
+        <el-form-item label="转账金额" prop="amount">
+          <el-input v-model="form.amount" placeholder="请输入转账金额" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
       </el-form>
       <template v-if="title !== '查看投资账户记账'" #footer>
         <div class="dialog-footer">
@@ -106,14 +88,20 @@
 </template>
 
 <script setup name="AccountsTransferRecord">
-import { listAccountsTransferRecord, getAccountsTransferRecord, delAccountsTransferRecord, addAccountsTransferRecord, updateAccountsTransferRecord } from '@/api/invest/accountsTransferRecord'
+import {
+  listAccountsTransferRecord,
+  getAccountsTransferRecord,
+  delAccountsTransferRecord,
+  addAccountsTransferRecord,
+  updateAccountsTransferRecord
+} from '@/api/invest/accountsTransferRecord'
 import { listAccounts } from '@/api/invest/accounts'
 import { listFutureStocks } from '@/api/invest/futureStocks'
 
 // eslint-disable-next-line no-unused-vars
 import { require } from '@/utils/require'
 const { proxy } = getCurrentInstance()
-const { transfer_type, deal_type, in_out } = proxy.useDict('transfer_type', 'deal_type','in_out')
+const { transfer_type, deal_type, in_out } = proxy.useDict('transfer_type', 'deal_type', 'in_out')
 
 const accountsTransferRecordList = ref([])
 const open = ref(false)
@@ -165,18 +153,10 @@ const data = reactive({
     pageSize: 1000
   },
   rules: {
-    inAccountId: [
-      { required: true, message: '投资账户不能为空', trigger: 'blur' }
-    ],
-    dealType: [
-      { required: true, message: '交易类型不能为空', trigger: 'blur' }
-    ],
-    amount: [
-      { required: true, message: '转账金额不能为空', trigger: 'blur' }
-    ],
-    createTime: [
-      { required: true, message: '转账时间不能为空', trigger: 'blur' }
-    ]
+    inAccountId: [{ required: true, message: '投资账户不能为空', trigger: 'blur' }],
+    dealType: [{ required: true, message: '交易类型不能为空', trigger: 'blur' }],
+    amount: [{ required: true, message: '转账金额不能为空', trigger: 'blur' }],
+    createTime: [{ required: true, message: '转账时间不能为空', trigger: 'blur' }]
   }
 })
 
@@ -220,9 +200,9 @@ function getFutruesStocksList() {
 }
 
 /** 查询投资账户记账列表 */
-function getList () {
+function getList() {
   loading.value = true
-  listAccountsTransferRecord(queryParams.value).then(response => {
+  listAccountsTransferRecord(queryParams.value).then((response) => {
     accountsTransferRecordList.value = response.rows
     total.value = response.total
     loading.value = false
@@ -236,7 +216,7 @@ function cancel() {
 }
 
 // 表单重置
-function reset () {
+function reset() {
   form.value = {
     id: null,
     name: null,
@@ -259,13 +239,13 @@ function reset () {
 }
 
 /** 搜索按钮操作 */
-function handleQuery () {
+function handleQuery() {
   queryParams.value.pageNum = 1
   getList()
 }
 
 /** 重置按钮操作 */
-function resetQuery () {
+function resetQuery() {
   proxy.resetForm('queryRef')
   handleQuery()
 }
@@ -277,8 +257,8 @@ const handleCurrentChange = (val) => {
 }
 
 // 多选框选中数据
-function handleSelectionChange (selection) {
-  ids.value = selection.map(item => item.id)
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id)
   single.value = selection.length !== 1
   multiple.value = !selection.length
 }
@@ -287,7 +267,7 @@ function handleSelectionChange (selection) {
 const handleView = (row) => {
   reset()
   const _id = row.id || ids.value
-  getAccountsTransferRecord(_id).then(response => {
+  getAccountsTransferRecord(_id).then((response) => {
     form.value = response.data
     open.value = true
     title.value = '查看投资账户记账'
@@ -295,17 +275,17 @@ const handleView = (row) => {
 }
 
 /** 新增按钮操作 */
-function handleAdd () {
+function handleAdd() {
   reset()
   open.value = true
   title.value = '添加投资账户记账'
 }
 
 /** 修改按钮操作 */
-function handleUpdate (row) {
+function handleUpdate(row) {
   reset()
   const _id = row.id || ids.value
-  getAccountsTransferRecord(_id).then(response => {
+  getAccountsTransferRecord(_id).then((response) => {
     form.value = response.data
     open.value = true
     title.value = '修改投资账户记账'
@@ -313,17 +293,17 @@ function handleUpdate (row) {
 }
 
 /** 提交按钮 */
-function submitForm () {
-  proxy.$refs.accountsTransferRecordRef.validate(valid => {
+function submitForm() {
+  proxy.$refs.accountsTransferRecordRef.validate((valid) => {
     if (valid) {
       if (form.value.id != null) {
-        updateAccountsTransferRecord(form.value).then(response => {
+        updateAccountsTransferRecord(form.value).then((response) => {
           proxy.$modal.msgSuccess('修改成功')
           open.value = false
           getList()
         })
       } else {
-        addAccountsTransferRecord(form.value).then(response => {
+        addAccountsTransferRecord(form.value).then((response) => {
           proxy.$modal.msgSuccess('新增成功')
           open.value = false
           getList()
@@ -334,21 +314,29 @@ function submitForm () {
 }
 
 /** 删除按钮操作 */
-function handleDelete (row) {
+function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除选中的数据项？').then(function() {
-    return delAccountsTransferRecord(_ids)
-  }).then(() => {
-    getList()
-    proxy.$modal.msgSuccess('删除成功')
-  }).catch(() => {})
+  proxy.$modal
+    .confirm('是否确认删除选中的数据项？')
+    .then(function () {
+      return delAccountsTransferRecord(_ids)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('删除成功')
+    })
+    .catch(() => {})
 }
 
 /** 导出按钮操作 */
-function handleExport () {
-  proxy.download('invest/accountsTransferRecord/export', {
-    ...queryParams.value
-  }, `accountsTransferRecord_${new Date().getTime()}.xlsx`)
+function handleExport() {
+  proxy.download(
+    'invest/accountsTransferRecord/export',
+    {
+      ...queryParams.value
+    },
+    `accountsTransferRecord_${new Date().getTime()}.xlsx`
+  )
 }
 getFutruesStocksList()
 getDebitList()
diff --git a/src/views/invest/lend/index.vue b/src/views/invest/lend/index.vue
index 8b0f255..248a4d7 100644
--- a/src/views/invest/lend/index.vue
+++ b/src/views/invest/lend/index.vue
@@ -3,14 +3,9 @@
     <div class="search-con">
       <div class="title">查询条件</div>
       <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
-                    <el-form-item label="借贷名称" prop="name">
-                      <el-input
-                          v-model="queryParams.name"
-                          placeholder="请输入借贷名称"
-                          clearable
-                          @keyup.enter="handleQuery"
-                      />
-                    </el-form-item>
+        <el-form-item label="借贷名称" prop="name">
+          <el-input v-model="queryParams.name" placeholder="请输入借贷名称" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
       </el-form>
       <div class="search-btn-con">
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -21,40 +16,27 @@
       <div class="title-con">
         <div class="title">基本信息</div>
         <div class="operate-btn-con">
-          <el-button
-              @click="handleAdd"
-              icon="Plus"
-              v-hasPermi="['invest:bankcard:add']"
-          >新增</el-button>
-          <el-button
-              :disabled="multiple"
-              icon="Delete"
-              @click="handleDelete"
-              v-hasPermi="['invest:bankcard:remove']"
-          >删除</el-button>
-          <el-button
-              @click="handleExport"
-              icon="Download"
-              v-hasPermi="['invest:bankcard:export']"
-          >导出</el-button>
+          <el-button @click="handleAdd" icon="Plus" v-hasPermi="['invest:bankcard:add']">新增</el-button>
+          <el-button :disabled="multiple" icon="Delete" @click="handleDelete" v-hasPermi="['invest:bankcard:remove']">删除</el-button>
+          <el-button @click="handleExport" icon="Download" v-hasPermi="['invest:bankcard:export']">导出</el-button>
         </div>
       </div>
       <div class="content-con" v-loading="loading">
-        <el-table v-loading="loading" :data="bankcardList" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="bankcardList" @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="code" />
-                  <el-table-column label="类型" align="center" prop="lendType">
-                    <template #default="scope">
-                          <dict-tag :options="lend_type" :value="scope.row.lendType"/>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="备注" align="center" prop="remark" />
+          <el-table-column label="借贷名称" align="center" prop="name" />
+          <el-table-column label="编号" align="center" prop="code" />
+          <el-table-column label="类型" align="center" prop="lendType">
+            <template #default="scope">
+              <dict-tag :options="lend_type" :value="scope.row.lendType" />
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" align="center" prop="remark" />
           <el-table-column label="操作" 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">
-                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id,scope.row)"></el-button>
+                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
                 </el-tooltip>
               </div>
             </template>
@@ -66,25 +48,20 @@
     <!-- 添加或修改网贷信息对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="bankcardRef" :model="form" :rules="rules" label-width="120px">
-                        <el-form-item label="借贷名称" prop="name">
-                          <el-input v-model="form.name" placeholder="请输入借贷名称" />
-                        </el-form-item>
-                        <el-form-item label="账号" prop="code">
-                          <el-input v-model="form.code" placeholder="请输入账号" />
-                        </el-form-item>
-                        <el-form-item label="类型" prop="lendType">
-                          <el-select v-model="form.lendType" placeholder="请选择类型">
-                            <el-option
-                                v-for="dict in lend_type"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"
-                            ></el-option>
-                          </el-select>
-                        </el-form-item>
-                        <el-form-item label="备注" prop="remark">
-                          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-                        </el-form-item>
+        <el-form-item label="借贷名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入借贷名称" />
+        </el-form-item>
+        <el-form-item label="账号" prop="code">
+          <el-input v-model="form.code" placeholder="请输入账号" />
+        </el-form-item>
+        <el-form-item label="类型" prop="lendType">
+          <el-select v-model="form.lendType" placeholder="请选择类型">
+            <el-option v-for="dict in lend_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
       </el-form>
       <template v-if="title !== '查看网贷信息'" #footer>
         <div class="dialog-footer">
@@ -126,12 +103,8 @@ const data = reactive({
     type: '3'
   },
   rules: {
-    name: [
-      { required: true, message: '借贷名称不能为空', trigger: 'blur' }
-    ],
-    lendType: [
-      { required: true, message: '类型不能为空', trigger: 'blur' }
-    ]
+    name: [{ required: true, message: '借贷名称不能为空', trigger: 'blur' }],
+    lendType: [{ required: true, message: '类型不能为空', trigger: 'blur' }]
   }
 })
 
@@ -154,9 +127,9 @@ const handleOperate = (operate, row) => {
 const { queryParams, form, rules } = toRefs(data)
 
 /** 查询网贷信息列表 */
-function getList () {
+function getList() {
   loading.value = true
-  listBankcardLend(queryParams.value).then(response => {
+  listBankcardLend(queryParams.value).then((response) => {
     bankcardList.value = response.rows
     total.value = response.total
     loading.value = false
@@ -170,7 +143,7 @@ function cancel() {
 }
 
 // 表单重置
-function reset () {
+function reset() {
   form.value = {
     id: null,
     name: null,
@@ -196,13 +169,13 @@ function reset () {
 }
 
 /** 搜索按钮操作 */
-function handleQuery () {
+function handleQuery() {
   queryParams.value.pageNum = 1
   getList()
 }
 
 /** 重置按钮操作 */
-function resetQuery () {
+function resetQuery() {
   proxy.resetForm('queryRef')
   handleQuery()
 }
@@ -214,8 +187,8 @@ const handleCurrentChange = (val) => {
 }
 
 // 多选框选中数据
-function handleSelectionChange (selection) {
-  ids.value = selection.map(item => item.id)
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id)
   single.value = selection.length !== 1
   multiple.value = !selection.length
 }
@@ -228,17 +201,17 @@ const handleView = (row) => {
 }
 
 /** 新增按钮操作 */
-function handleAdd () {
+function handleAdd() {
   reset()
   open.value = true
   title.value = '添加网贷信息'
 }
 
 /** 修改按钮操作 */
-function handleUpdate (row) {
+function handleUpdate(row) {
   reset()
   const _id = row.id || ids.value
-  getBankcardLend(_id).then(response => {
+  getBankcardLend(_id).then((response) => {
     form.value = response.data
     open.value = true
     title.value = '修改网贷信息'
@@ -246,17 +219,17 @@ function handleUpdate (row) {
 }
 
 /** 提交按钮 */
-function submitForm () {
-  proxy.$refs.bankcardRef.validate(valid => {
+function submitForm() {
+  proxy.$refs.bankcardRef.validate((valid) => {
     if (valid) {
       if (form.value.id != null) {
-        updateBankcardLend(form.value).then(response => {
+        updateBankcardLend(form.value).then((response) => {
           proxy.$modal.msgSuccess('修改成功')
           open.value = false
           getList()
         })
       } else {
-        addBankcardLend(form.value).then(response => {
+        addBankcardLend(form.value).then((response) => {
           proxy.$modal.msgSuccess('新增成功')
           open.value = false
           getList()
@@ -267,21 +240,29 @@ function submitForm () {
 }
 
 /** 删除按钮操作 */
-function handleDelete (row) {
+function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除选中的数据项？').then(function() {
-    return delBankcardLend(_ids)
-  }).then(() => {
-    getList()
-    proxy.$modal.msgSuccess('删除成功')
-  }).catch(() => {})
+  proxy.$modal
+    .confirm('是否确认删除选中的数据项？')
+    .then(function () {
+      return delBankcardLend(_ids)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('删除成功')
+    })
+    .catch(() => {})
 }
 
 /** 导出按钮操作 */
-function handleExport () {
-  proxy.download('invest/bankcard/export', {
-    ...queryParams.value
-  }, `bankcard_${new Date().getTime()}.xlsx`)
+function handleExport() {
+  proxy.download(
+    'invest/bankcard/export',
+    {
+      ...queryParams.value
+    },
+    `bankcard_${new Date().getTime()}.xlsx`
+  )
 }
 
 getList()
diff --git a/src/views/invest/lendTransferRecord/index.vue b/src/views/invest/lendTransferRecord/index.vue
index 467277d..b0d09df 100644
--- a/src/views/invest/lendTransferRecord/index.vue
+++ b/src/views/invest/lendTransferRecord/index.vue
@@ -3,16 +3,16 @@
     <div class="search-con">
       <div class="title">查询条件</div>
       <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-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-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="lend in lendList" :key="lend.id" :label="lend.nameCode" :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-select>
+        </el-form-item>
       </el-form>
       <div class="search-btn-con">
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -23,37 +23,29 @@
       <div class="title-con">
         <div class="title">基本信息</div>
         <div class="operate-btn-con">
-          <el-button
-              @click="handleAdd"
-              icon="Plus"
-              v-hasPermi="['invest:accountsTransferRecord:add']"
-          >新增</el-button>
+          <el-button @click="handleAdd" icon="Plus" v-hasPermi="['invest:accountsTransferRecord:add']">新增</el-button>
           <!-- <el-button
               :disabled="multiple"
               icon="Delete"
               @click="handleDelete"
               v-hasPermi="['invest:accountsTransferRecord:remove']"
           >删除</el-button> -->
-          <el-button
-              @click="handleExport"
-              icon="Download"
-              v-hasPermi="['invest:accountsTransferRecord:export']"
-          >导出</el-button>
+          <el-button @click="handleExport" icon="Download" v-hasPermi="['invest:accountsTransferRecord:export']">导出</el-button>
         </div>
       </div>
       <div class="content-con" v-loading="loading">
-        <el-table v-loading="loading" :data="accountsTransferRecordList" @selection-change="handleSelectionChange">
+        <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="借贷时间" width='180' align="center" prop="createTime" />
-                  <el-table-column label="借贷金额" width='150' align="center" prop="amount" />
+          <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">
             <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">
-                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id,scope.row)"></el-button>
+                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
                 </el-tooltip>
               </div>
             </template>
@@ -65,40 +57,30 @@
     <!-- 添加或修改借贷记账对话框 -->
     <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-option v-for="lend in lendList" :key="lend.id" :label="lend.nameCode" :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-select>
-                        </el-form-item>
-                        <el-form-item label="交易类型" prop="dealType">
-                          <el-select v-model="form.dealType" placeholder="请选择交易类型">
-                            <el-option
-                                v-for="dict in record_lend_type"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"
-                            ></el-option>
-                          </el-select>
-                        </el-form-item>
-                        <el-form-item label="借贷时间" prop="createTime">
-                          <el-date-picker clearable
-                                          v-model="form.createTime"
-                                          type="datetime"
-                                          value-format="YYYY-MM-DD HH:mm:ss"
-                                          placeholder="请选择借贷时间">
-                          </el-date-picker>
-                        </el-form-item>
-                        <el-form-item label="借贷金额" prop="amount">
-                          <el-input v-model="form.amount" placeholder="请输入借贷金额" />
-                        </el-form-item>
-                        <el-form-item label="备注" prop="remark">
-                          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-                        </el-form-item>
+        <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-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-select>
+        </el-form-item>
+        <el-form-item label="交易类型" prop="dealType">
+          <el-select v-model="form.dealType" placeholder="请选择交易类型">
+            <el-option v-for="dict in record_lend_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="借贷时间" prop="createTime">
+          <el-date-picker clearable v-model="form.createTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择借贷时间"> </el-date-picker>
+        </el-form-item>
+        <el-form-item label="借贷金额" prop="amount">
+          <el-input v-model="form.amount" placeholder="请输入借贷金额" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
       </el-form>
       <template v-if="title !== '查看借贷记账'" #footer>
         <div class="dialog-footer">
@@ -111,7 +93,13 @@
 </template>
 
 <script setup name="AccountsTransferRecord">
-import { listAccountsTransferRecord, getAccountsTransferRecord, delAccountsTransferRecord, addAccountsTransferRecord, updateAccountsTransferRecord } from '@/api/invest/accountsTransferRecord'
+import {
+  listAccountsTransferRecord,
+  getAccountsTransferRecord,
+  delAccountsTransferRecord,
+  addAccountsTransferRecord,
+  updateAccountsTransferRecord
+} from '@/api/invest/accountsTransferRecord'
 import { listAccounts } from '@/api/invest/accounts'
 // eslint-disable-next-line no-unused-vars
 import { require } from '@/utils/require'
@@ -159,21 +147,11 @@ const data = reactive({
     pageSize: 1000
   },
   rules: {
-    inAccountId: [
-      { required: true, message: '借贷账户不能为空', trigger: 'blur' }
-    ],
-    outAccountId: [
-      { required: true, message: '储蓄卡不能为空', trigger: 'blur' }
-    ],
-    dealType: [
-      { required: true, message: '交易类型不能为空', trigger: 'blur' }
-    ],
-    amount: [
-      { required: true, message: '借贷金额不能为空', trigger: 'blur' }
-    ],
-    createTime: [
-      { required: true, message: '借贷时间不能为空', trigger: 'blur' }
-    ]
+    inAccountId: [{ required: true, message: '借贷账户不能为空', trigger: 'blur' }],
+    outAccountId: [{ required: true, message: '储蓄卡不能为空', trigger: 'blur' }],
+    dealType: [{ required: true, message: '交易类型不能为空', trigger: 'blur' }],
+    amount: [{ required: true, message: '借贷金额不能为空', trigger: 'blur' }],
+    createTime: [{ required: true, message: '借贷时间不能为空', trigger: 'blur' }]
   }
 })
 
@@ -210,9 +188,9 @@ function getDebitList() {
 }
 
 /** 查询借贷记账列表 */
-function getList () {
+function getList() {
   loading.value = true
-  listAccountsTransferRecord(queryParams.value).then(response => {
+  listAccountsTransferRecord(queryParams.value).then((response) => {
     accountsTransferRecordList.value = response.rows
     total.value = response.total
     loading.value = false
@@ -226,7 +204,7 @@ function cancel() {
 }
 
 // 表单重置
-function reset () {
+function reset() {
   form.value = {
     id: null,
     name: null,
@@ -249,13 +227,13 @@ function reset () {
 }
 
 /** 搜索按钮操作 */
-function handleQuery () {
+function handleQuery() {
   queryParams.value.pageNum = 1
   getList()
 }
 
 /** 重置按钮操作 */
-function resetQuery () {
+function resetQuery() {
   proxy.resetForm('queryRef')
   handleQuery()
 }
@@ -267,8 +245,8 @@ const handleCurrentChange = (val) => {
 }
 
 // 多选框选中数据
-function handleSelectionChange (selection) {
-  ids.value = selection.map(item => item.id)
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id)
   single.value = selection.length !== 1
   multiple.value = !selection.length
 }
@@ -281,17 +259,17 @@ const handleView = (row) => {
 }
 
 /** 新增按钮操作 */
-function handleAdd () {
+function handleAdd() {
   reset()
   open.value = true
   title.value = '添加借贷记账'
 }
 
 /** 修改按钮操作 */
-function handleUpdate (row) {
+function handleUpdate(row) {
   reset()
   const _id = row.id || ids.value
-  getAccountsTransferRecord(_id).then(response => {
+  getAccountsTransferRecord(_id).then((response) => {
     form.value = response.data
     open.value = true
     title.value = '修改借贷记账'
@@ -299,17 +277,17 @@ function handleUpdate (row) {
 }
 
 /** 提交按钮 */
-function submitForm () {
-  proxy.$refs.accountsTransferRecordRef.validate(valid => {
+function submitForm() {
+  proxy.$refs.accountsTransferRecordRef.validate((valid) => {
     if (valid) {
       if (form.value.id != null) {
-        updateAccountsTransferRecord(form.value).then(response => {
+        updateAccountsTransferRecord(form.value).then((response) => {
           proxy.$modal.msgSuccess('修改成功')
           open.value = false
           getList()
         })
       } else {
-        addAccountsTransferRecord(form.value).then(response => {
+        addAccountsTransferRecord(form.value).then((response) => {
           proxy.$modal.msgSuccess('新增成功')
           open.value = false
           getList()
@@ -320,21 +298,29 @@ function submitForm () {
 }
 
 /** 删除按钮操作 */
-function handleDelete (row) {
+function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除选中的数据项？').then(function() {
-    return delAccountsTransferRecord(_ids)
-  }).then(() => {
-    getList()
-    proxy.$modal.msgSuccess('删除成功')
-  }).catch(() => {})
+  proxy.$modal
+    .confirm('是否确认删除选中的数据项？')
+    .then(function () {
+      return delAccountsTransferRecord(_ids)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('删除成功')
+    })
+    .catch(() => {})
 }
 
 /** 导出按钮操作 */
-function handleExport () {
-  proxy.download('invest/accountsTransferRecord/export', {
-    ...queryParams.value
-  }, `accountsTransferRecord_${new Date().getTime()}.xlsx`)
+function handleExport() {
+  proxy.download(
+    'invest/accountsTransferRecord/export',
+    {
+      ...queryParams.value
+    },
+    `accountsTransferRecord_${new Date().getTime()}.xlsx`
+  )
 }
 getDebitList()
 getLendList()
diff --git a/src/views/invest/onlineLendHistory/index.vue b/src/views/invest/onlineLendHistory/index.vue
index 9e3b86c..f4f00d4 100644
--- a/src/views/invest/onlineLendHistory/index.vue
+++ b/src/views/invest/onlineLendHistory/index.vue
@@ -29,54 +29,52 @@
         </div>
       </div>
       <div class="content-con" v-loading="loading">
-        <el-scrollbar>
-          <el-table v-loading="loading" :data="installmentHistoryList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" />
-            <el-table-column label="网贷机构" align="center" width="150" prop="bankNameCode" />
-            <el-table-column label="借款金额" align="center" prop="installmentAmount" />
-            <el-table-column label="借款日期" align="center" prop="installmentDate" width="180">
-              <template #default="scope">
-                <span>{{ parseTime(scope.row.installmentDate, '{y}-{m}-{d}') }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="借款期数" align="center" prop="period" />
-            <el-table-column label="已还期数" align="center" prop="repaidPeriod" />
-            <el-table-column label="总利息" align="center" prop="totalInterest" />
-            <el-table-column label="利率" align="center" prop="interestRate" />
-            <el-table-column label="余额" align="center" prop="balance" />
-            <el-table-column label="到期日期" align="center" prop="dueDate" width="100">
-              <template #default="scope">
-                <span>{{ parseTime(scope.row.dueDate, '{y}-{m}-{d}') }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="最近还款日" align="center" prop="repaymentDate" width="100">
-              <template #default="scope">
-                <span>{{ parseTime(scope.row.repaymentDate, '{y}-{m}-{d}') }}</span>
-              </template>
-            </el-table-column>
-            <!-- <el-table-column label="关闭日期" align="center" prop="closeDate" width="180">
+        <el-table v-loading="loading" :data="installmentHistoryList" @selection-change="handleSelectionChange" height="calc(100% - 0.62rem)">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="网贷机构" align="center" width="150" prop="bankNameCode" />
+          <el-table-column label="借款金额" align="center" prop="installmentAmount" />
+          <el-table-column label="借款日期" align="center" prop="installmentDate" width="180">
+            <template #default="scope">
+              <span>{{ parseTime(scope.row.installmentDate, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="借款期数" align="center" prop="period" />
+          <el-table-column label="已还期数" align="center" prop="repaidPeriod" />
+          <el-table-column label="总利息" align="center" prop="totalInterest" />
+          <el-table-column label="利率" align="center" prop="interestRate" />
+          <el-table-column label="余额" align="center" prop="balance" />
+          <el-table-column label="到期日期" align="center" prop="dueDate" width="100">
+            <template #default="scope">
+              <span>{{ parseTime(scope.row.dueDate, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="最近还款日" align="center" prop="repaymentDate" width="100">
+            <template #default="scope">
+              <span>{{ parseTime(scope.row.repaymentDate, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <!-- <el-table-column label="关闭日期" align="center" prop="closeDate" width="180">
                     <template #default="scope">
                       <span>{{ parseTime(scope.row.closeDate, '{y}-{m}-{d}') }}</span>
                     </template>
                   </el-table-column> -->
-            <el-table-column label="账户状态" align="center" width="100" prop="state">
-              <template #default="scope">
-                <dict-tag :options="settle_state" :value="scope.row.state" />
-              </template>
-            </el-table-column>
-            <el-table-column label="备注" align="center" prop="remark" />
-            <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">
-                    <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
-                  </el-tooltip>
-                </div>
-              </template>
-            </el-table-column>
-          </el-table>
-          <el-pagination small background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" />
-        </el-scrollbar>
+          <el-table-column label="账户状态" align="center" width="100" prop="state">
+            <template #default="scope">
+              <dict-tag :options="settle_state" :value="scope.row.state" />
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" align="center" prop="remark" />
+          <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">
+                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination small background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" />
       </div>
     </div>
     <!-- 添加或修改网络贷款对话框 -->
diff --git a/src/views/invest/peopleLendHistory/index.vue b/src/views/invest/peopleLendHistory/index.vue
index bb1fdf0..f983de5 100644
--- a/src/views/invest/peopleLendHistory/index.vue
+++ b/src/views/invest/peopleLendHistory/index.vue
@@ -3,21 +3,16 @@
     <div class="search-con">
       <div class="title">查询条件</div>
       <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
-                    <el-form-item label="人情借贷" prop="bankCardLendId">
-                      <el-select v-model="queryParams.bankCardLendId" placeholder="请选择人情借贷" clearable>
-                          <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-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>
-                    </el-form-item>
+        <el-form-item label="人情借贷" prop="bankCardLendId">
+          <el-select v-model="queryParams.bankCardLendId" placeholder="请选择人情借贷" clearable>
+            <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-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>
+        </el-form-item>
       </el-form>
       <div class="search-btn-con">
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -28,50 +23,37 @@
       <div class="title-con">
         <div class="title">基本信息</div>
         <div class="operate-btn-con">
-          <el-button
-              @click="handleAdd"
-              icon="Plus"
-              v-hasPermi="['invest:installmentHistory:add']"
-          >新增</el-button>
-          <el-button
-              :disabled="multiple"
-              icon="Delete"
-              @click="handleDelete"
-              v-hasPermi="['invest:installmentHistory:remove']"
-          >删除</el-button>
-          <el-button
-              @click="handleExport"
-              icon="Download"
-              v-hasPermi="['invest:installmentHistory:export']"
-          >导出</el-button>
+          <el-button @click="handleAdd" icon="Plus" v-hasPermi="['invest:installmentHistory:add']">新增</el-button>
+          <el-button :disabled="multiple" icon="Delete" @click="handleDelete" v-hasPermi="['invest:installmentHistory:remove']">删除</el-button>
+          <el-button @click="handleExport" icon="Download" v-hasPermi="['invest:installmentHistory:export']">导出</el-button>
         </div>
       </div>
       <div class="content-con" v-loading="loading">
-        <el-table v-loading="loading" :data="installmentHistoryList" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="installmentHistoryList" @selection-change="handleSelectionChange" height="calc(100% - 0.62rem)">
           <el-table-column type="selection" width="55" align="center" />
-                  <el-table-column label="人情借贷" align="center"  width='200' prop="bankNameCode" />
-                  <el-table-column label="借款金额" align="center" prop="installmentAmount" />
-                  <el-table-column label="借款日期" align="center" prop="installmentDate" width="180">
-                    <template #default="scope">
-                      <span>{{ parseTime(scope.row.installmentDate, '{y}-{m}-{d}') }}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="还款日期" align="center" prop="closeDate" width="180">
-                    <template #default="scope">
-                      <span>{{ parseTime(scope.row.closeDate, '{y}-{m}-{d}') }}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="账户状态" align="center"  width='100' prop="state">
-                    <template #default="scope">
-                          <dict-tag :options="settle_state" :value="scope.row.state"/>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="备注" align="center" prop="remark" />
+          <el-table-column label="人情借贷" align="center" width="200" prop="bankNameCode" />
+          <el-table-column label="借款金额" align="center" prop="installmentAmount" />
+          <el-table-column label="借款日期" align="center" prop="installmentDate" width="180">
+            <template #default="scope">
+              <span>{{ parseTime(scope.row.installmentDate, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="还款日期" align="center" prop="closeDate" width="180">
+            <template #default="scope">
+              <span>{{ parseTime(scope.row.closeDate, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="账户状态" align="center" width="100" prop="state">
+            <template #default="scope">
+              <dict-tag :options="settle_state" :value="scope.row.state" />
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" align="center" prop="remark" />
           <el-table-column label="操作" 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">
-                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id,scope.row)"></el-button>
+                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
                 </el-tooltip>
               </div>
             </template>
@@ -83,43 +65,28 @@
     <!-- 添加或修改人情借贷对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="installmentHistoryRef" :model="form" :rules="rules" label-width="120px">
-                        <el-form-item label="人情借贷" prop="bankCardLendId">
-                          <el-select v-model="form.bankCardLendId" placeholder="请选择人情借贷" clearable>
-                          <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="installmentAmount">
-                          <el-input v-model="form.installmentAmount" placeholder="请输入借款金额" />
-                        </el-form-item>
-                        <el-form-item label="借款日期" prop="installmentDate">
-                          <el-date-picker clearable
-                                          v-model="form.installmentDate"
-                                          type="date"
-                                          value-format="YYYY-MM-DD"
-                                          placeholder="请选择借款日期">
-                          </el-date-picker>
-                        </el-form-item>
-                        <el-form-item label="还款日期" prop="closeDate">
-                          <el-date-picker clearable
-                                          v-model="form.closeDate"
-                                          type="date"
-                                          value-format="YYYY-MM-DD"
-                                          placeholder="请选择还款日期">
-                          </el-date-picker>
-                        </el-form-item>
-                        <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>
-                        </el-form-item>
-                        <el-form-item label="备注" prop="remark">
-                          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-                        </el-form-item>
+        <el-form-item label="人情借贷" prop="bankCardLendId">
+          <el-select v-model="form.bankCardLendId" placeholder="请选择人情借贷" clearable>
+            <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="installmentAmount">
+          <el-input v-model="form.installmentAmount" placeholder="请输入借款金额" />
+        </el-form-item>
+        <el-form-item label="借款日期" prop="installmentDate">
+          <el-date-picker clearable v-model="form.installmentDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择借款日期"> </el-date-picker>
+        </el-form-item>
+        <el-form-item label="还款日期" prop="closeDate">
+          <el-date-picker clearable v-model="form.closeDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择还款日期"> </el-date-picker>
+        </el-form-item>
+        <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>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
       </el-form>
       <template v-if="title !== '查看人情借贷'" #footer>
         <div class="dialog-footer">
@@ -132,7 +99,13 @@
 </template>
 
 <script setup name="InstallmentHistory">
-import { listInstallmentHistory, getInstallmentHistory, delInstallmentHistory, addInstallmentHistory, updateInstallmentHistory } from '@/api/invest/installmentHistory'
+import {
+  listInstallmentHistory,
+  getInstallmentHistory,
+  delInstallmentHistory,
+  addInstallmentHistory,
+  updateInstallmentHistory
+} from '@/api/invest/installmentHistory'
 import { listBankcardLend } from '@/api/invest/bankcardlend'
 // eslint-disable-next-line no-unused-vars
 import { require } from '@/utils/require'
@@ -171,18 +144,10 @@ const data = reactive({
     pageSize: 1000
   },
   rules: {
-    bankCardLendId: [
-      { required: true, message: '人情借贷不能为空', trigger: 'blur' }
-    ],
-    installmentAmount: [
-      { required: true, message: '借款金额不能为空', trigger: 'blur' }
-    ],
-    installmentDate: [
-      { required: true, message: '借款日期不能为空', trigger: 'blur' }
-    ],
-    state: [
-      { required: true, message: '账户状态不能为空', trigger: 'change' }
-    ]
+    bankCardLendId: [{ required: true, message: '人情借贷不能为空', trigger: 'blur' }],
+    installmentAmount: [{ required: true, message: '借款金额不能为空', trigger: 'blur' }],
+    installmentDate: [{ required: true, message: '借款日期不能为空', trigger: 'blur' }],
+    state: [{ required: true, message: '账户状态不能为空', trigger: 'change' }]
   }
 })
 
@@ -212,9 +177,9 @@ function getCreditCardList() {
 }
 
 /** 查询人情借贷列表 */
-function getList () {
+function getList() {
   loading.value = true
-  listInstallmentHistory(queryParams.value).then(response => {
+  listInstallmentHistory(queryParams.value).then((response) => {
     installmentHistoryList.value = response.rows
     total.value = response.total
     loading.value = false
@@ -228,7 +193,7 @@ function cancel() {
 }
 
 // 表单重置
-function reset () {
+function reset() {
   form.value = {
     id: null,
     name: null,
@@ -255,13 +220,13 @@ function reset () {
 }
 
 /** 搜索按钮操作 */
-function handleQuery () {
+function handleQuery() {
   queryParams.value.pageNum = 1
   getList()
 }
 
 /** 重置按钮操作 */
-function resetQuery () {
+function resetQuery() {
   proxy.resetForm('queryRef')
   handleQuery()
 }
@@ -273,8 +238,8 @@ const handleCurrentChange = (val) => {
 }
 
 // 多选框选中数据
-function handleSelectionChange (selection) {
-  ids.value = selection.map(item => item.id)
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id)
   single.value = selection.length !== 1
   multiple.value = !selection.length
 }
@@ -287,17 +252,17 @@ const handleView = (row) => {
 }
 
 /** 新增按钮操作 */
-function handleAdd () {
+function handleAdd() {
   reset()
   open.value = true
   title.value = '添加人情借贷'
 }
 
 /** 修改按钮操作 */
-function handleUpdate (row) {
+function handleUpdate(row) {
   reset()
   const _id = row.id || ids.value
-  getInstallmentHistory(_id).then(response => {
+  getInstallmentHistory(_id).then((response) => {
     form.value = response.data
     open.value = true
     title.value = '修改人情借贷'
@@ -305,17 +270,17 @@ function handleUpdate (row) {
 }
 
 /** 提交按钮 */
-function submitForm () {
-  proxy.$refs.installmentHistoryRef.validate(valid => {
+function submitForm() {
+  proxy.$refs.installmentHistoryRef.validate((valid) => {
     if (valid) {
       if (form.value.id != null) {
-        updateInstallmentHistory(form.value).then(response => {
+        updateInstallmentHistory(form.value).then((response) => {
           proxy.$modal.msgSuccess('修改成功')
           open.value = false
           getList()
         })
       } else {
-        addInstallmentHistory(form.value).then(response => {
+        addInstallmentHistory(form.value).then((response) => {
           proxy.$modal.msgSuccess('新增成功')
           open.value = false
           getList()
@@ -326,21 +291,29 @@ function submitForm () {
 }
 
 /** 删除按钮操作 */
-function handleDelete (row) {
+function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除选中的数据项？').then(function() {
-    return delInstallmentHistory(_ids)
-  }).then(() => {
-    getList()
-    proxy.$modal.msgSuccess('删除成功')
-  }).catch(() => {})
+  proxy.$modal
+    .confirm('是否确认删除选中的数据项？')
+    .then(function () {
+      return delInstallmentHistory(_ids)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('删除成功')
+    })
+    .catch(() => {})
 }
 
 /** 导出按钮操作 */
-function handleExport () {
-  proxy.download('invest/installmentHistory/export', {
-    ...queryParams.value
-  }, `installmentHistory_${new Date().getTime()}.xlsx`)
+function handleExport() {
+  proxy.download(
+    'invest/installmentHistory/export',
+    {
+      ...queryParams.value
+    },
+    `installmentHistory_${new Date().getTime()}.xlsx`
+  )
 }
 getCreditCardList()
 getList()
diff --git a/src/views/invest/posTransferRecord/index.vue b/src/views/invest/posTransferRecord/index.vue
index ed087f3..a527d8c 100644
--- a/src/views/invest/posTransferRecord/index.vue
+++ b/src/views/invest/posTransferRecord/index.vue
@@ -3,16 +3,16 @@
     <div class="search-con">
       <div class="title">查询条件</div>
       <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
-                    <el-form-item label="POS机"  style="width: 500px;" prop="posId">
-                      <el-select v-model="queryParams.posId" placeholder="请选择POS机" clearable>
-                          <el-option v-for="pos in posMachineList" :key="pos.id" :label="pos.nameMerchantName" :value="pos.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="creditCard in bankCardLendList" :key="creditCard.id" :label="creditCard.nameCode" :value="creditCard.id" />
-                         </el-select>
-                    </el-form-item>
+        <el-form-item label="POS机" style="width: 500px" prop="posId">
+          <el-select v-model="queryParams.posId" placeholder="请选择POS机" clearable>
+            <el-option v-for="pos in posMachineList" :key="pos.id" :label="pos.nameMerchantName" :value="pos.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="creditCard in bankCardLendList" :key="creditCard.id" :label="creditCard.nameCode" :value="creditCard.id" />
+          </el-select>
+        </el-form-item>
       </el-form>
       <div class="search-btn-con">
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -23,40 +23,32 @@
       <div class="title-con">
         <div class="title">基本信息</div>
         <div class="operate-btn-con">
-          <el-button
-              @click="handleAdd"
-              icon="Plus"
-              v-hasPermi="['invest:accountsTransferRecord:add']"
-          >新增</el-button>
+          <el-button @click="handleAdd" icon="Plus" v-hasPermi="['invest:accountsTransferRecord:add']">新增</el-button>
           <!-- <el-button
               :disabled="multiple"
               icon="Delete"
               @click="handleDelete"
               v-hasPermi="['invest:accountsTransferRecord:remove']"
           >删除</el-button> -->
-          <el-button
-              @click="handleExport"
-              icon="Download"
-              v-hasPermi="['invest:accountsTransferRecord:export']"
-          >导出</el-button>
+          <el-button @click="handleExport" icon="Download" v-hasPermi="['invest:accountsTransferRecord:export']">导出</el-button>
         </div>
       </div>
       <div class="content-con" v-loading="loading">
-        <el-table v-loading="loading" :data="accountsTransferRecordList" @selection-change="handleSelectionChange">
+        <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="POS机名称" align="center" prop="posName" />
-                  <el-table-column label="刷卡商户" align="center" prop="merchantName" />
-                  <el-table-column label="刷卡时间" align="center" prop="createTime" />
-                  <el-table-column label="信用卡" align="center" prop="outAccountName" />
-                  <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" />
+          <el-table-column label="POS机名称" align="center" prop="posName" />
+          <el-table-column label="刷卡商户" align="center" prop="merchantName" />
+          <el-table-column label="刷卡时间" align="center" prop="createTime" />
+          <el-table-column label="信用卡" align="center" prop="outAccountName" />
+          <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" />
           <el-table-column label="操作" 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">
-                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id,scope.row)"></el-button>
+                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
                 </el-tooltip>
               </div>
             </template>
@@ -68,30 +60,25 @@
     <!-- 添加或修改POS机刷卡对话框 -->
     <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="POS机" prop="posId">
-                          <el-select v-model="form.posId" placeholder="请选择POS机" clearable>
-                          <el-option v-for="pos in posMachineList" :key="pos.id" :label="pos.nameMerchantName" :value="pos.id" />
-                         </el-select>
-                        </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-select>
-                        </el-form-item>
-                        <el-form-item label="刷卡时间" prop="createTime">
-                          <el-date-picker clearable
-                                          v-model="form.createTime"
-                                          type="datetime"
-                                          value-format="YYYY-MM-DD HH:mm:ss"
-                                          placeholder="请选择刷卡时间">
-                          </el-date-picker>
-                        </el-form-item>
-                        <el-form-item label="刷卡金额" prop="amount">
-                          <el-input v-model="form.amount" placeholder="请输入刷卡金额" />
-                        </el-form-item>
-                        <el-form-item label="备注" prop="remark">
-                          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-                        </el-form-item>
+        <el-form-item label="POS机" prop="posId">
+          <el-select v-model="form.posId" placeholder="请选择POS机" clearable>
+            <el-option v-for="pos in posMachineList" :key="pos.id" :label="pos.nameMerchantName" :value="pos.id" />
+          </el-select>
+        </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-select>
+        </el-form-item>
+        <el-form-item label="刷卡时间" prop="createTime">
+          <el-date-picker clearable v-model="form.createTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择刷卡时间"> </el-date-picker>
+        </el-form-item>
+        <el-form-item label="刷卡金额" prop="amount">
+          <el-input v-model="form.amount" placeholder="请输入刷卡金额" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
       </el-form>
       <template v-if="title !== '查看POS机刷卡'" #footer>
         <div class="dialog-footer">
@@ -104,7 +91,13 @@
 </template>
 
 <script setup name="AccountsTransferRecord">
-import { listAccountsTransferRecord, getAccountsTransferRecord, delAccountsTransferRecord, addAccountsTransferRecord, updateAccountsTransferRecord } from '@/api/invest/accountsTransferRecord'
+import {
+  listAccountsTransferRecord,
+  getAccountsTransferRecord,
+  delAccountsTransferRecord,
+  addAccountsTransferRecord,
+  updateAccountsTransferRecord
+} from '@/api/invest/accountsTransferRecord'
 import { listPosmachine } from '@/api/invest/posmachine'
 import { listAccounts } from '@/api/invest/accounts'
 // eslint-disable-next-line no-unused-vars
@@ -157,18 +150,10 @@ const data = reactive({
     pageSize: 1000
   },
   rules: {
-    outAccountId: [
-      { required: true, message: '信用卡不能为空', trigger: 'blur' }
-    ],
-    posId: [
-      { required: true, message: 'POS机不能为空', trigger: 'blur' }
-    ],
-    amount: [
-      { required: true, message: '刷卡金额不能为空', trigger: 'blur' }
-    ],
-    createTime: [
-      { required: true, message: '刷卡时间不能为空', trigger: 'blur' }
-    ]
+    outAccountId: [{ required: true, message: '信用卡不能为空', trigger: 'blur' }],
+    posId: [{ required: true, message: 'POS机不能为空', trigger: 'blur' }],
+    amount: [{ required: true, message: '刷卡金额不能为空', trigger: 'blur' }],
+    createTime: [{ required: true, message: '刷卡时间不能为空', trigger: 'blur' }]
   }
 })
 
@@ -212,9 +197,9 @@ function getFutruesStocksList() {
 }
 
 /** 查询POS机刷卡列表 */
-function getList () {
+function getList() {
   loading.value = true
-  listAccountsTransferRecord(queryParams.value).then(response => {
+  listAccountsTransferRecord(queryParams.value).then((response) => {
     accountsTransferRecordList.value = response.rows
     total.value = response.total
     loading.value = false
@@ -228,7 +213,7 @@ function cancel() {
 }
 
 // 表单重置
-function reset () {
+function reset() {
   form.value = {
     id: null,
     name: null,
@@ -251,13 +236,13 @@ function reset () {
 }
 
 /** 搜索按钮操作 */
-function handleQuery () {
+function handleQuery() {
   queryParams.value.pageNum = 1
   getList()
 }
 
 /** 重置按钮操作 */
-function resetQuery () {
+function resetQuery() {
   proxy.resetForm('queryRef')
   handleQuery()
 }
@@ -269,8 +254,8 @@ const handleCurrentChange = (val) => {
 }
 
 // 多选框选中数据
-function handleSelectionChange (selection) {
-  ids.value = selection.map(item => item.id)
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id)
   single.value = selection.length !== 1
   multiple.value = !selection.length
 }
@@ -283,17 +268,17 @@ const handleView = (row) => {
 }
 
 /** 新增按钮操作 */
-function handleAdd () {
+function handleAdd() {
   reset()
   open.value = true
   title.value = '添加POS机刷卡'
 }
 
 /** 修改按钮操作 */
-function handleUpdate (row) {
+function handleUpdate(row) {
   reset()
   const _id = row.id || ids.value
-  getAccountsTransferRecord(_id).then(response => {
+  getAccountsTransferRecord(_id).then((response) => {
     form.value = response.data
     open.value = true
     title.value = '修改POS机刷卡'
@@ -301,17 +286,17 @@ function handleUpdate (row) {
 }
 
 /** 提交按钮 */
-function submitForm () {
-  proxy.$refs.accountsTransferRecordRef.validate(valid => {
+function submitForm() {
+  proxy.$refs.accountsTransferRecordRef.validate((valid) => {
     if (valid) {
       if (form.value.id != null) {
-        updateAccountsTransferRecord(form.value).then(response => {
+        updateAccountsTransferRecord(form.value).then((response) => {
           proxy.$modal.msgSuccess('修改成功')
           open.value = false
           getList()
         })
       } else {
-        addAccountsTransferRecord(form.value).then(response => {
+        addAccountsTransferRecord(form.value).then((response) => {
           proxy.$modal.msgSuccess('新增成功')
           open.value = false
           getList()
@@ -322,21 +307,29 @@ function submitForm () {
 }
 
 /** 删除按钮操作 */
-function handleDelete (row) {
+function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除选中的数据项？').then(function() {
-    return delAccountsTransferRecord(_ids)
-  }).then(() => {
-    getList()
-    proxy.$modal.msgSuccess('删除成功')
-  }).catch(() => {})
+  proxy.$modal
+    .confirm('是否确认删除选中的数据项？')
+    .then(function () {
+      return delAccountsTransferRecord(_ids)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('删除成功')
+    })
+    .catch(() => {})
 }
 
 /** 导出按钮操作 */
-function handleExport () {
-  proxy.download('invest/accountsTransferRecord/export', {
-    ...queryParams.value
-  }, `accountsTransferRecord_${new Date().getTime()}.xlsx`)
+function handleExport() {
+  proxy.download(
+    'invest/accountsTransferRecord/export',
+    {
+      ...queryParams.value
+    },
+    `accountsTransferRecord_${new Date().getTime()}.xlsx`
+  )
 }
 getFutruesStocksList()
 getPosMachineList()
diff --git a/src/views/invest/posmachine/index.vue b/src/views/invest/posmachine/index.vue
index 0b0c510..137d53e 100644
--- a/src/views/invest/posmachine/index.vue
+++ b/src/views/invest/posmachine/index.vue
@@ -3,32 +3,17 @@
     <div class="search-con">
       <div class="title">查询条件</div>
       <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
-                    <el-form-item label="pos机名称" prop="name">
-                      <el-input
-                          v-model="queryParams.name"
-                          placeholder="请输入pos机名称"
-                          clearable
-                          @keyup.enter="handleQuery"
-                      />
-                    </el-form-item>
-                    <el-form-item label="类型" prop="type">
-                      <el-select v-model="queryParams.type" placeholder="请选择类型" clearable>
-                        <el-option
-                            v-for="dict in pos_type"
-                            :key="dict.value"
-                            :label="dict.label"
-                            :value="dict.value"
-                        />
-                      </el-select>
-                    </el-form-item>
-                    <el-form-item label="商户名称" prop="merchantName">
-                      <el-input
-                          v-model="queryParams.merchantName"
-                          placeholder="请输入商户名称"
-                          clearable
-                          @keyup.enter="handleQuery"
-                      />
-                    </el-form-item>
+        <el-form-item label="pos机名称" prop="name">
+          <el-input v-model="queryParams.name" placeholder="请输入pos机名称" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="类型" prop="type">
+          <el-select v-model="queryParams.type" placeholder="请选择类型" clearable>
+            <el-option v-for="dict in pos_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="商户名称" prop="merchantName">
+          <el-input v-model="queryParams.merchantName" placeholder="请输入商户名称" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
       </el-form>
       <div class="search-btn-con">
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -39,49 +24,36 @@
       <div class="title-con">
         <div class="title">基本信息</div>
         <div class="operate-btn-con">
-          <el-button
-              @click="handleAdd"
-              icon="Plus"
-              v-hasPermi="['invest:posmachine:add']"
-          >新增</el-button>
-          <el-button
-              :disabled="multiple"
-              icon="Delete"
-              @click="handleDelete"
-              v-hasPermi="['invest:posmachine:remove']"
-          >删除</el-button>
-          <el-button
-              @click="handleExport"
-              icon="Download"
-              v-hasPermi="['invest:posmachine:export']"
-          >导出</el-button>
+          <el-button @click="handleAdd" icon="Plus" v-hasPermi="['invest:posmachine:add']">新增</el-button>
+          <el-button :disabled="multiple" icon="Delete" @click="handleDelete" v-hasPermi="['invest:posmachine:remove']">删除</el-button>
+          <el-button @click="handleExport" icon="Download" v-hasPermi="['invest:posmachine:export']">导出</el-button>
         </div>
       </div>
       <div class="content-con" v-loading="loading">
-        <el-table v-loading="loading" :data="posmachineList" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="posmachineList" @selection-change="handleSelectionChange" height="calc(100% - 0.62rem)">
           <el-table-column type="selection" width="55" align="center" />
-                  <el-table-column label="pos机名称" align="center" prop="name" />
-                  <el-table-column label="支付公司" align="center" prop="payCompany" />
-                  <el-table-column label="类型" align="center" prop="type">
-                    <template #default="scope">
-                          <dict-tag :options="pos_type" :value="scope.row.type"/>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="商户名称" align="center" prop="merchantName" />
-                  <el-table-column label="刷卡费率" align="center" prop="rate" />
-                  <el-table-column label="费率+" align="center" prop="ratePlus" />
-                  <el-table-column label="结算卡" align="center" prop="bankNameCode" />
-                  <el-table-column label="商户类型" align="center" prop="merchantType">
-                    <template #default="scope">
-                          <dict-tag :options="merchant_type" :value="scope.row.merchantType"/>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="商户码" align="center" prop="merchantCode" />
+          <el-table-column label="pos机名称" align="center" prop="name" />
+          <el-table-column label="支付公司" align="center" prop="payCompany" />
+          <el-table-column label="类型" align="center" prop="type">
+            <template #default="scope">
+              <dict-tag :options="pos_type" :value="scope.row.type" />
+            </template>
+          </el-table-column>
+          <el-table-column label="商户名称" align="center" prop="merchantName" />
+          <el-table-column label="刷卡费率" align="center" prop="rate" />
+          <el-table-column label="费率+" align="center" prop="ratePlus" />
+          <el-table-column label="结算卡" align="center" prop="bankNameCode" />
+          <el-table-column label="商户类型" align="center" prop="merchantType">
+            <template #default="scope">
+              <dict-tag :options="merchant_type" :value="scope.row.merchantType" />
+            </template>
+          </el-table-column>
+          <el-table-column label="商户码" align="center" prop="merchantCode" />
           <el-table-column label="操作" 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">
-                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id,scope.row)"></el-button>
+                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
                 </el-tooltip>
               </div>
             </template>
@@ -93,63 +65,48 @@
     <!-- 添加或修改pos机信息对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="posmachineRef" :model="form" :rules="rules" label-width="120px">
-                        <el-form-item label="pos机名称" prop="name">
-                          <el-input v-model="form.name" placeholder="请输入pos机名称" />
-                        </el-form-item>
-                        <el-form-item label="类型" prop="type">
-                          <el-select v-model="form.type" placeholder="请选择类型">
-                            <el-option
-                                v-for="dict in pos_type"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"
-                            ></el-option>
-                          </el-select>
-                        </el-form-item>
-                        <el-form-item label="编号" prop="code">
-                          <el-input v-model="form.code" placeholder="请输入编号" />
-                        </el-form-item>
-                        <el-form-item label="结算卡" prop="debitCard">
-                          <el-select v-model="form.debitCard" placeholder="请选择结算卡" clearable>
-                          <el-option v-for="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCode" :value="debitCard.id" />
-                         </el-select>
-                        </el-form-item>
-                        <el-form-item label="厂商" prop="manufacture">
-                          <el-input v-model="form.manufacture" placeholder="请输入厂商" />
-                        </el-form-item>
-                        <el-form-item label="支付公司" prop="payCompany">
-                          <el-input v-model="form.payCompany" placeholder="请输入支付公司" />
-                        </el-form-item>
-                        <el-form-item label="商户名称" prop="merchantName">
-                          <el-input v-model="form.merchantName" placeholder="请输入商户名称" />
-                        </el-form-item>
-                        <el-form-item label="刷卡费率" prop="rate">
-                          <el-input v-model="form.rate" placeholder="请输入刷卡费率" />
-                        </el-form-item>
-                        <el-form-item label="商户类型" prop="merchantType">
-                          <el-select v-model="form.merchantType" placeholder="请选择商户类型">
-                            <el-option
-                                v-for="dict in merchant_type"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"
-                            ></el-option>
-                          </el-select>
-                        </el-form-item>
-                        <el-form-item label="商户码" prop="merchantCode">
-                          <el-input v-model="form.merchantCode" placeholder="请输入商户码" />
-                        </el-form-item>
-                        <el-form-item label="启用日期" prop="activationDate">
-                          <el-date-picker clearable
-                                          v-model="form.activationDate"
-                                          type="date"
-                                          value-format="YYYY-MM-DD"
-                                          placeholder="请选择启用日期">
-                          </el-date-picker>
-                        </el-form-item>
-                        <el-form-item label="备注" prop="remark">
-                          <el-input v-model="form.remark"  type="textarea" placeholder="请输入备注" />
-                        </el-form-item>
+        <el-form-item label="pos机名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入pos机名称" />
+        </el-form-item>
+        <el-form-item label="类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择类型">
+            <el-option v-for="dict in pos_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="编号" prop="code">
+          <el-input v-model="form.code" placeholder="请输入编号" />
+        </el-form-item>
+        <el-form-item label="结算卡" prop="debitCard">
+          <el-select v-model="form.debitCard" placeholder="请选择结算卡" clearable>
+            <el-option v-for="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCode" :value="debitCard.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="厂商" prop="manufacture">
+          <el-input v-model="form.manufacture" placeholder="请输入厂商" />
+        </el-form-item>
+        <el-form-item label="支付公司" prop="payCompany">
+          <el-input v-model="form.payCompany" placeholder="请输入支付公司" />
+        </el-form-item>
+        <el-form-item label="商户名称" prop="merchantName">
+          <el-input v-model="form.merchantName" placeholder="请输入商户名称" />
+        </el-form-item>
+        <el-form-item label="刷卡费率" prop="rate">
+          <el-input v-model="form.rate" placeholder="请输入刷卡费率" />
+        </el-form-item>
+        <el-form-item label="商户类型" prop="merchantType">
+          <el-select v-model="form.merchantType" placeholder="请选择商户类型">
+            <el-option v-for="dict in merchant_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="商户码" prop="merchantCode">
+          <el-input v-model="form.merchantCode" placeholder="请输入商户码" />
+        </el-form-item>
+        <el-form-item label="启用日期" prop="activationDate">
+          <el-date-picker clearable v-model="form.activationDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择启用日期"> </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
+        </el-form-item>
       </el-form>
       <template v-if="title !== '查看pos机信息'" #footer>
         <div class="dialog-footer">
@@ -199,33 +156,15 @@ const data = reactive({
     pageSize: 1000
   },
   rules: {
-    name: [
-      { required: true, message: 'pos机名称不能为空', trigger: 'blur' }
-    ],
-    code: [
-      { required: true, message: '编码不能为空', trigger: 'blur' }
-    ],
-    payCompany: [
-      { required: true, message: '支付公司不能为空', trigger: 'blur' }
-    ],
-    type: [
-      { required: true, message: '类型不能为空', trigger: 'change' }
-    ],
-    manufacture: [
-      { required: true, message: '厂商不能为空', trigger: 'blur' }
-    ],
-    merchantName: [
-      { required: true, message: '商户名称不能为空', trigger: 'blur' }
-    ],
-    rate: [
-      { required: true, message: '刷卡费率不能为空', trigger: 'blur' }
-    ],
-    debitCard: [
-      { required: true, message: '结算卡不能为空', trigger: 'blur' }
-    ],
-    merchantType: [
-      { required: true, message: '商户类型不能为空', trigger: 'change' }
-    ]
+    name: [{ required: true, message: 'pos机名称不能为空', trigger: 'blur' }],
+    code: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
+    payCompany: [{ required: true, message: '支付公司不能为空', trigger: 'blur' }],
+    type: [{ required: true, message: '类型不能为空', trigger: 'change' }],
+    manufacture: [{ required: true, message: '厂商不能为空', trigger: 'blur' }],
+    merchantName: [{ required: true, message: '商户名称不能为空', trigger: 'blur' }],
+    rate: [{ required: true, message: '刷卡费率不能为空', trigger: 'blur' }],
+    debitCard: [{ required: true, message: '结算卡不能为空', trigger: 'blur' }],
+    merchantType: [{ required: true, message: '商户类型不能为空', trigger: 'change' }]
   }
 })
 
@@ -255,9 +194,9 @@ function getDebitCardList() {
 }
 
 /** 查询pos机信息列表 */
-function getList () {
+function getList() {
   loading.value = true
-  listPosmachine(queryParams.value).then(response => {
+  listPosmachine(queryParams.value).then((response) => {
     posmachineList.value = response.rows
     total.value = response.total
     loading.value = false
@@ -271,7 +210,7 @@ function cancel() {
 }
 
 // 表单重置
-function reset () {
+function reset() {
   form.value = {
     id: null,
     name: null,
@@ -296,13 +235,13 @@ function reset () {
 }
 
 /** 搜索按钮操作 */
-function handleQuery () {
+function handleQuery() {
   queryParams.value.pageNum = 1
   getList()
 }
 
 /** 重置按钮操作 */
-function resetQuery () {
+function resetQuery() {
   proxy.resetForm('queryRef')
   handleQuery()
 }
@@ -314,8 +253,8 @@ const handleCurrentChange = (val) => {
 }
 
 // 多选框选中数据
-function handleSelectionChange (selection) {
-  ids.value = selection.map(item => item.id)
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id)
   single.value = selection.length !== 1
   multiple.value = !selection.length
 }
@@ -328,17 +267,17 @@ const handleView = (row) => {
 }
 
 /** 新增按钮操作 */
-function handleAdd () {
+function handleAdd() {
   reset()
   open.value = true
   title.value = '添加pos机信息'
 }
 
 /** 修改按钮操作 */
-function handleUpdate (row) {
+function handleUpdate(row) {
   reset()
   const _id = row.id || ids.value
-  getPosmachine(_id).then(response => {
+  getPosmachine(_id).then((response) => {
     form.value = response.data
     open.value = true
     title.value = '修改pos机信息'
@@ -346,17 +285,17 @@ function handleUpdate (row) {
 }
 
 /** 提交按钮 */
-function submitForm () {
-  proxy.$refs.posmachineRef.validate(valid => {
+function submitForm() {
+  proxy.$refs.posmachineRef.validate((valid) => {
     if (valid) {
       if (form.value.id != null) {
-        updatePosmachine(form.value).then(response => {
+        updatePosmachine(form.value).then((response) => {
           proxy.$modal.msgSuccess('修改成功')
           open.value = false
           getList()
         })
       } else {
-        addPosmachine(form.value).then(response => {
+        addPosmachine(form.value).then((response) => {
           proxy.$modal.msgSuccess('新增成功')
           open.value = false
           getList()
@@ -367,21 +306,29 @@ function submitForm () {
 }
 
 /** 删除按钮操作 */
-function handleDelete (row) {
+function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除选中的数据项？').then(function() {
-    return delPosmachine(_ids)
-  }).then(() => {
-    getList()
-    proxy.$modal.msgSuccess('删除成功')
-  }).catch(() => {})
+  proxy.$modal
+    .confirm('是否确认删除选中的数据项？')
+    .then(function () {
+      return delPosmachine(_ids)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('删除成功')
+    })
+    .catch(() => {})
 }
 
 /** 导出按钮操作 */
-function handleExport () {
-  proxy.download('invest/posmachine/export', {
-    ...queryParams.value
-  }, `posmachine_${new Date().getTime()}.xlsx`)
+function handleExport() {
+  proxy.download(
+    'invest/posmachine/export',
+    {
+      ...queryParams.value
+    },
+    `posmachine_${new Date().getTime()}.xlsx`
+  )
 }
 getDebitCardList()
 getList()
diff --git a/src/views/invest/stocks/index.vue b/src/views/invest/stocks/index.vue
index 9c4f47c..76ef99f 100644
--- a/src/views/invest/stocks/index.vue
+++ b/src/views/invest/stocks/index.vue
@@ -3,14 +3,9 @@
     <div class="search-con">
       <div class="title">查询条件</div>
       <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
-                    <el-form-item label="名称" prop="name">
-                      <el-input
-                          v-model="queryParams.name"
-                          placeholder="请输入名称"
-                          clearable
-                          @keyup.enter="handleQuery"
-                      />
-                    </el-form-item>
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="queryParams.name" placeholder="请输入名称" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
       </el-form>
       <div class="search-btn-con">
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -21,42 +16,29 @@
       <div class="title-con">
         <div class="title">基本信息</div>
         <div class="operate-btn-con">
-          <el-button
-              @click="handleAdd"
-              icon="Plus"
-              v-hasPermi="['invest:futureStocks:add']"
-          >新增</el-button>
-          <el-button
-              :disabled="multiple"
-              icon="Delete"
-              @click="handleDelete"
-              v-hasPermi="['invest:futureStocks:remove']"
-          >删除</el-button>
-          <el-button
-              @click="handleExport"
-              icon="Download"
-              v-hasPermi="['invest:futureStocks:export']"
-          >导出</el-button>
+          <el-button @click="handleAdd" icon="Plus" v-hasPermi="['invest:futureStocks:add']">新增</el-button>
+          <el-button :disabled="multiple" icon="Delete" @click="handleDelete" v-hasPermi="['invest:futureStocks:remove']">删除</el-button>
+          <el-button @click="handleExport" icon="Download" v-hasPermi="['invest:futureStocks:export']">导出</el-button>
         </div>
       </div>
       <div class="content-con" v-loading="loading">
-        <el-table v-loading="loading" :data="futureStocksList" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="futureStocksList" @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="code" />
-                  <el-table-column label="手续费" align="center" prop="commission" />
-                  <el-table-column label="关联储蓄卡" align="center" prop="bankNameCode" />
-                  <el-table-column label="开户日期" align="center" prop="activationDate" width="180">
-                    <template #default="scope">
-                      <span>{{ parseTime(scope.row.activationDate, '{y}-{m}-{d}') }}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="备注" align="center" prop="remark" />
+          <el-table-column label="名称" align="center" prop="name" />
+          <el-table-column label="账号" align="center" prop="code" />
+          <el-table-column label="手续费" align="center" prop="commission" />
+          <el-table-column label="关联储蓄卡" align="center" prop="bankNameCode" />
+          <el-table-column label="开户日期" align="center" prop="activationDate" width="180">
+            <template #default="scope">
+              <span>{{ parseTime(scope.row.activationDate, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" align="center" prop="remark" />
           <el-table-column label="操作" 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">
-                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id,scope.row)"></el-button>
+                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
                 </el-tooltip>
               </div>
             </template>
@@ -68,34 +50,29 @@
     <!-- 添加或修改期货对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="futureStocksRef" :model="form" :rules="rules" label-width="140px">
-                        <el-form-item label="名称" prop="name">
-                          <el-input v-model="form.name" placeholder="请输入名称" />
-                        </el-form-item>
-                        <el-form-item label="账号" prop="code">
-                          <el-input v-model="form.code" placeholder="请输入账号" />
-                        </el-form-item>
-                        <el-form-item label="密码" prop="password">
-                          <el-input v-model="form.password" placeholder="请输入密码" />
-                        </el-form-item>
-                        <el-form-item label="关联储蓄卡" prop="debitCard">
-                          <el-select v-model="form.debitCard" placeholder="请选择关联储蓄卡" clearable>
-                          <el-option v-for="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCode" :value="debitCard.id" />
-                         </el-select>
-                        </el-form-item>
-                        <el-form-item label="开户日期" prop="activationDate">
-                          <el-date-picker clearable
-                                          v-model="form.activationDate"
-                                          type="date"
-                                          value-format="YYYY-MM-DD"
-                                          placeholder="请选择开户日期">
-                          </el-date-picker>
-                        </el-form-item>
-                        <el-form-item label="手续费" prop="commission">
-                          <el-input v-model="form.commission" placeholder="请输入手续费" />
-                        </el-form-item>
-                        <el-form-item label="备注" prop="remark">
-                          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-                        </el-form-item>
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入名称" />
+        </el-form-item>
+        <el-form-item label="账号" prop="code">
+          <el-input v-model="form.code" placeholder="请输入账号" />
+        </el-form-item>
+        <el-form-item label="密码" prop="password">
+          <el-input v-model="form.password" placeholder="请输入密码" />
+        </el-form-item>
+        <el-form-item label="关联储蓄卡" prop="debitCard">
+          <el-select v-model="form.debitCard" placeholder="请选择关联储蓄卡" clearable>
+            <el-option v-for="debitCard in debitCardList" :key="debitCard.id" :label="debitCard.nameCode" :value="debitCard.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="开户日期" prop="activationDate">
+          <el-date-picker clearable v-model="form.activationDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择开户日期"> </el-date-picker>
+        </el-form-item>
+        <el-form-item label="手续费" prop="commission">
+          <el-input v-model="form.commission" placeholder="请输入手续费" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
       </el-form>
       <template v-if="title !== '查看股票信息'" #footer>
         <div class="dialog-footer">
@@ -144,30 +121,14 @@ const data = reactive({
     pageSize: 1000
   },
   rules: {
-    name: [
-      { required: true, message: '名称不能为空', trigger: 'blur' }
-    ],
-    code: [
-      { required: true, message: '账号不能为空', trigger: 'blur' }
-    ],
-    password: [
-      { required: true, message: '密码不能为空', trigger: 'blur' }
-    ],
-    tradingCenterCode: [
-      { required: true, message: '期货交易中心账号不能为空', trigger: 'blur' }
-    ],
-    tradingCenterPassword: [
-      { required: true, message: '期货交易中心密码不能为空', trigger: 'blur' }
-    ],
-    fundPassword: [
-      { required: true, message: '资金密码不能为空', trigger: 'blur' }
-    ],
-    debitCard: [
-      { required: true, message: '关联储蓄卡不能为空', trigger: 'blur' }
-    ],
-    activationDate: [
-      { required: true, message: '开户日期不能为空', trigger: 'blur' }
-    ]
+    name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+    code: [{ required: true, message: '账号不能为空', trigger: 'blur' }],
+    password: [{ required: true, message: '密码不能为空', trigger: 'blur' }],
+    tradingCenterCode: [{ required: true, message: '期货交易中心账号不能为空', trigger: 'blur' }],
+    tradingCenterPassword: [{ required: true, message: '期货交易中心密码不能为空', trigger: 'blur' }],
+    fundPassword: [{ required: true, message: '资金密码不能为空', trigger: 'blur' }],
+    debitCard: [{ required: true, message: '关联储蓄卡不能为空', trigger: 'blur' }],
+    activationDate: [{ required: true, message: '开户日期不能为空', trigger: 'blur' }]
   }
 })
 
@@ -197,9 +158,9 @@ function getDebitCardList() {
 }
 
 /** 查询股票信息列表 */
-function getList () {
+function getList() {
   loading.value = true
-  listFutureStocks(queryParams.value).then(response => {
+  listFutureStocks(queryParams.value).then((response) => {
     futureStocksList.value = response.rows
     total.value = response.total
     loading.value = false
@@ -213,7 +174,7 @@ function cancel() {
 }
 
 // 表单重置
-function reset () {
+function reset() {
   form.value = {
     id: null,
     name: null,
@@ -238,13 +199,13 @@ function reset () {
 }
 
 /** 搜索按钮操作 */
-function handleQuery () {
+function handleQuery() {
   queryParams.value.pageNum = 1
   getList()
 }
 
 /** 重置按钮操作 */
-function resetQuery () {
+function resetQuery() {
   proxy.resetForm('queryRef')
   handleQuery()
 }
@@ -256,8 +217,8 @@ const handleCurrentChange = (val) => {
 }
 
 // 多选框选中数据
-function handleSelectionChange (selection) {
-  ids.value = selection.map(item => item.id)
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id)
   single.value = selection.length !== 1
   multiple.value = !selection.length
 }
@@ -270,17 +231,17 @@ const handleView = (row) => {
 }
 
 /** 新增按钮操作 */
-function handleAdd () {
+function handleAdd() {
   reset()
   open.value = true
   title.value = '添加股票信息'
 }
 
 /** 修改按钮操作 */
-function handleUpdate (row) {
+function handleUpdate(row) {
   reset()
   const _id = row.id || ids.value
-  getFutureStocks(_id).then(response => {
+  getFutureStocks(_id).then((response) => {
     form.value = response.data
     open.value = true
     title.value = '修改股票信息'
@@ -288,17 +249,17 @@ function handleUpdate (row) {
 }
 
 /** 提交按钮 */
-function submitForm () {
-  proxy.$refs.futureStocksRef.validate(valid => {
+function submitForm() {
+  proxy.$refs.futureStocksRef.validate((valid) => {
     if (valid) {
       if (form.value.id != null) {
-        updateFutureStocks(form.value).then(response => {
+        updateFutureStocks(form.value).then((response) => {
           proxy.$modal.msgSuccess('修改成功')
           open.value = false
           getList()
         })
       } else {
-        addFutureStocks(form.value).then(response => {
+        addFutureStocks(form.value).then((response) => {
           proxy.$modal.msgSuccess('新增成功')
           open.value = false
           getList()
@@ -309,21 +270,29 @@ function submitForm () {
 }
 
 /** 删除按钮操作 */
-function handleDelete (row) {
+function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除选中的数据项？').then(function() {
-    return delFutureStocks(_ids)
-  }).then(() => {
-    getList()
-    proxy.$modal.msgSuccess('删除成功')
-  }).catch(() => {})
+  proxy.$modal
+    .confirm('是否确认删除选中的数据项？')
+    .then(function () {
+      return delFutureStocks(_ids)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('删除成功')
+    })
+    .catch(() => {})
 }
 
 /** 导出按钮操作 */
-function handleExport () {
-  proxy.download('invest/futureStocks/export', {
-    ...queryParams.value
-  }, `futureStocks_${new Date().getTime()}.xlsx`)
+function handleExport() {
+  proxy.download(
+    'invest/futureStocks/export',
+    {
+      ...queryParams.value
+    },
+    `futureStocks_${new Date().getTime()}.xlsx`
+  )
 }
 getDebitCardList()
 getList()
diff --git a/src/views/invest/stocksBill/index.vue b/src/views/invest/stocksBill/index.vue
index a711792..ee5c36d 100644
--- a/src/views/invest/stocksBill/index.vue
+++ b/src/views/invest/stocksBill/index.vue
@@ -4,18 +4,13 @@
       <div class="title">查询条件</div>
       <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
         <el-form-item label="股票账户" prop="futureStocksId">
-                      <el-select v-model="queryParams.futureStocksId" placeholder="请选择股票账户" clearable>
-                          <el-option v-for="futureStocks in futureStocksList" :key="futureStocks.id" :label="futureStocks.nameCode" :value="futureStocks.id" />
-                         </el-select>
-                    </el-form-item>
-                    <el-form-item label="账单名称" prop="name">
-                      <el-input
-                          v-model="queryParams.name"
-                          placeholder="请输入账单名称"
-                          clearable
-                          @keyup.enter="handleQuery"
-                      />
-                    </el-form-item>
+          <el-select v-model="queryParams.futureStocksId" placeholder="请选择股票账户" clearable>
+            <el-option v-for="futureStocks in futureStocksList" :key="futureStocks.id" :label="futureStocks.nameCode" :value="futureStocks.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="账单名称" prop="name">
+          <el-input v-model="queryParams.name" placeholder="请输入账单名称" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
       </el-form>
       <div class="search-btn-con">
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -26,36 +21,23 @@
       <div class="title-con">
         <div class="title">基本信息</div>
         <div class="operate-btn-con">
-          <el-button
-              @click="handleAdd"
-              icon="Plus"
-              v-hasPermi="['invest:futureStocksBill:add']"
-          >新增</el-button>
-          <el-button
-              :disabled="multiple"
-              icon="Delete"
-              @click="handleDelete"
-              v-hasPermi="['invest:futureStocksBill:remove']"
-          >删除</el-button>
-          <el-button
-              @click="handleExport"
-              icon="Download"
-              v-hasPermi="['invest:futureStocksBill:export']"
-          >导出</el-button>
+          <el-button @click="handleAdd" icon="Plus" v-hasPermi="['invest:futureStocksBill:add']">新增</el-button>
+          <el-button :disabled="multiple" icon="Delete" @click="handleDelete" v-hasPermi="['invest:futureStocksBill:remove']">删除</el-button>
+          <el-button @click="handleExport" icon="Download" v-hasPermi="['invest:futureStocksBill:export']">导出</el-button>
         </div>
       </div>
       <div class="content-con" v-loading="loading">
-        <el-table v-loading="loading" :data="futureStocksBillList" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="futureStocksBillList" @selection-change="handleSelectionChange" height="calc(100% - 0.62rem)">
           <el-table-column type="selection" width="55" align="center" />
-                  <el-table-column label="股票账户" align="center" prop="futureStocksNameCode" />
-                  <el-table-column label="账单名称" align="center" prop="name" />
-                  <el-table-column label="账单周期" align="center" prop="billDatePeriod" />
-                  <el-table-column label="股票收益" align="center" prop="billAmount" />
+          <el-table-column label="股票账户" align="center" prop="futureStocksNameCode" />
+          <el-table-column label="账单名称" align="center" prop="name" />
+          <el-table-column label="账单周期" align="center" prop="billDatePeriod" />
+          <el-table-column label="股票收益" align="center" prop="billAmount" />
           <el-table-column label="操作" 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">
-                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id,scope.row)"></el-button>
+                  <el-button :icon="item.icon" :v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
                 </el-tooltip>
               </div>
             </template>
@@ -68,21 +50,16 @@
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="futureStocksBillRef" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="股票账户" prop="futureStocksId">
-                          <el-select v-model="form.futureStocksId" placeholder="请选择股票账户" clearable>
-                            <el-option v-for="futureStocks in futureStocksList" :key="futureStocks.id" :label="futureStocks.nameCode" :value="futureStocks.id" />
-                         </el-select>
-                        </el-form-item>
-                        <el-form-item label="账单日" prop="billDate">
-                          <el-date-picker clearable
-                                          v-model="form.billDate"
-                                          type="date"
-                                          value-format="YYYY-MM-DD"
-                                          placeholder="请选择账单日">
-                          </el-date-picker>
-                        </el-form-item>
-                        <el-form-item label="股票收益" prop="billAmount">
-                          <el-input v-model="form.billAmount" placeholder="请输入股票收益" />
-                        </el-form-item>
+          <el-select v-model="form.futureStocksId" placeholder="请选择股票账户" clearable>
+            <el-option v-for="futureStocks in futureStocksList" :key="futureStocks.id" :label="futureStocks.nameCode" :value="futureStocks.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="账单日" prop="billDate">
+          <el-date-picker clearable v-model="form.billDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择账单日"> </el-date-picker>
+        </el-form-item>
+        <el-form-item label="股票收益" prop="billAmount">
+          <el-input v-model="form.billAmount" placeholder="请输入股票收益" />
+        </el-form-item>
       </el-form>
       <template v-if="title !== '查看股票账单'" #footer>
         <div class="dialog-footer">
@@ -135,15 +112,9 @@ const data = reactive({
     pageSize: 1000
   },
   rules: {
-    billDate: [
-      { required: true, message: '账单日不能为空', trigger: 'blur' }
-    ],
-    futureStocksId: [
-      { required: true, message: '股票账户不能为空', trigger: 'blur' }
-    ],
-    billAmount: [
-      { required: true, message: '股票收益不能为空', trigger: 'blur' }
-    ]
+    billDate: [{ required: true, message: '账单日不能为空', trigger: 'blur' }],
+    futureStocksId: [{ required: true, message: '股票账户不能为空', trigger: 'blur' }],
+    billAmount: [{ required: true, message: '股票收益不能为空', trigger: 'blur' }]
   }
 })
 
@@ -173,9 +144,9 @@ function getFutureStocksList() {
 }
 
 /** 查询股票账单列表 */
-function getList () {
+function getList() {
   loading.value = true
-  listFutureStocksBill(queryParams.value).then(response => {
+  listFutureStocksBill(queryParams.value).then((response) => {
     futureStocksBillList.value = response.rows
     total.value = response.total
     loading.value = false
@@ -189,7 +160,7 @@ function cancel() {
 }
 
 // 表单重置
-function reset () {
+function reset() {
   form.value = {
     id: null,
     name: null,
@@ -210,13 +181,13 @@ function reset () {
 }
 
 /** 搜索按钮操作 */
-function handleQuery () {
+function handleQuery() {
   queryParams.value.pageNum = 1
   getList()
 }
 
 /** 重置按钮操作 */
-function resetQuery () {
+function resetQuery() {
   proxy.resetForm('queryRef')
   handleQuery()
 }
@@ -228,8 +199,8 @@ const handleCurrentChange = (val) => {
 }
 
 // 多选框选中数据
-function handleSelectionChange (selection) {
-  ids.value = selection.map(item => item.id)
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id)
   single.value = selection.length !== 1
   multiple.value = !selection.length
 }
@@ -242,17 +213,17 @@ const handleView = (row) => {
 }
 
 /** 新增按钮操作 */
-function handleAdd () {
+function handleAdd() {
   reset()
   open.value = true
   title.value = '添加股票账单'
 }
 
 /** 修改按钮操作 */
-function handleUpdate (row) {
+function handleUpdate(row) {
   reset()
   const _id = row.id || ids.value
-  getFutureStocksBill(_id).then(response => {
+  getFutureStocksBill(_id).then((response) => {
     form.value = response.data
     open.value = true
     title.value = '修改股票账单'
@@ -260,17 +231,17 @@ function handleUpdate (row) {
 }
 
 /** 提交按钮 */
-function submitForm () {
-  proxy.$refs.futureStocksBillRef.validate(valid => {
+function submitForm() {
+  proxy.$refs.futureStocksBillRef.validate((valid) => {
     if (valid) {
       if (form.value.id != null) {
-        updateFutureStocksBill(form.value).then(response => {
+        updateFutureStocksBill(form.value).then((response) => {
           proxy.$modal.msgSuccess('修改成功')
           open.value = false
           getList()
         })
       } else {
-        addFutureStocksBill(form.value).then(response => {
+        addFutureStocksBill(form.value).then((response) => {
           proxy.$modal.msgSuccess('新增成功')
           open.value = false
           getList()
@@ -281,21 +252,29 @@ function submitForm () {
 }
 
 /** 删除按钮操作 */
-function handleDelete (row) {
+function handleDelete(row) {
   const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除选中的数据项？').then(function() {
-    return delFutureStocksBill(_ids)
-  }).then(() => {
-    getList()
-    proxy.$modal.msgSuccess('删除成功')
-  }).catch(() => {})
+  proxy.$modal
+    .confirm('是否确认删除选中的数据项？')
+    .then(function () {
+      return delFutureStocksBill(_ids)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('删除成功')
+    })
+    .catch(() => {})
 }
 
 /** 导出按钮操作 */
-function handleExport () {
-  proxy.download('invest/futureStocksBill/export', {
-    ...queryParams.value
-  }, `futureStocksBill_${new Date().getTime()}.xlsx`)
+function handleExport() {
+  proxy.download(
+    'invest/futureStocksBill/export',
+    {
+      ...queryParams.value
+    },
+    `futureStocksBill_${new Date().getTime()}.xlsx`
+  )
 }
 getFutureStocksList()
 getList()
diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue
index fe4863f..f0d1059 100644
--- a/src/views/monitor/job/index.vue
+++ b/src/views/monitor/job/index.vue
@@ -35,7 +35,7 @@
         </div>
       </div>
       <div class="content-con" v-loading="loading">
-        <el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange" stripe height="calc(100% - 0.64rem)">
+        <el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange" stripe height="calc(100% - 0.62rem)">
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="任务编号" width="100" align="center" prop="jobId" />
           <el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />
diff --git a/src/views/monitor/job/log.vue b/src/views/monitor/job/log.vue
index f71a501..f035188 100644
--- a/src/views/monitor/job/log.vue
+++ b/src/views/monitor/job/log.vue
@@ -1,192 +1,141 @@
 <template>
-   <div class="app-container">
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-         <el-form-item label="任务名称" prop="jobName">
-            <el-input
-               v-model="queryParams.jobName"
-               placeholder="请输入任务名称"
-               clearable
-               style="width: 240px"
-               @keyup.enter="handleQuery"
-            />
-         </el-form-item>
-         <el-form-item label="任务组名" prop="jobGroup">
-            <el-select
-               v-model="queryParams.jobGroup"
-               placeholder="请选择任务组名"
-               clearable
-               style="width: 240px"
-            >
-               <el-option
-                  v-for="dict in sys_job_group"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-               />
-            </el-select>
-         </el-form-item>
-         <el-form-item label="执行状态" prop="status">
-            <el-select
-               v-model="queryParams.status"
-               placeholder="请选择执行状态"
-               clearable
-               style="width: 240px"
-            >
-               <el-option
-                  v-for="dict in sys_common_status"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-               />
-            </el-select>
-         </el-form-item>
-         <el-form-item label="执行时间" style="width: 308px">
-            <el-date-picker
-               v-model="dateRange"
-               value-format="YYYY-MM-DD"
-               type="daterange"
-               range-separator="-"
-               start-placeholder="开始日期"
-               end-placeholder="结束日期"
-            ></el-date-picker>
-         </el-form-item>
-         <el-form-item>
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-         </el-form-item>
+  <div class="app-container">
+    <div class="search-con" ref="searchHeightRef">
+      <div class="title">查询条件</div>
+      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+        <el-form-item label="任务名称" prop="jobName">
+          <el-input v-model="queryParams.jobName" placeholder="请输入任务名称" clearable style="width: 200px" @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="任务组名" prop="jobGroup">
+          <el-select v-model="queryParams.jobGroup" placeholder="请选择任务组名" clearable style="width: 200px">
+            <el-option v-for="dict in sys_job_group" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="任务状态" prop="status">
+          <el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable style="width: 200px">
+            <el-option v-for="dict in sys_common_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="执行时间" style="width: 308px">
+          <el-date-picker
+            v-model="dateRange"
+            value-format="YYYY-MM-DD"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
+        </el-form-item>
       </el-form>
-
-      <el-row :gutter="10" class="mb8">
-         <el-col :span="1.5">
-            <el-button
-               type="danger"
-               plain
-               icon="Delete"
-               :disabled="multiple"
-               @click="handleDelete"
-               v-hasPermi="['monitor:job:remove']"
-            >删除</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button
-               type="danger"
-               plain
-               icon="Delete"
-               @click="handleClean"
-               v-hasPermi="['monitor:job:remove']"
-            >清空</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button
-               type="warning"
-               plain
-               icon="Download"
-               @click="handleExport"
-               v-hasPermi="['monitor:job:export']"
-            >导出</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button 
-               type="warning" 
-               plain 
-               icon="Close"
-               @click="handleClose"
-            >关闭</el-button>
-         </el-col>
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
-
-      <el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange">
-         <el-table-column type="selection" width="55" align="center" />
-         <el-table-column label="日志编号" width="80" align="center" prop="jobLogId" />
-         <el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />
-         <el-table-column label="任务组名" align="center" prop="jobGroup" :show-overflow-tooltip="true">
+      <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: mainStyleHeight }">
+      <div class="title-con">
+        <div class="title">基本信息</div>
+        <div class="operate-btn-con">
+          <el-button icon="Delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['monitor:job:remove']">删除</el-button>
+          <el-button icon="Delete" @click="handleClean" v-hasPermi="['monitor:job:remove']">清空</el-button>
+          <el-button icon="Download" @click="handleExport" v-hasPermi="['monitor:job:export']">导出</el-button>
+          <el-button icon="Close" @click="handleClose" v-hasPermi="['monitor:job:query']">关闭</el-button>
+          <!-- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> -->
+        </div>
+      </div>
+      <div class="content-con" v-loading="loading">
+        <el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="日志编号" width="80" align="center" prop="jobLogId" />
+          <el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />
+          <el-table-column label="任务组名" align="center" prop="jobGroup" :show-overflow-tooltip="true">
             <template #default="scope">
-               <dict-tag :options="sys_job_group" :value="scope.row.jobGroup" />
+              <dict-tag :options="sys_job_group" :value="scope.row.jobGroup" />
             </template>
-         </el-table-column>
-         <el-table-column label="调用目标字符串" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />
-         <el-table-column label="日志信息" align="center" prop="jobMessage" :show-overflow-tooltip="true" />
-         <el-table-column label="执行状态" align="center" prop="status">
+          </el-table-column>
+          <el-table-column label="调用目标字符串" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />
+          <el-table-column label="日志信息" align="center" prop="jobMessage" :show-overflow-tooltip="true" />
+          <el-table-column label="执行状态" align="center" prop="status">
             <template #default="scope">
-               <dict-tag :options="sys_common_status" :value="scope.row.status" />
+              <dict-tag :options="sys_common_status" :value="scope.row.status" />
             </template>
-         </el-table-column>
-         <el-table-column label="执行时间" align="center" prop="createTime" width="180">
+          </el-table-column>
+          <el-table-column label="执行时间" align="center" prop="createTime" width="180">
             <template #default="scope">
-               <span>{{ parseTime(scope.row.createTime) }}</span>
+              <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
-         </el-table-column>
-         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          </el-table-column>
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template #default="scope">
-               <el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['monitor:job:query']">详细</el-button>
+              <el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['monitor:job:query']">详细</el-button>
             </template>
-         </el-table-column>
-      </el-table>
-
-      <pagination
-         v-show="total > 0"
-         :total="total"
-         v-model:page="queryParams.pageNum"
-         v-model:limit="queryParams.pageSize"
-         @pagination="getList"
-      />
-
-      <!-- 调度日志详细 -->
-      <el-dialog title="调度日志详细" v-model="open" width="700px" append-to-body>
-         <el-form :model="form" label-width="100px">
-            <el-row>
-               <el-col :span="12">
-                  <el-form-item label="日志序号：">{{ form.jobLogId }}</el-form-item>
-                  <el-form-item label="任务名称：">{{ form.jobName }}</el-form-item>
-               </el-col>
-               <el-col :span="12">
-                  <el-form-item label="任务分组：">{{ form.jobGroup }}</el-form-item>
-                  <el-form-item label="执行时间：">{{ form.createTime }}</el-form-item>
-               </el-col>
-               <el-col :span="24">
-                  <el-form-item label="调用方法：">{{ form.invokeTarget }}</el-form-item>
-               </el-col>
-               <el-col :span="24">
-                  <el-form-item label="日志信息：">{{ form.jobMessage }}</el-form-item>
-               </el-col>
-               <el-col :span="24">
-                  <el-form-item label="执行状态：">
-                     <div v-if="form.status == 0">正常</div>
-                     <div v-else-if="form.status == 1">失败</div>
-                  </el-form-item>
-               </el-col>
-               <el-col :span="24">
-                  <el-form-item label="异常信息：" v-if="form.status == 1">{{ form.exceptionInfo }}</el-form-item>
-               </el-col>
-            </el-row>
-         </el-form>
-         <template #footer>
-            <div class="dialog-footer">
-               <el-button @click="open = false">关 闭</el-button>
-            </div>
-         </template>
-      </el-dialog>
-   </div>
+          </el-table-column>
+        </el-table>
+        <el-pagination
+          small
+          background
+          layout="total, prev, pager, next"
+          :total="total"
+          v-model:current-page="currentPage"
+          @current-change="handleCurrentChange"
+        />
+      </div>
+    </div>
+    <!-- 调度日志详细 -->
+    <el-dialog title="调度日志详细" v-model="open" width="700px" append-to-body>
+      <el-form :model="form" label-width="100px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="日志序号：">{{ form.jobLogId }}</el-form-item>
+            <el-form-item label="任务名称：">{{ form.jobName }}</el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="任务分组：">{{ form.jobGroup }}</el-form-item>
+            <el-form-item label="执行时间：">{{ form.createTime }}</el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="调用方法：">{{ form.invokeTarget }}</el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="日志信息：">{{ form.jobMessage }}</el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="执行状态：">
+              <div v-if="form.status == 0">正常</div>
+              <div v-else-if="form.status == 1">失败</div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="异常信息：" v-if="form.status == 1">{{ form.exceptionInfo }}</el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="open = false">关 闭</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
 </template>
 
 <script setup name="JobLog">
-import { getJob } from "@/api/monitor/job";
-import { listJobLog, delJobLog, cleanJobLog } from "@/api/monitor/jobLog";
+import { getJob } from '@/api/monitor/job'
+import { listJobLog, delJobLog, cleanJobLog } from '@/api/monitor/jobLog'
 
-const { proxy } = getCurrentInstance();
-const { sys_common_status, sys_job_group } = proxy.useDict("sys_common_status", "sys_job_group");
-
-const jobLogList = ref([]);
-const open = ref(false);
-const loading = ref(true);
-const showSearch = ref(true);
-const ids = ref([]);
-const multiple = ref(true);
-const total = ref(0);
-const dateRange = ref([]);
-const route = useRoute();
+const { proxy } = getCurrentInstance()
+const { sys_common_status, sys_job_group } = proxy.useDict('sys_common_status', 'sys_job_group')
 
+const jobLogList = ref([])
+const open = ref(false)
+const loading = ref(true)
+const showSearch = ref(true)
+const ids = ref([])
+const multiple = ref(true)
+const total = ref(0)
+const dateRange = ref([])
+const route = useRoute()
+const currentPage = ref(1)
 const data = reactive({
   form: {},
   queryParams: {
@@ -196,82 +145,100 @@ const data = reactive({
     dictType: undefined,
     status: undefined
   }
-});
+})
 
-const { queryParams, form, rules } = toRefs(data);
+const { queryParams, form, rules } = toRefs(data)
 
 /** 查询调度日志列表 */
 function getList() {
-  loading.value = true;
-  listJobLog(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
-    jobLogList.value = response.rows;
-    total.value = response.total;
-    loading.value = false;
-  });
+  loading.value = true
+  listJobLog(proxy.addDateRange(queryParams.value, dateRange.value)).then((response) => {
+    jobLogList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
 }
 // 返回按钮
 function handleClose() {
-  const obj = { path: "/monitor/job" };
-  proxy.$tab.closeOpenPage(obj);
+  const obj = { path: '/monitor/job' }
+  proxy.$tab.closeOpenPage(obj)
 }
 /** 搜索按钮操作 */
 function handleQuery() {
-  queryParams.value.pageNum = 1;
-  getList();
+  queryParams.value.pageNum = 1
+  getList()
 }
 /** 重置按钮操作 */
 function resetQuery() {
-  dateRange.value = [];
-  proxy.resetForm("queryRef");
-  handleQuery();
+  dateRange.value = []
+  proxy.resetForm('queryRef')
+  currentPage.value = 1
+  handleQuery()
 }
 // 多选框选中数据
 function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.jobLogId);
-  multiple.value = !selection.length;
+  ids.value = selection.map((item) => item.jobLogId)
+  multiple.value = !selection.length
 }
 /** 详细按钮操作 */
 function handleView(row) {
-  open.value = true;
-  form.value = row;
+  open.value = true
+  form.value = row
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  proxy.$modal.confirm('是否确认删除调度日志编号为"' + ids.value + '"的数据项?').then(function () {
-    return delJobLog(ids.value);
-  }).then(() => {
-    getList();
-    proxy.$modal.msgSuccess("删除成功");
-  }).catch(() => {});
+  proxy.$modal
+    .confirm('是否确认删除调度日志编号为"' + ids.value + '"的数据项?')
+    .then(function () {
+      return delJobLog(ids.value)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('删除成功')
+    })
+    .catch(() => {})
 }
 /** 清空按钮操作 */
 function handleClean() {
-  proxy.$modal.confirm("是否确认清空所有调度日志数据项?").then(function () {
-    return cleanJobLog();
-  }).then(() => {
-    getList();
-    proxy.$modal.msgSuccess("清空成功");
-  }).catch(() => {});
+  proxy.$modal
+    .confirm('是否确认清空所有调度日志数据项?')
+    .then(function () {
+      return cleanJobLog()
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('清空成功')
+    })
+    .catch(() => {})
 }
 /** 导出按钮操作 */
 function handleExport() {
-  proxy.download("schedule/job/log/export", {
-    ...queryParams.value,
-  }, `job_log_${new Date().getTime()}.xlsx`);
+  proxy.download(
+    'schedule/job/log/export',
+    {
+      ...queryParams.value
+    },
+    `job_log_${new Date().getTime()}.xlsx`
+  )
+}
+// 分页
+const handleCurrentChange = (val) => {
+  queryParams.value.pageNum = val
+  getList()
 }
 
-(() => {
-  const jobId = route.params && route.params.jobId;
+;(() => {
+  const jobId = route.params && route.params.jobId
   if (jobId !== undefined && jobId != 0) {
-    getJob(jobId).then(response => {
-      queryParams.value.jobName = response.data.jobName;
-      queryParams.value.jobGroup = response.data.jobGroup;
-      getList();
-    });
+    getJob(jobId).then((response) => {
+      queryParams.value.jobName = response.data.jobName
+      queryParams.value.jobGroup = response.data.jobGroup
+      getList()
+    })
   } else {
-    getList();
+    getList()
   }
-})();
+})()
 
-getList();
+getList()
 </script>
diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
index 422ca20..a6c2af2 100644
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -25,7 +25,7 @@
           :data="onlineList.slice((pageNum - 1) * pageSize, pageNum * pageSize)"
           style="width: 100%"
           stripe
-          height="calc(100% - 0.64rem)"
+          height="calc(100% - 0.62rem)"
         >
           <el-table-column label="序号" width="50" type="index" align="center">
             <template #default="scope">
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 5ced1f8..e3af29c 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -43,7 +43,7 @@
         </div>
       </div>
       <div class="content-con" v-loading="loading">
-        <el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange" stripe height="calc(100% - 0.64rem)">
+        <el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange" stripe height="calc(100% - 0.62rem)">
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="参数主键" align="center" prop="configId" />
           <el-table-column label="参数名称" align="center" prop="configName" :show-overflow-tooltip="true" />
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index 31765a7..5c0d90d 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -35,7 +35,7 @@
         </div>
       </div>
       <div class="content-con" v-loading="loading">
-        <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange" stripe height="calc(100% - 0.64rem)">
+        <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange" stripe height="calc(100% - 0.62rem)">
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="字典编码" align="center" prop="dictCode" />
           <el-table-column label="字典标签" align="center" prop="dictLabel">
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index ac2817e..6b816f6 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -43,7 +43,7 @@
         </div>
       </div>
       <div class="content-con" v-loading="loading">
-        <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange" stripe height="calc(100% - 0.64rem)">
+        <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange" stripe height="calc(100% - 0.62rem)">
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="字典编号" align="center" prop="dictId" />
           <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
diff --git a/src/views/system/logininfor/index.vue b/src/views/system/logininfor/index.vue
index b821efc..bc5dfae 100644
--- a/src/views/system/logininfor/index.vue
+++ b/src/views/system/logininfor/index.vue
@@ -51,7 +51,7 @@
           :default-sort="defaultSort"
           @sort-change="handleSortChange"
           stripe
-          height="calc(100% - 0.64rem)"
+          height="calc(100% - 0.62rem)"
         >
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="访问编号" align="center" prop="infoId" />
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index b35dd5d..0f366bd 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -31,7 +31,7 @@
           :data="menuList"
           row-key="menuId"
           :default-expand-all="isExpandAll"
-          height="calc(100% - 0.64rem)"
+          height="calc(100% - 0.62rem)"
           :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
           stripe
         >
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 83b9133..7cf95c6 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -31,7 +31,7 @@
         </div>
       </div>
       <div class="content-con" v-loading="loading">
-        <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange" stripe height="calc(100% - 0.64rem)">
+        <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange" stripe height="calc(100% - 0.62rem)">
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="序号" align="center" prop="noticeId" width="100" />
           <el-table-column label="公告标题" align="center" prop="noticeTitle" :show-overflow-tooltip="true" />
diff --git a/src/views/system/operlog/index.vue b/src/views/system/operlog/index.vue
index 626d54b..f458e88 100644
--- a/src/views/system/operlog/index.vue
+++ b/src/views/system/operlog/index.vue
@@ -57,7 +57,7 @@
           :default-sort="defaultSort"
           @sort-change="handleSortChange"
           stripe
-          height="calc(100% - 0.64rem)"
+          height="calc(100% - 0.62rem)"
         >
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="日志编号" align="center" prop="operId" />
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index aeb1cfa..addd996 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -32,7 +32,7 @@
         </div>
       </div>
       <div class="content-con" v-loading="loading">
-        <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange" stripe height="calc(100% - 0.64rem)">
+        <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange" stripe height="calc(100% - 0.62rem)">
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="岗位编号" align="center" prop="postId" />
           <el-table-column label="岗位编码" align="center" prop="postCode" />
diff --git a/src/views/system/role/authUser.vue b/src/views/system/role/authUser.vue
index 614af2c..bcf92a8 100644
--- a/src/views/system/role/authUser.vue
+++ b/src/views/system/role/authUser.vue
@@ -26,7 +26,7 @@
         </div>
       </div>
       <div class="content-con" v-loading="loading">
-        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" stripe height="calc(100% - 0.64rem)">
+        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" stripe height="calc(100% - 0.62rem)">
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
           <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index d9217d1..54786b0 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -42,7 +42,7 @@
       </div>
       <div class="content-con" v-loading="loading">
         <!-- 表格数据 -->
-        <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange" stripe height="calc(100% - 0.64rem)">
+        <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange" stripe height="calc(100% - 0.62rem)">
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="角色编号" prop="roleId" width="120" />
           <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index d11c58d..2e3793c 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -62,7 +62,7 @@
             </div>
           </div>
           <div class="content-con" v-loading="loading">
-            <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" stripe height="calc(100% - 0.64rem)">
+            <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" stripe height="calc(100% - 0.62rem)">
               <el-table-column type="selection" width="50" align="center" />
               <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
               <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index eb631ad..2f5eb47 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -37,7 +37,7 @@
         </div>
       </div>
       <div class="content-con" v-loading="loading">
-        <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange" stripe height="calc(100% - 0.64rem)">
+        <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange" stripe height="calc(100% - 0.62rem)">
           <el-table-column type="selection" align="center" width="55"></el-table-column>
           <el-table-column label="序号" type="index" width="50" align="center">
             <template #default="scope">