fix: 自测问题修复。

2024-04-28 16:56:05 +08:00
parent bcf35b092f
commit cf409fdfcf
2 changed files with 128 additions and 135 deletions
--- a/src/views/invest/accountAnalysis/index.vue
+++ b/src/views/invest/accountAnalysis/index.vue
@@ -1,41 +1,53 @@
 <template>
  <div class="app-container" style="overflow: auto">
-    <div class="header-title" ref="searchHeightRef">
-      &nbsp;&nbsp;&nbsp;&nbsp;负债信息
-        </div>
+    <div class="header-title" ref="searchHeightRef">&nbsp;&nbsp;&nbsp;&nbsp;负债信息</div>
    <div class="header-con" ref="searchHeightRef">
      <div class="item">
        <img src="./assets/one.png" alt="" />
        <div class="info-sum">
-          <div class="title">欠款总额</div>
+          <div class="title">净资产</div>
+          <div class="num">{{ netAsset }}<span>元</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="./assets/ticketSum.png" alt="" />
+        <div class="info-sum">
+          <div class="title">总负债</div>
          <div class="num">{{ totalDebt }}<span>元</span></div>
        </div>
      </div>
      <div class="item">
        <img src="./assets/ticketSum.png" alt="" />
        <div class="info-sum">
-          <div class="title">网贷欠款合计</div>
+          <div class="title">储蓄卡余额</div>
+          <div class="num">{{ debetBalance }}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="./assets/completionTime.png" alt="" />
+        <div class="info-sum">
+          <div class="title">网贷欠款</div>
          <div class="num">{{ unClearedOnlineDebt }}<span>元</span></div>
        </div>
      </div>
      <div class="item">
        <img src="./assets/completionTickets.png" alt="" />
        <div class="info-sum">
-          <div class="title">信用卡分期欠款合计</div>
-          <div class="num">{{ creditInstallmentHistory }}<span>元</span></div>
+          <div class="title">信用卡已使用额度</div>
+          <div class="num">{{ creditBalance }}<span>元</span></div>
        </div>
      </div>
      <div class="item">
-        <img src="./assets/completionTime.png" alt="" />
+        <img src="./assets/one.png" alt="" />
        <div class="info-sum">
-          <div class="title">人情欠款合计</div>
+          <div class="title">人情欠款</div>
          <div class="num">{{ peopleLendHistory }}<span>元</span></div>
        </div>
      </div>
    </div>
-    <div class="header-title" ref="searchHeightRef">
-      &nbsp;&nbsp;&nbsp;&nbsp;投资收益
-        </div>
+    <div class="header-title" ref="searchHeightRef">&nbsp;&nbsp;&nbsp;&nbsp;投资收益</div>
    <div class="header-con" ref="searchHeightRef">
      <div class="item">
        <img src="./assets/one.png" alt="" />
@@ -62,13 +74,11 @@
        <img src="./assets/completionTime.png" alt="" />
        <div class="info-sum">
          <div class="title">其他收益</div>
-          <div class="num">{{ otherIncome  }}<span>元</span></div>
+          <div class="num">{{ otherIncome }}<span>元</span></div>
        </div>
      </div>
    </div>
-    <div class="header-title" ref="searchHeightRef">
-      &nbsp;&nbsp;&nbsp;&nbsp;网贷信息
-        </div>
+    <div class="header-title" ref="searchHeightRef">&nbsp;&nbsp;&nbsp;&nbsp;网贷信息</div>
    <div class="header-con" ref="searchHeightRef">
      <div class="item">
        <img src="./assets/one.png" alt="" />
@@ -80,7 +90,7 @@
      <div class="item">
        <img src="./assets/ticketSum.png" alt="" />
        <div class="info-sum">
-          <div class="title">未结清网贷（本息）合计</div>
+          <div class="title">未结清网贷（本息）</div>
          <div class="num">{{ unClearedOnlineDebt }}<span>元</span></div>
        </div>
      </div>
@@ -88,13 +98,13 @@
        <img src="./assets/completionTickets.png" alt="" />
        <div class="info-sum">
          <div class="title">已结清网贷笔数</div>
-          <div class="num">{{ clearedOnlineDebtCount  }}<span>笔</span></div>
+          <div class="num">{{ clearedOnlineDebtCount }}<span>笔</span></div>
        </div>
      </div>
      <div class="item">
        <img src="./assets/completionTime.png" alt="" />
        <div class="info-sum">
-          <div class="title">已结清网贷（本息）合计</div>
+          <div class="title">已结清网贷（本息）</div>
          <div class="num">{{ clearedOnlineDebt }}<span>元</span></div>
        </div>
      </div>
