feat:增加钱包类型搜索条件

This commit is contained in:
dzc committed 2026-07-13 16:09:29 +08:00
1 parent aa57d289c2
commit 87cc87c850
11 files changed
+68 -39

No files matched your search

+7 -15
View File
@@ -1,24 +1,14 @@
<template>
<el-select
style="width: 100%"
v-model="state.selectId"
:placeholder="props.placeholder"
:clearable="props.clearable"
remote-show-suffix
filterable
remote
:disabled="props.disabled"
:remote-method="remoteSearch"
:loading="state.loading"
@visible-change="(e: boolean) => e && getOptions()"
@change="change"
>
<el-select style="width: 100%" v-model="state.selectId" :placeholder="props.placeholder"
:clearable="props.clearable" remote-show-suffix filterable remote :disabled="props.disabled"
:remote-method="remoteSearch" :multiple="props.multiple" collapse-tags :loading="state.loading"
@visible-change="(e: boolean) => e && getOptions()" @change="change">
<el-option v-for="v in state.options" :key="v.id" :label="`${v.name}`" :value="v.id">
<div class="flex items-center">
<div class="color-primary">{{ v.name }}</div>
<div class="flex items-center justify-center ml5">
<el-tag size="small">
{{ state.walletType.find((i: any) => i.value == v.uniqueCode)?.label }}
{{state.walletType.find((i: any) => i.value == v.uniqueCode)?.label}}
</el-tag>
</div>
</div>
@@ -42,6 +32,7 @@ const props = withDefaults(
clearable?: boolean
autoFirst?: boolean
apiParams?: any
multiple?: boolean
}>(),
{
placeholder: "请选择",
@@ -49,6 +40,7 @@ const props = withDefaults(
clearable: true,
autoFirst: false,
apiParams: {},
multiple: false,
},
)
+3 -2
View File
@@ -12,8 +12,9 @@
<template #default>
<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
<el-row>
<el-form-item style="width: 250px" label="钱包类型" prop="walletTypeId">
<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="请选择钱包类型" />
<el-form-item style="width: 250px" label="钱包类型" prop="walletTypeIdList">
<select-wallet-type multiple v-model="state.queryForm.walletTypeIdList"
placeholder="请选择钱包类型" />
</el-form-item>
<el-form-item style="width: 400px" label="时间" prop="createTimeList">
<el-date-picker v-model="state.queryForm.createTimeList"
+3 -2
View File
@@ -37,8 +37,9 @@
<el-form-item style="width: 250px" label="订单状态" prop="orderStatus">
<dict-select v-model="state.queryForm.orderStatus" dict-code="hard_order_status" />
</el-form-item>
<el-form-item style="width: 250px" label="钱包类型" prop="walletTypeId">
<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="请选择钱包类型" />
<el-form-item style="width: 250px" label="钱包类型" prop="walletTypeIdList">
<select-wallet-type multiple v-model="state.queryForm.walletTypeIdList"
placeholder="请选择钱包类型" />
</el-form-item>
<el-form-item style="width: 430px" label="创建时间" prop="createTimeList">
<el-date-picker v-model="state.queryForm.createTimeList"
+3 -2
View File
@@ -15,8 +15,9 @@
<el-form-item style="width: 200px" label="用餐时间段" prop="hourType">
<dict-select v-model="state.queryForm.hourType" dict-code="daily_menu" />
</el-form-item>
<el-form-item style="width: 250px" label="钱包类型" prop="walletTypeId">
<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="请选择钱包类型" />
<el-form-item style="width: 250px" label="钱包类型" prop="walletTypeIdList">
<select-wallet-type multiple v-model="state.queryForm.walletTypeIdList"
placeholder="饭卡类型" clearable />
</el-form-item>
<el-form-item style="width: 250px" label="商户类型" prop="merchantType">
<dict-select v-model="state.queryForm.merchantType" dict-code="merchant_type" />
@@ -21,6 +21,10 @@
<el-form-item v-if="false" style="width: 200px" label="充值类型" prop="type">
<dict-select v-model="state.queryForm.type" dict-code="wallet_biz_recharge" />
</el-form-item>
<el-form-item style="width: 250px" label="钱包类型" prop="walletTypeIdList">
<select-wallet-type multiple v-model="state.queryForm.walletTypeIdList" placeholder="饭卡类型"
clearable />
</el-form-item>
<el-form-item style="width: 300px" label="充值时间" prop="createTimeList">
<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD"
type="daterange" />
+8 -3
View File
@@ -16,9 +16,9 @@
<el-form-item v-if="false" style="width: 200px" label="充值类型" prop="type">
<dict-select v-model="state.queryForm.type" dict-code="wallet_biz_recharge" />
</el-form-item>
<el-form-item style="width: 200px" label="钱包类型" prop="walletTypeId">
<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型"
clearable />
<el-form-item style="width: 250px" label="钱包类型" prop="walletTypeIdList">
<select-wallet-type multiple v-model="state.queryForm.walletTypeIdList"
placeholder="饭卡类型" clearable />
</el-form-item>
<el-form-item style="width: 300px" label="充值时间" prop="createTimeList">
<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD"
@@ -114,6 +114,11 @@
{{ displayPrice(row.xfTotalPrice) }}
</template>
</el-table-column>
<el-table-column align="center" prop="topupTotalPrice" label="充值钱包充值金额">
<template #default="{ row }">
{{ displayPrice(row.topupTotalPrice) }}
</template>
</el-table-column>
</el-table-column>
</el-table>
</el-drawer>
+8 -3
View File
@@ -13,9 +13,9 @@
<el-form-item style="width: 200px" label="充值方式" prop="bizType">
<dict-select v-model="state.queryForm.bizType" dict-code="wallet_biz" />
</el-form-item>
<el-form-item style="width: 200px" label="钱包类型" prop="walletTypeId">
<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型"
clearable />
<el-form-item style="width: 250px" label="钱包类型" prop="walletTypeIdList">
<select-wallet-type multiple v-model="state.queryForm.walletTypeIdList"
placeholder="饭卡类型" clearable />
</el-form-item>
<el-form-item style="width: 300px" label="消费时间" prop="createTimeList">
<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD"
@@ -97,6 +97,11 @@
{{ displayPrice(row.xfTotalPrice) }}
</template>
</el-table-column>
<el-table-column align="center" prop="topupTotalPrice" label="充值钱包记账扣款金额">
<template #default="{ row }">
{{ displayPrice(row.topupTotalPrice) }}
</template>
</el-table-column>
</el-table-column>
</el-table>
</el-drawer>
+8 -3
View File
@@ -10,9 +10,9 @@
<el-form-item style="width: 300px" label="用户" prop="userId">
<select-user v-model="state.queryForm.userId" />
</el-form-item>
<el-form-item style="width: 200px" label="饭卡类型" prop="walletTypeId">
<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型"
clearable />
<el-form-item style="width: 250px" label="钱包类型" prop="walletTypeIdList">
<select-wallet-type multiple v-model="state.queryForm.walletTypeIdList"
placeholder="饭卡类型" clearable />
</el-form-item>
<el-form-item style="width: 200px" label="月份" prop="walletRecordMonth">
<el-date-picker v-model="state.queryForm.walletRecordMonth" value-format="YYYY-MM"
@@ -107,6 +107,11 @@
{{ displayPrice(row.payTotal) }}
</template>
</el-table-column>
<el-table-column align="center" prop="payTotal" label="充值钱包">
<template #default="{ row }">
{{ displayPrice(row.topupTotal) }}
</template>
</el-table-column>
</el-table-column>
</el-table>
</el-drawer>
+8 -3
View File
@@ -10,9 +10,9 @@
<el-form-item style="width: 300px" label="用户" prop="userId">
<select-user v-model="state.queryForm.userId" />
</el-form-item>
<el-form-item style="width: 200px" label="钱包类型" prop="walletTypeId">
<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型"
clearable />
<el-form-item style="width: 250px" label="钱包类型" prop="walletTypeId">
<select-wallet-type multiple v-model="state.queryForm.walletTypeIdList"
placeholder="饭卡类型" clearable />
</el-form-item>
<el-form-item style="width: 300px" label="退款时间" prop="createTimeList">
<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD"
@@ -101,6 +101,11 @@
{{ displayPrice(row.xfTotalPrice) }}
</template>
</el-table-column>
<el-table-column align="center" prop="xfTotalPrice" label="充值钱包记账扣款金额">
<template #default="{ row }">
{{ displayPrice(row.topupTotalPrice) }}
</template>
</el-table-column>
</el-table-column>
</el-table>
</el-drawer>
+8 -3
View File
@@ -10,9 +10,9 @@
<el-form-item style="width: 300px" label="用户" prop="userId">
<select-user v-model="state.queryForm.userId" />
</el-form-item>
<el-form-item style="width: 200px" label="钱包类型" prop="walletTypeId">
<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型"
clearable />
<el-form-item style="width: 250px" label="钱包类型" prop="walletTypeIdList">
<select-wallet-type multiple v-model="state.queryForm.walletTypeIdList"
placeholder="饭卡类型" clearable />
</el-form-item>
<el-form-item style="width: 300px" label="退款时间" prop="createTimeList">
<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD"
@@ -103,6 +103,11 @@
{{ displayPrice(row.xfTotalPrice) }}
</template>
</el-table-column>
<el-table-column align="center" prop="xfTotalPrice" label="充值钱包记账扣款金额">
<template #default="{ row }">
{{ displayPrice(row.topupTotalPrice) }}
</template>
</el-table-column>
</el-table-column>
</el-table>
</el-drawer>
+8 -3
View File
@@ -13,9 +13,9 @@
<el-form-item style="width: 200px" label="充值方式" prop="bizType">
<dict-select v-model="state.queryForm.bizType" dict-code="wallet_biz" />
</el-form-item>
<el-form-item style="width: 200px" label="钱包类型" prop="walletTypeId">
<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型"
clearable />
<el-form-item style="width: 250px" label="钱包类型" prop="walletTypeIdList">
<select-wallet-type multiple v-model="state.queryForm.walletTypeIdList"
placeholder="饭卡类型" clearable />
</el-form-item>
<el-form-item style="width: 300px" label="消费时间" prop="createTimeList">
<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD"
@@ -109,6 +109,11 @@
{{ displayPrice(row.xfTotalPrice) }}
</template>
</el-table-column>
<el-table-column align="center" prop="xfTotalPrice" label="充值钱包记账扣款金额">
<template #default="{ row }">
{{ displayPrice(row.topupTotalPrice) }}
</template>
</el-table-column>
</el-table-column>
</el-table>
</el-drawer>