From 8f3d733461f52445fbf7cfddc6aacce2b7ed4967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com>
Date: Mon, 7 Oct 2024 16:46:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/bindRecord/index.vue | 12 ++--
src/views/system/recharge/index.vue | 80 ++++++++++++++++++++-------
2 files changed, 66 insertions(+), 26 deletions(-)
diff --git a/src/views/system/bindRecord/index.vue b/src/views/system/bindRecord/index.vue
index 2c9979b..9ee9534 100644
--- a/src/views/system/bindRecord/index.vue
+++ b/src/views/system/bindRecord/index.vue
@@ -11,10 +11,10 @@
/>
</el-select>
</el-form-item>
- <el-form-item :label="FieldName.AGENT" prop="agentName">
+ <el-form-item label="设备名称" prop="deviceName" v-if="notHasView(views.device)">
<el-input
- v-model="queryParams.agentName"
- placeholder="请输入名称"
+ v-model="queryParams.deviceName"
+ placeholder="请输入设备名称"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -35,10 +35,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="设备名称" prop="deviceName" v-if="notHasView(views.device)">
+ <el-form-item :label="FieldName.AGENT" prop="agentName">
<el-input
- v-model="queryParams.deviceName"
- placeholder="请输入设备名称"
+ v-model="queryParams.agentName"
+ placeholder="请输入名称"
clearable
@keyup.enter.native="handleQuery"
/>
diff --git a/src/views/system/recharge/index.vue b/src/views/system/recharge/index.vue
index 25746c6..21b466f 100644
--- a/src/views/system/recharge/index.vue
+++ b/src/views/system/recharge/index.vue
@@ -9,10 +9,22 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="用户名称" prop="userName">
+ <el-form-item label="订单时间" prop="createDateRange" >
+ <el-date-picker
+ v-model="queryParams.createDateRange"
+ value-format="yyyy-MM-dd"
+ type="daterange"
+ range-separator="至"
+ start-placeholder="开始日期"
+ end-placeholder="结束日期"
+ :clearable="false"
+ @change="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="充值用户" prop="userName">
<el-input
v-model="queryParams.userName"
- placeholder="请输入用户名称"
+ placeholder="请输入充值用户名称"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -41,6 +53,38 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
+ <el-form-item :label="FieldName.STORE" prop="storeName" v-if="notHasView(views.store)">
+ <el-input
+ v-model="queryParams.storeName"
+ placeholder="请输入名称"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item :label="FieldName.INVESTOR" prop="investorName" >
+ <el-input
+ v-model="queryParams.investorName"
+ placeholder="请输入名称"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item :label="FieldName.BIZ" prop="bizName">
+ <el-input
+ v-model="queryParams.bizName"
+ placeholder="请输入名称"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item :label="FieldName.AGENT" prop="agentName">
+ <el-input
+ v-model="queryParams.agentName"
+ placeholder="请输入名称"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
<el-form-item label="交易状态" prop="statusList">
<el-checkbox-group v-model="queryParams.statusList" @change="handleQuery" size="mini">
<el-checkbox-button v-for="dict in dict.type.sm_transaction_bill_status" :label="dict.value" :key="dict.value">
@@ -48,16 +92,6 @@
</el-checkbox-button>
</el-checkbox-group>
</el-form-item>
-<!-- <el-form-item label="支付方式" prop="channelId">-->
-<!-- <el-select v-model="queryParams.channelId" clearable placeholder="请选择支付方式" @change="handleQuery">-->
-<!-- <el-option-->
-<!-- v-for="dict in dict.type.channel_type"-->
-<!-- :key="dict.value"-->
-<!-- :label="dict.label"-->
-<!-- :value="dict.value"-->
-<!-- />-->
-<!-- </el-select>-->
-<!-- </el-form-item>-->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -82,13 +116,15 @@
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="订单ID" align="center" prop="billId" width="80"/>-->
<el-table-column label="时间" align="center" prop="createTime" width="100"/>
- <el-table-column label="订单编号" align="center" prop="billNo" min-width="130">
+ <el-table-column label="订单编号" align="center" prop="billNo" min-width="100">
<recharge-link slot-scope="d" :bill-id="d.row.billId" :text="d.row.billNo"/>
</el-table-column>
<el-table-column label="充值用户" align="center" prop="userName" >
<user-link slot-scope="d" :id="d.row.userId" :name="d.row.userName"/>
</el-table-column>
- <el-table-column label="用户手机" align="center" prop="userMobile" />
+ <el-table-column label="用户手机" align="center" prop="userMobile">
+ <user-link slot-scope="d" :id="d.row.userId" :name="d.row.userMobile"/>
+ </el-table-column>
<el-table-column label="设备名称/SN" align="center" prop="deviceName" width="180">
<device-link slot-scope="d" :id="d.row.deviceId" :text="`${d.row.deviceName ? d.row.deviceName : '--'} (${d.row.deviceNo})`"/>
</el-table-column>
@@ -104,19 +140,22 @@
<el-table-column :label="FieldName.AGENT" align="center" prop="agentName">
<user-link slot-scope="d" :id="d.row.agentId" :name="d.row.agentName"/>
</el-table-column>
- <el-table-column label="交易金额" align="center">
+ <el-table-column label="交易金额" align="center" min-width="100">
<template slot-scope="d">
- {{d.row.money | money | defaultValue}} 元
+ {{d.row.money | money | defaultValue}} 元<br/>
+ <template v-if="d.row.refundAmount">退款:{{d.row.refundAmount | money | defaultValue}} 元</template>
</template>
</el-table-column>
- <el-table-column label="渠道成本" align="center" v-if="deptId === ROOT_DEPT">
+ <el-table-column label="运营成本" align="center" min-width="100">
<template slot-scope="d">
- {{d.row.channelCost | money | defaultValue}} 元
+ {{d.row.deptChannelCost | money | defaultValue}} 元<br/>
+ <template v-if="d.row.refundDeptChannel">退款:{{d.row.refundDeptChannel | money | defaultValue}} 元</template>
</template>
</el-table-column>
- <el-table-column label="运营成本" align="center">
+ <el-table-column label="渠道成本" align="center" v-if="deptId === ROOT_DEPT" min-width="100">
<template slot-scope="d">
- {{d.row.deptChannelCost | money | defaultValue}} 元
+ {{d.row.channelCost | money | defaultValue}} 元<br/>
+ <template v-if="d.row.refundChannel">退款:{{d.row.refundChannel | money | defaultValue}} 元</template>
</template>
</el-table-column>
<el-table-column label="交易状态" align="center" width="120">
@@ -271,6 +310,7 @@ export default {
landlordName: null,
type: "1", // 充值
statusList: ['1','2','3','6','7','8','9'],
+ createDateRange: []
},
// 表单参数
form: {},