@@ -104,27 +114,25 @@
        <img src="./assets/one.png" alt="" />
        <div class="info-sum">
          <div class="title">当月应还款</div>
-          <div class="num">{{ dueOnlineDebt}}<span>元</span></div>
+          <div class="num">{{ dueOnlineDebt }}<span>元</span></div>
        </div>
      </div>
      <div class="item">
        <img src="./assets/ticketSum.png" alt="" />
        <div class="info-sum">
          <div class="title">当月已还款</div>
-          <div class="num">{{ repaidOnlineDebt  }}<span>元</span></div>
+          <div class="num">{{ repaidOnlineDebt }}<span>元</span></div>
        </div>
      </div>
      <div class="item">
        <img src="./assets/completionTickets.png" alt="" />
        <div class="info-sum">
          <div class="title">当月待还款</div>
-          <div class="num">{{ leftOnlineDebt  }}<span>元</span></div>
+          <div class="num">{{ leftOnlineDebt }}<span>元</span></div>
        </div>
      </div>
    </div>
-    <div class="header-title" ref="searchHeightRef">
-      &nbsp;&nbsp;&nbsp;&nbsp;信用卡信息
-        </div>
+    <div class="header-title" ref="searchHeightRef">&nbsp;&nbsp;&nbsp;&nbsp;信用卡信息</div>
    <div class="header-con" ref="searchHeightRef">
      <div class="item">
        <img src="./assets/one.png" alt="" />
@@ -137,21 +145,21 @@
        <img src="./assets/ticketSum.png" alt="" />
        <div class="info-sum">
          <div class="title">总额度</div>
-          <div class="num">{{ creditLimit}}<span>元</span></div>
+          <div class="num">{{ creditLimit }}<span>元</span></div>
        </div>
      </div>
      <div class="item">
        <img src="./assets/completionTickets.png" alt="" />
        <div class="info-sum">
          <div class="title">已使用额度</div>
-          <div class="num">{{ creditBalance}}<span>元</span></div>
+          <div class="num">{{ creditBalance }}<span>元</span></div>
        </div>
      </div>
      <div class="item">
        <img src="./assets/completionTime.png" alt="" />
        <div class="info-sum">
          <div class="title">可用额度</div>
-          <div class="num">{{ creditAvailableLimit}}<span>元</span></div>
+          <div class="num">{{ creditAvailableLimit }}<span>元</span></div>
        </div>
      </div>
    </div>
@@ -160,14 +168,14 @@
        <img src="./assets/one.png" alt="" />
        <div class="info-sum">
          <div class="title">近6个月账单平均使用额度</div>
-          <div class="num">{{ lastSixMonthUsedLimit}}<span>元</span></div>
+          <div class="num">{{ lastSixMonthUsedLimit }}<span>元</span></div>
        </div>
      </div>
      <div class="item">
        <img src="./assets/ticketSum.png" alt="" />
        <div class="info-sum">
          <div class="title">近6个月账单使用率</div>
-          <div class="num">{{ lastSixMonthUsedRate}}<span>%</span></div>
+          <div class="num">{{ lastSixMonthUsedRate }}<span>%</span></div>
        </div>
      </div>
      <div class="item">
@@ -180,11 +188,10 @@
      <div class="item">
        <img src="./assets/completionTime.png" alt="" />
        <div class="info-sum">
-          <div class="title">上月账单合计</div>
-          <div class="num">{{ lastMonthUsedLimit  }}<span>元</span></div>
+          <div class="title">上月账单</div>
+          <div class="num">{{ lastMonthUsedLimit }}<span>元</span></div>
        </div>
      </div>
-
    </div>
    <div class="header-con" ref="searchHeightRef">
      <div class="item">
@@ -194,25 +201,29 @@
          <div class="num">{{ creditBillRate }}<span>%</span></div>
        </div>
      </div>
+      <div class="item">
+        <img src="./assets/completionTickets.png" alt="" />
+        <div class="info-sum">
+          <div class="title">信用卡分期欠款</div>
+          <div class="num">{{ creditInstallmentHistory }}<span>元</span></div>
+        </div>
+      </div>
      <div class="item">
        <img src="./assets/ticketSum.png" alt="" />
        <div class="info-sum">
-          <div class="title">当月账单合计</div>
+          <div class="title">当月账单</div>
          <div class="num">{{ currentCreditBill }}<span>元</span></div>
        </div>
      </div>
      <div class="item">
        <img src="./assets/completionTickets.png" alt="" />
        <div class="info-sum">
-          <div class="title">当月分期合计</div>
+          <div class="title">当月分期</div>
          <div class="num">{{ creditInstallment }}<span>元</span></div>
        </div>
      </div>
