feat:搜索条件

This commit is contained in:
dzc committed 2026-09-09 09:57:48 +08:00
1 parent 5071dcbade
commit f4dff79f5a
14 files changed
+733 -86

No files matched your search

+7 -3
View File
@@ -18,12 +18,16 @@
<el-form-item style="width: 250px" label="车牌号" prop="carNumber">
<el-input v-model="state.queryForm.carNumber" placeholder="请输入车牌号" />
</el-form-item>
<el-form-item style="width: 250px" label="车辆类型" prop="carType">
<dict-select v-model="state.queryForm.carType" dict-code="car_type" />
</el-form-item>
<el-form-item style="width: 250px" label="是否启用" prop="enableStatus">
<dict-select v-model="state.queryForm.enableStatus" dict-code="yes_no_type" />
</el-form-item>
<template #more>
<el-form-item style="width: 250px" label="车辆类型" prop="carType">
<dict-select v-model="state.queryForm.carType" dict-code="car_type" />
</el-form-item>
</template>
</SearchPanel>
</el-row>
<el-row>
@@ -18,18 +18,22 @@
<el-form-item style="width: 250px" label="调动类型" prop="bizType">
<dict-select v-model="state.queryForm.bizType" dict-code="user_transaction" />
</el-form-item>
<el-form-item style="width: 300px" label="自动转账到消费钱包" prop="isWalletTransaction">
<dict-select v-model="state.queryForm.isWalletTransaction" dict-code="yes_no_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" />
</el-form-item>
<el-form-item style="width: 450px" label="审核时间" prop="processTimeList">
<el-date-picker v-model="state.queryForm.processTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
</el-form-item>
<el-form-item style="width: 450px" label="自动转账时间" prop="walletTransactionTimeList">
<el-date-picker v-model="state.queryForm.walletTransactionTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
</el-form-item>
<template #more>
<el-form-item style="width: 300px" label="自动转账到消费钱包" prop="isWalletTransaction">
<dict-select v-model="state.queryForm.isWalletTransaction" dict-code="yes_no_type" />
</el-form-item>
<el-form-item style="width: 450px" label="审核时间" prop="processTimeList">
<el-date-picker v-model="state.queryForm.processTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
</el-form-item>
<el-form-item style="width: 450px" label="自动转账时间" prop="walletTransactionTimeList">
<el-date-picker v-model="state.queryForm.walletTransactionTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
</el-form-item>
</template>
</SearchPanel>
</el-row>
<el-row>
+12 -9
View File
@@ -32,15 +32,18 @@
<el-form-item label="手机号" prop="phone">
<el-input v-model="state.queryForm.phone" placeholder="请输入手机号" clearable />
</el-form-item>
<el-form-item style="width: 250px" label="部门" prop="deptId">
<select-dept v-model="state.queryForm.deptId" clearable />
</el-form-item>
<el-form-item style="width: 250px" label="角色" prop="role">
<select-role v-model="state.queryForm.role" clearable />
</el-form-item>
<el-form-item style="width: 250px" label="编制情况" prop="staffingType">
<dict-select v-model="state.queryForm.staffingType" dict-code="user_staffing_type" />
</el-form-item>
<template #more>
<el-form-item style="width: 250px" label="部门" prop="deptId">
<select-dept v-model="state.queryForm.deptId" clearable />
</el-form-item>
<el-form-item style="width: 250px" label="角色" prop="role">
<select-role v-model="state.queryForm.role" clearable />
</el-form-item>
<el-form-item style="width: 250px" label="编制情况" prop="staffingType">
<dict-select v-model="state.queryForm.staffingType" dict-code="user_staffing_type" />
</el-form-item>
</template>
</SearchPanel>
</el-row>
<el-row>
+17 -8
View File
@@ -1,7 +1,8 @@
<template>
<div class="layout-padding">
<div class="layout-padding-auto layout-padding-view">
<DraggableDepTree ref="draggableDepTreeRef" placeholder="请输入部门名称" :show-expand="true"
<DraggableDepMchTree ref="draggableDepMchTreeRef" placeholder="请输入用户部门名称"
mch-placeholder="请输入商户部门名称" :show-expand="true"
@getSelectNode="handleGetSelectNode" switch-inactive-text="包含" switch-active-text="不包含"
:defaultTreeWidth="20" :nodeClickable="false" :props="{
label: 'name',
@@ -58,7 +59,7 @@
<hard-sh-by-day v-if="activeTab === 'MCH'" ref="hardShByDayRef" />
<hard-sh-by-month v-if="activeTab === 'MONTH'" ref="hardShByMonthRef" />
</template>
</DraggableDepTree>
</DraggableDepMchTree>
</div>
</div>
</template>
@@ -81,7 +82,7 @@ const hardShByMonthRef = ref()
const queryRef = ref()
const showSearch = ref(true)
const draggableDepTreeRef = ref()
const draggableDepMchTreeRef = ref()
// tab变量
const tabPane = ref([
@@ -179,15 +180,23 @@ const resetQuery = () => {
state.queryForm = { ...defaultQueryForm }
state.queryForm.deptId = ""
state.queryForm.userDeptIds = []
draggableDepTreeRef.value.resetData()
state.queryForm.merchantDeptIds = []
draggableDepMchTreeRef.value.resetData()
cancel()
}
// 树节点选择时
const handleGetSelectNode = (curClickedNode: any, checkedTreeNodes: any, isDeepTree: any) => {
state.queryForm.deptId = curClickedNode.id
state.queryForm.userDeptIds = checkedTreeNodes.map((item: any) => item.id)
state.queryForm.isInclude = !isDeepTree
const handleGetSelectNode = (curClickedNode: any, checkedTreeNodes: any, isDeepTree: any, tab?: string) => {
if (tab === "MCH_DEPT") {
// 商户部门tab:勾选的商户部门ids + 商户部门包含/不包含
state.queryForm.merchantDeptIds = checkedTreeNodes.map((item: any) => item.id)
state.queryForm.isIncludeMerchantDept = !isDeepTree
} else {
// 用户部门tab:点击的部门 + 勾选的部门ids + 用户部门包含/不包含
state.queryForm.deptId = curClickedNode.id
state.queryForm.userDeptIds = checkedTreeNodes.map((item: any) => item.id)
state.queryForm.isInclude = !isDeepTree
}
search()
}
</script>
+13 -9
View File
@@ -14,21 +14,25 @@
<el-form-item style="width: 250px" label="订单号" prop="payNo">
<el-input v-model="state.queryForm.payNo" />
</el-form-item>
<el-form-item style="width: 250px" label="支付平台" prop="payPlatformType">
<dict-select v-model="state.queryForm.payPlatformType" dict-code="mini_platform_type" />
</el-form-item>
<el-form-item style="width: 250px" label="业务类型" prop="bizType">
<dict-select v-model="state.queryForm.bizType" dict-code="third_pay_order_biz_type" />
</el-form-item>
<el-form-item style="width: 250px" label="用户" prop="userId">
<select-user v-model="state.queryForm.userId" />
</el-form-item>
<el-form-item style="width: 450px" label="支付时间" prop="payTimeList">
<el-date-picker v-model="state.queryForm.payTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
</el-form-item>
<el-form-item style="width: 450px" label="退款时间" prop="refundTimeList">
<el-date-picker v-model="state.queryForm.refundTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
</el-form-item>
<template #more>
<el-form-item style="width: 250px" label="支付平台" prop="payPlatformType">
<dict-select v-model="state.queryForm.payPlatformType" dict-code="mini_platform_type" />
</el-form-item>
<el-form-item style="width: 250px" label="业务类型" prop="bizType">
<dict-select v-model="state.queryForm.bizType" dict-code="third_pay_order_biz_type" />
</el-form-item>
<el-form-item style="width: 450px" label="退款时间" prop="refundTimeList">
<el-date-picker v-model="state.queryForm.refundTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
</el-form-item>
</template>
</SearchPanel>
<el-row>
<div class="mb8" style="width: 100%">
+9 -6
View File
@@ -20,12 +20,15 @@
<el-form-item style="width: 250px" label="卡号" prop="cardNumber">
<el-input v-model="state.queryForm.cardNumber" placeholder="饭卡卡号" clearable />
</el-form-item>
<el-form-item style="width: 250px" label="是否绑定用户" prop="isBindUser">
<dict-select v-model="state.queryForm.isBindUser" dict-code="yes_no_type" />
</el-form-item>
<el-form-item style="width: 250px" label="是否硬件激活" prop="isMchActive">
<dict-select v-model="state.queryForm.isMchActive" dict-code="yes_no_type" />
</el-form-item>
<template #more>
<el-form-item style="width: 250px" label="是否绑定用户" prop="isBindUser">
<dict-select v-model="state.queryForm.isBindUser" dict-code="yes_no_type" />
</el-form-item>
<el-form-item style="width: 250px" label="是否硬件激活" prop="isMchActive">
<dict-select v-model="state.queryForm.isMchActive" dict-code="yes_no_type" />
</el-form-item>
</template>
</SearchPanel>
<el-row>
+10 -6
View File
@@ -39,18 +39,22 @@
<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 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" />
</el-form-item>
<el-form-item style="width: 260px" label="操作标签" prop="tagList">
<dict-select v-model="state.queryForm.tagList" dict-code="wallet_transaction_tag" multiple />
</el-form-item>
<template #more>
<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: 260px" label="操作标签" prop="tagList">
<dict-select v-model="state.queryForm.tagList" dict-code="wallet_transaction_tag" multiple />
</el-form-item>
</template>
</SearchPanel>
<el-row>
<div class="mb8" style="width: 100%">
+10 -6
View File
@@ -28,18 +28,22 @@
<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 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" />
</el-form-item>
<el-form-item style="width: 260px" label="操作标签" prop="tagList">
<dict-select v-model="state.queryForm.tagList" dict-code="wallet_transaction_tag" multiple />
</el-form-item>
<template #more>
<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: 260px" label="操作标签" prop="tagList">
<dict-select v-model="state.queryForm.tagList" dict-code="wallet_transaction_tag" multiple />
</el-form-item>
</template>
</SearchPanel>
<el-row>
<div class="mb8" style="width: 100%">
@@ -14,21 +14,26 @@
<el-form-item style="width: 300px" label="用户" prop="userIds">
<select-user v-model="state.queryForm.userIds" placeholder="用户" />
</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>
<el-form-item style="width: 200px" label="充值类型" prop="bizType">
<dict-select v-model="state.queryForm.bizType" dict-code="wallet_biz_recharge" placeholder="充值类型" />
</el-form-item>
<el-form-item style="width: 250px" label="发票号" prop="invoiceCode">
<el-input v-model="state.queryForm.invoiceCode" placeholder="发票号" />
</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" />
</el-form-item>
<el-form-item style="width: 450px" label="审核时间" prop="processTimeList">
<el-date-picker v-model="state.queryForm.processTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
</el-form-item>
<template #more>
<el-form-item style="width: 200px" label="饭卡类型" prop="walletTypeId">
<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型" clearable />
</el-form-item>
<el-form-item style="width: 250px" label="发票号" prop="invoiceCode">
<el-input v-model="state.queryForm.invoiceCode" placeholder="发票号" />
</el-form-item>
<el-form-item style="width: 450px" label="审核时间" prop="processTimeList">
<el-date-picker v-model="state.queryForm.processTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
</el-form-item>
</template>
</SearchPanel>
<el-row>
<div class="mb8" style="width: 100%">
@@ -23,15 +23,18 @@
<el-form-item style="width: 350px" label="发票号" prop="code">
<el-input v-model="state.queryForm.code" />
</el-form-item>
<el-form-item style="width: 350px" label="备注" prop="remark">
<el-input v-model="state.queryForm.remark" />
</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" />
</el-form-item>
<el-form-item style="width: 450px" label="审核时间" prop="processTimeList">
<el-date-picker v-model="state.queryForm.processTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
</el-form-item>
<template #more>
<el-form-item style="width: 350px" label="备注" prop="remark">
<el-input v-model="state.queryForm.remark" />
</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" />
</el-form-item>
<el-form-item style="width: 450px" label="审核时间" prop="processTimeList">
<el-date-picker v-model="state.queryForm.processTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
</el-form-item>
</template>
</SearchPanel>
<el-row>
<div class="mb8" style="width: 100%">
@@ -25,18 +25,23 @@
<el-form-item style="width: 300px" label="用户" prop="userId">
<select-user v-model="state.queryForm.userId" placeholder="用户" />
</el-form-item>
<el-form-item style="width: 200px" label="充值类型" prop="bizType">
<dict-select v-model="state.queryForm.bizType" dict-code="wallet_biz_recharge" />
</el-form-item>
<el-form-item style="width: 200px" label="审核状态" prop="processStatus">
<dict-select v-model="state.queryForm.processStatus" dict-code="check_status" />
</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>
<el-form-item style="width: 450px" label="审核时间" prop="processTimeList">
<el-date-picker v-model="state.queryForm.processTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
</el-form-item>
<template #more>
<el-form-item style="width: 200px" label="充值类型" prop="bizType">
<dict-select v-model="state.queryForm.bizType" 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>
</template>
</SearchPanel>
<el-row>
<div class="mb8" style="width: 100%">
@@ -24,19 +24,24 @@
<el-form-item style="width: 250px" label="用户" prop="userId">
<select-user v-model="state.queryForm.userId" />
</el-form-item>
<el-form-item style="width: 250px" label="是否退回" prop="isRefund">
<dict-select v-model="state.queryForm.isRefund" dict-code="yes_no_type" />
</el-form-item>
<el-form-item style="width: 250px" label="转账类型" prop="bizType">
<dict-select v-model="state.queryForm.bizType" dict-code="wallet_rule_transation_type" />
</el-form-item>
<el-form-item style="width: 350px" label="转账时间" prop="createTimeList">
<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD" type="daterange" />
</el-form-item>
<el-form-item style="width: 350px" label="退回时间" prop="refundTimeList">
<el-date-picker v-model="state.queryForm.refundTimeList" value-format="YYYY-MM-DD" type="daterange" />
</el-form-item>
<el-row> </el-row>
<template #more>
<el-form-item style="width: 250px" label="是否退回" prop="isRefund">
<dict-select v-model="state.queryForm.isRefund" dict-code="yes_no_type" />
</el-form-item>
<el-form-item style="width: 350px" label="退回时间" prop="refundTimeList">
<el-date-picker v-model="state.queryForm.refundTimeList" value-format="YYYY-MM-DD" type="daterange" />
</el-form-item>
</template>
</SearchPanel>
<el-row>
<div class="mb8" style="width: 100%">