zianxin/pj_admin_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud

Browse Source
This commit is contained in:
weiwei committed 2025-04-15 15:35:39 +08:00
2 parents 7e145ee5b0 e41471cb7d
commit 1af4cb1e8c
2 files changed
+12 -35
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/views/hard/third-door-log/index.vue
+4 -4
View File
@@ -3,11 +3,11 @@
<div class="layout-padding-auto layout-padding-view">
<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
<el-row>
<el-form-item style="width: 300px" label="请求类型" prop="thirdApiType">
<dict-select v-model="state.queryForm.thirdApiType" dict-code="third_api_type" />
<el-form-item style="width: 300px" label="请求类型" prop="apiType">
<dict-select v-model="state.queryForm.apiType" dict-code="third_api_type" />
</el-form-item>
<el-form-item style="width: 300px" label="接口类型" prop="thirdBizType">
<dict-select v-model="state.queryForm.thirdBizType" dict-code="third_biz_type" />
<el-form-item style="width: 300px" label="接口类型" prop="bizType">
<dict-select v-model="state.queryForm.bizType" dict-code="third_biz_type" />
</el-form-item>
<el-form-item style="width: 450px" label="请求时间" prop="createTimeList">
<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
src/views/wallet/wallet-recharge-apply/preview-excel.vue
+8 -31
View File
@@ -27,22 +27,17 @@
<el-table-column prop="bizType" label="充值类型" align="center" width="100">
<dict-tag :options="wallet_biz_recharge" :value="detail.bizType" />
</el-table-column>
<el-table-column prop="prenBalance" label="操作前余额" align="center" min-width="180">
<template #default="{ row }">
<span class="color-primary">{{ displayPrice(row.prenBalance) }}</span>
</template>
</el-table-column>
<el-table-column v-if="detail.bizType == 2" prop="discountBalance" label="记账扣款后余额" align="center" min-width="180">
<template #default="{ row }">
<div class="color-danger">{{ displayPrice(row.discountBalance) }}</div>
<div v-if="row.discountBalance < 0" class="color-danger">(余额不足记账扣款)</div>
</template>
</el-table-column>
<el-table-column prop="currentImport_price" label="操作金额" align="center" min-width="180">
<el-table-column prop="currentImport_price" label="操作金额" align="center" min-width="250">
<template #default="{ row }">
<div class="color-success">{{ displayPrice(row.currentImport_price) }}</div>
</template>
</el-table-column>
<el-table-column v-if="detail.bizType == 2 && false" prop="afterBalance" label="记账扣款后余额" align="center" min-width="180">
<template #default="{ row }">
<div class="color-danger">{{ displayPrice(row.afterBalance) }}</div>
<div v-if="row.afterBalance < 0" class="color-danger">(余额不足记账扣款)</div>
</template>
</el-table-column>
<slot v-if="data.tableList && data.tableList.length">
<el-table-column :prop="v" v-for="(v, i) in data.tableList" :key="i" align="center" min-width="250">
<template #header>
@@ -198,25 +193,7 @@ const getSummaries = (param: SummaryMethodProps) => {
} else {
sums[index] = "NaN"
}
} else if (column.property === "prenBalance") {
const values = data1.map((item) => Number(item[column.property]))
if (!values.every((value) => Number.isNaN(value))) {
sums[index] = h("span", { style: { color: "#2e5cf6" } }, [
displayPrice(
values.reduce((prev, curr) => {
const value = Number(curr)
if (!Number.isNaN(value)) {
return prev + curr
} else {
return prev
}
}, 0),
),
])
} else {
sums[index] = "NaN"
}
} else if (column.property === "discountBalance") {
} else if (column.property === "afterBalance") {
const values = data1.map((item) => Number(item[column.property]))
if (!values.every((value) => Number.isNaN(value))) {
sums[index] = h("span", { style: { color: "#f56c6c" } }, [