-
    </div>
-    <div class="header-title" ref="searchHeightRef">
-      &nbsp;&nbsp;&nbsp;&nbsp;征信信息
-        </div>
+    <div class="header-title" ref="searchHeightRef">&nbsp;&nbsp;&nbsp;&nbsp;征信信息</div>
    <div class="header-con" ref="searchHeightRef">
      <div class="item">
        <img src="./assets/one.png" alt="" />
@@ -296,9 +307,7 @@
        </div>
      </div>
    </div>
-    <div class="header-title" ref="searchHeightRef">
-      &nbsp;&nbsp;&nbsp;&nbsp;基础信息
-        </div>
+    <div class="header-title" ref="searchHeightRef">&nbsp;&nbsp;&nbsp;&nbsp;基础信息</div>
    <div class="header-con" ref="searchHeightRef">
      <div class="item">
        <img src="./assets/one.png" alt="" />
@@ -321,7 +330,6 @@
          <div class="num">{{ debitCount }}<span>张</span></div>
        </div>
      </div>
-
    </div>

    <div class="header-con" ref="searchHeightRef">
@@ -355,8 +363,7 @@
      </div>
    </div>

-    <div>
-    </div>
+    <div></div>
  </div>
 </template>
 <script setup name="facilityType">
@@ -382,6 +389,9 @@ const creditCount = ref(0)
 const creditInstallmentHistory = ref(0)
 const peopleLendHistory = ref(0)
 const totalDebt = ref(0)
+const debetBalance = ref(0)
+const netAsset = ref(0)
+
 //网贷信息
 const unclearedOnlineDebtCount = ref(0)
 const unClearedOnlineDebt = ref(0)
