qdintc/intc-vue3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 自测问题修复。

Browse Source
This commit is contained in:
tianyongbao
2024-05-09 13:43:06 +08:00
parent ab6c8df8e2
commit a00c7e8208
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/views/invest/accountDealRecord/index.vue
View File

@@ -43,7 +43,7 @@
</div>
<div class="content-con" v-loading="loading">
<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" width="200" prop="accountName" />
<el-table-column label="记账类型" align="center" prop="type">
<template #default="scope">
<dict-tag :options="account_type" :value="scope.row.type" />
@@ -62,7 +62,7 @@
<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" 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">
@@ -100,6 +100,9 @@
<el-form-item label="交易金额" prop="amount">
<el-input v-model="form.amount" placeholder="请输入交易金额" />
</el-form-item>
<el-form-item label="当前余额" v-show="currentBalanceShow" prop="currentBalance">
<el-input v-model="form.currentBalance" placeholder="请输入当前金额" />
</el-form-item>
<el-form-item label="交易类别" prop="dealCategory">
<el-select v-model="form.dealCategory" placeholder="请选择交易类别">
<el-option v-for="dict in deal_category" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
@@ -145,6 +148,7 @@ const total = ref(0)
const title = ref('')
const accountList = ref([])
const addAccountList = ref([])
const currentBalanceShow = ref(false)
const operateList = ref([
{ id: 'view', icon: 'View', title: '查看', hasPermi: ['invest:accountDealRecord:query'] },
{ id: 'edit', icon: 'Edit', title: '修改', hasPermi: ['invest:accountDealRecord:edit'] },
@@ -255,6 +259,7 @@ function reset() {
updateTime: null,
delFlag: null,
remark: null,
currentBalance: null,
dealCategory: null
}
proxy.resetForm('accountDealRecordRef')
@@ -306,11 +311,13 @@ const handleView = (row) => {
title.value = '查看账户交易记录'
form.value = row
open.value = true
currentBalanceShow.value = true
}
/** 新增按钮操作 */
function handleAdd() {
reset()
currentBalanceShow.value = false
queryAddAccountParams.value.type = ''
getAddAccountList()
open.value = true
@@ -320,6 +327,7 @@ function handleAdd() {
/** 修改按钮操作 */
function handleUpdate(row) {
reset()
currentBalanceShow.value = true
queryAddAccountParams.value.type = ''
getAddAccountList()
const _id = row.id || ids.value

14
src/views/invest/posmachine/index.vue
View File

@@ -32,24 +32,24 @@
<div class="content-con" v-loading="loading">
<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="pos机名称" width="100" align="center" prop="name" />
<el-table-column label="支付公司" align="center" prop="payCompany" />
<el-table-column label="类型" align="center" prop="type">
<el-table-column label="类型" align="center" width="80" 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">
<el-table-column label="刷卡费率" align="center" width="120" prop="rate" />
<el-table-column label="费率+" align="center" width="80" prop="ratePlus" />
<el-table-column label="结算卡" align="center" width="150" prop="bankNameCode" />
<el-table-column label="商户类型" align="center" width="150" 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">
<el-table-column label="操作" align="center" width="150" 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">