@@ -457,6 +467,8 @@ const getDebetInfoData = () => {
    unClearedOnlineDebt.value = res.data.unClearedOnlineDebt
    creditInstallmentHistory.value = res.data.creditInstallmentHistory
    totalDebt.value = res.data.totalDebt
+    netAsset.value = res.data.netAsset
+    debetBalance.value = res.data.debetBalance
    peopleLendHistory.value = res.data.peopleLendHistory
    unclearedOnlineDebtCount.value = res.data.unclearedOnlineDebtCount
    clearedOnlineDebtCount.value = res.data.clearedOnlineDebtCount
--- a/src/views/invest/creditCardBill/index.vue
+++ b/src/views/invest/creditCardBill/index.vue
@@ -3,19 +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="creditCardId">
-                      <el-select v-model="queryParams.creditCardId" 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="name">
+          <el-input v-model="queryParams.name" placeholder="请输入账单名称" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="信用卡" prop="creditCardId">
+          <el-select v-model="queryParams.creditCardId" 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>
      <div class="search-btn-con">
        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -26,41 +21,28 @@
      <div class="title-con">
        <div class="title">基本信息</div>
        <div class="operate-btn-con">
-          <el-button
-              @click="handleAdd"
-              icon="Plus"
-              v-hasPermi="['invest:creditCardBill:add']"
-          >新增</el-button>
-          <el-button
-              :disabled="multiple"
-              icon="Delete"
-              @click="handleDelete"
-              v-hasPermi="['invest:creditCardBill:remove']"
-          >删除</el-button>
-          <el-button
-              @click="handleExport"
-              icon="Download"
-              v-hasPermi="['invest:creditCardBill:export']"
-          >导出</el-button>
+          <el-button @click="handleAdd" icon="Plus" v-hasPermi="['invest:creditCardBill:add']">新增</el-button>
+          <el-button :disabled="multiple" icon="Delete" @click="handleDelete" v-hasPermi="['invest:creditCardBill:remove']">删除</el-button>
+          <el-button @click="handleExport" icon="Download" v-hasPermi="['invest:creditCardBill:export']">导出</el-button>
        </div>
      </div>
      <div class="content-con" v-loading="loading">
        <el-table v-loading="loading" :data="creditCardBillList" @selection-change="handleSelectionChange">
          <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" />
-                  <el-table-column label="账单日" align="center" prop="billDate" width="180">
-                    <template #default="scope">
-                      <span>{{ parseTime(scope.row.billDate, '{y}-{m}-{d}') }}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="账单周期" align="center" prop="billDatePeriod" />
-                  <el-table-column label="账单金额" align="center" prop="billAmount" />
+          <el-table-column label="账单名称" align="center" prop="name" />
+          <el-table-column label="账单日" align="center" prop="billDate" width="180">
+            <template #default="scope">
+              <span>{{ parseTime(scope.row.billDate, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <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>
@@ -72,23 +54,17 @@
    <!-- 添加或修改信用卡账单对话框 -->
    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
      <el-form ref="creditCardBillRef" :model="form" :rules="rules" label-width="120px">
-                        <el-form-item label="信用卡" prop="creditCardId">
-                          <el-select v-model="form.creditCardId" 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="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-item label="信用卡" prop="creditCardId">
+          <el-select v-model="form.creditCardId" 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="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">
@@ -128,7 +104,8 @@ const data = reactive({
    pageNum: 1,
    pageSize: 10,
    name: null,
-    creditCardId: null
+    creditCardId: null,
+    billState: '1'
  },
  queryCreditCardParams: {
    pageNum: 1,
@@ -136,15 +113,9 @@ const data = reactive({
    pageSize: 1000
  },
  rules: {
-    billDate: [
-      { required: true, message: '账单日不能为空', trigger: 'blur' }
-    ],
-    creditCardId: [
-      { required: true, message: '信用卡不能为空', trigger: 'blur' }
-    ],
-    billAmount: [
-      { required: true, message: '账单金额不能为空', trigger: 'blur' }
-    ]
+    billDate: [{ required: true, message: '账单日不能为空', trigger: 'blur' }],
+    creditCardId: [{ required: true, message: '信用卡不能为空', trigger: 'blur' }],
+    billAmount: [{ required: true, message: '账单金额不能为空', trigger: 'blur' }]
  }
 })

@@ -174,9 +145,9 @@ function getCreditCardList() {
 }

 /** 查询信用卡账单列表 */
-function getList () {
+function getList() {
  loading.value = true
-  listCreditCardBill(queryParams.value).then(response => {
+  listCreditCardBill(queryParams.value).then((response) => {
    creditCardBillList.value = response.rows
    total.value = response.total
    loading.value = false
@@ -190,7 +161,7 @@ function cancel() {
 }

 // 表单重置
-function reset () {
+function reset() {
  form.value = {
    id: null,
    name: null,
@@ -202,20 +173,22 @@ function reset () {
    createTime: null,
    updateBy: null,
    updateTime: null,
+    billState: '1',
    delFlag: null
  }
  proxy.resetForm('creditCardBillRef')
 }

 /** 搜索按钮操作 */
-function handleQuery () {
+function handleQuery() {
  queryParams.value.pageNum = 1
  getList()
 }

 /** 重置按钮操作 */
-function resetQuery () {
+function resetQuery() {
  proxy.resetForm('queryRef')
+  queryParams.value.billState = '1'
  handleQuery()
 }

@@ -226,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
 }
@@ -240,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
-  getCreditCardBill(_id).then(response => {
+  getCreditCardBill(_id).then((response) => {
    form.value = response.data
    open.value = true
    title.value = '修改信用卡账单'
@@ -258,17 +231,17 @@ function handleUpdate (row) {
 }

 /** 提交按钮 */
-function submitForm () {
-  proxy.$refs.creditCardBillRef.validate(valid => {
+function submitForm() {
+  proxy.$refs.creditCardBillRef.validate((valid) => {
    if (valid) {
      if (form.value.id != null) {
-        updateCreditCardBill(form.value).then(response => {
+        updateCreditCardBill(form.value).then((response) => {
          proxy.$modal.msgSuccess('修改成功')
          open.value = false
          getList()
        })
      } else {
-        addCreditCardBill(form.value).then(response => {
+        addCreditCardBill(form.value).then((response) => {
          proxy.$modal.msgSuccess('新增成功')
          open.value = false
          getList()
@@ -279,21 +252,29 @@ function submitForm () {
 }

 /** 删除按钮操作 */
-function handleDelete (row) {
+function handleDelete(row) {
  const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除选中的数据项？').then(function() {
-    return delCreditCardBill(_ids)
-  }).then(() => {
-    getList()
-    proxy.$modal.msgSuccess('删除成功')
-  }).catch(() => {})
+  proxy.$modal
+    .confirm('是否确认删除选中的数据项？')
+    .then(function () {
+      return delCreditCardBill(_ids)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('删除成功')
+    })
+    .catch(() => {})
 }

 /** 导出按钮操作 */
-function handleExport () {
-  proxy.download('invest/creditCardBill/export', {
-    ...queryParams.value
-  }, `creditCardBill_${new Date().getTime()}.xlsx`)
+function handleExport() {
+  proxy.download(
+    'invest/creditCardBill/export',
+    {
+      ...queryParams.value
+    },
+    `creditCardBill_${new Date().getTime()}.xlsx`
+  )
 }
 getCreditCardList()
 getList()