Merge remote-tracking branch 'origin/main' into main

# Conflicts:
#	src/views/business/userInfo/index.vue
#	src/views/business/userInfoBus/index.vue

src/api/business/dealPayment.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询付款订单列表
+export function listDealPayment(query) {
+  return request({
+    url: '/business/dealPayment/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询付款订单详细
+export function getDealPayment(id) {
+  return request({
+    url: '/business/dealPayment/' + id,
+    method: 'get'
+  })
+}
+
+// 新增付款订单
+export function addDealPayment(data) {
+  return request({
+    url: '/business/dealPayment',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改付款订单
+export function updateDealPayment(data) {
+  return request({
+    url: '/business/dealPayment',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除付款订单
+export function delDealPayment(id) {
+  return request({
+    url: '/business/dealPayment/' + id,
+    method: 'delete'
+  })
+}

src/api/business/dealProxy.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询代缴订单列表
+export function listDealProxy(query) {
+  return request({
+    url: '/business/dealProxy/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询代缴订单详细
+export function getDealProxy(id) {
+  return request({
+    url: '/business/dealProxy/' + id,
+    method: 'get'
+  })
+}
+
+// 新增代缴订单
+export function addDealProxy(data) {
+  return request({
+    url: '/business/dealProxy',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改代缴订单
+export function updateDealProxy(data) {
+  return request({
+    url: '/business/dealProxy',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除代缴订单
+export function delDealProxy(id) {
+  return request({
+    url: '/business/dealProxy/' + id,
+    method: 'delete'
+  })
+}

src/api/business/dealReceipt.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询收款订单列表
+export function listDealReceipt(query) {
+  return request({
+    url: '/business/dealReceipt/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询收款订单详细
+export function getDealReceipt(id) {
+  return request({
+    url: '/business/dealReceipt/' + id,
+    method: 'get'
+  })
+}
+
+// 新增收款订单
+export function addDealReceipt(data) {
+  return request({
+    url: '/business/dealReceipt',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改收款订单
+export function updateDealReceipt(data) {
+  return request({
+    url: '/business/dealReceipt',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除收款订单
+export function delDealReceipt(id) {
+  return request({
+    url: '/business/dealReceipt/' + id,
+    method: 'delete'
+  })
+}

src/api/business/dealRecharge.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询充值订单列表
+export function listDealRecharge(query) {
+  return request({
+    url: '/business/dealRecharge/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询充值订单详细
+export function getDealRecharge(id) {
+  return request({
+    url: '/business/dealRecharge/' + id,
+    method: 'get'
+  })
+}
+
+// 新增充值订单
+export function addDealRecharge(data) {
+  return request({
+    url: '/business/dealRecharge',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改充值订单
+export function updateDealRecharge(data) {
+  return request({
+    url: '/business/dealRecharge',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除充值订单
+export function delDealRecharge(id) {
+  return request({
+    url: '/business/dealRecharge/' + id,
+    method: 'delete'
+  })
+}

src/api/business/dealTransfer.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询转账列表
+// 查询转账订单列表
 export function listDealTransfer(query) {
   return request({
     url: '/business/dealTransfer/list',
@@ -9,7 +9,7 @@ export function listDealTransfer(query) {
   })
 }
 
-// 查询转账详细
+// 查询转账订单详细
 export function getDealTransfer(id) {
   return request({
     url: '/business/dealTransfer/' + id,
@@ -17,7 +17,7 @@ export function getDealTransfer(id) {
   })
 }
 
-// 新增转账
+// 新增转账订单
 export function addDealTransfer(data) {
   return request({
     url: '/business/dealTransfer',
@@ -26,7 +26,7 @@ export function addDealTransfer(data) {
   })
 }
 
-// 修改转账
+// 修改转账订单
 export function updateDealTransfer(data) {
   return request({
     url: '/business/dealTransfer',
@@ -35,7 +35,7 @@ export function updateDealTransfer(data) {
   })
 }
 
-// 删除转账
+// 删除转账订单
 export function delDealTransfer(id) {
   return request({
     url: '/business/dealTransfer/' + id,

src/api/business/dealWithdrawal.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询提现订单列表
+export function listDealWithdrawal(query) {
+  return request({
+    url: '/business/dealWithdrawal/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询提现订单详细
+export function getDealWithdrawal(id) {
+  return request({
+    url: '/business/dealWithdrawal/' + id,
+    method: 'get'
+  })
+}
+
+// 新增提现订单
+export function addDealWithdrawal(data) {
+  return request({
+    url: '/business/dealWithdrawal',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改提现订单
+export function updateDealWithdrawal(data) {
+  return request({
+    url: '/business/dealWithdrawal',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除提现订单
+export function delDealWithdrawal(id) {
+  return request({
+    url: '/business/dealWithdrawal/' + id,
+    method: 'delete'
+  })
+}

src/api/business/feeRecord.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询手续费记录列表
+export function listFeeRecord(query) {
+  return request({
+    url: '/business/feeRecord/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询手续费记录详细
+export function getFeeRecord(id) {
+  return request({
+    url: '/business/feeRecord/' + id,
+    method: 'get'
+  })
+}
+
+// 新增手续费记录
+export function addFeeRecord(data) {
+  return request({
+    url: '/business/feeRecord',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改手续费记录
+export function updateFeeRecord(data) {
+  return request({
+    url: '/business/feeRecord',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除手续费记录
+export function delFeeRecord(id) {
+  return request({
+    url: '/business/feeRecord/' + id,
+    method: 'delete'
+  })
+}

src/api/business/feeStandard.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询手续费规则列表
+export function listFeeStandard(query) {
+  return request({
+    url: '/business/feeStandard/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询手续费规则详细
+export function getFeeStandard(feeStandardId) {
+  return request({
+    url: '/business/feeStandard/' + feeStandardId,
+    method: 'get'
+  })
+}
+
+// 新增手续费规则
+export function addFeeStandard(data) {
+  return request({
+    url: '/business/feeStandard',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改手续费规则
+export function updateFeeStandard(data) {
+  return request({
+    url: '/business/feeStandard',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除手续费规则
+export function delFeeStandard(feeStandardId) {
+  return request({
+    url: '/business/feeStandard/' + feeStandardId,
+    method: 'delete'
+  })
+}

src/api/business/recordPaymentReceipt.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询支付回执列表
+export function listRecordPaymentReceipt(query) {
+  return request({
+    url: '/business/recordPaymentReceipt/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询支付回执详细
+export function getRecordPaymentReceipt(id) {
+  return request({
+    url: '/business/recordPaymentReceipt/' + id,
+    method: 'get'
+  })
+}
+
+// 新增支付回执
+export function addRecordPaymentReceipt(data) {
+  return request({
+    url: '/business/recordPaymentReceipt',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改支付回执
+export function updateRecordPaymentReceipt(data) {
+  return request({
+    url: '/business/recordPaymentReceipt',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除支付回执
+export function delRecordPaymentReceipt(id) {
+  return request({
+    url: '/business/recordPaymentReceipt/' + id,
+    method: 'delete'
+  })
+}

src/views/business/dealPayment/index.vue

@@ -0,0 +1,483 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="付款人id" prop="payerId">
+        <el-input
+          v-model="queryParams.payerId"
+          placeholder="请输入付款人id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="付款账户名" prop="payerAccountName">
+        <el-input
+          v-model="queryParams.payerAccountName"
+          placeholder="请输入付款账户名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="收款人id" prop="payeeId">
+        <el-input
+          v-model="queryParams.payeeId"
+          placeholder="请输入收款人id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="收款账户名" prop="payeeAccountName">
+        <el-input
+          v-model="queryParams.payeeAccountName"
+          placeholder="请输入收款账户名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="交易金额" prop="transactionAmount">
+        <el-input
+          v-model="queryParams.transactionAmount"
+          placeholder="请输入交易金额"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="手续费" prop="fee">
+        <el-input
+          v-model="queryParams.fee"
+          placeholder="请输入手续费"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="支付方式" prop="paymentMethod">
+        <el-input
+          v-model="queryParams.paymentMethod"
+          placeholder="请输入支付方式"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建人" prop="creator">
+        <el-input
+          v-model="queryParams.creator"
+          placeholder="请输入创建人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="修改人" prop="modifier">
+        <el-input
+          v-model="queryParams.modifier"
+          placeholder="请输入修改人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </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>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['business:dealPayment:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['business:dealPayment:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['business:dealPayment:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['business:dealPayment:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="dealPaymentList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="订单编号" align="center" prop="id" v-if="true"/>
+      <el-table-column label="付款人id" align="center" prop="payerId" />
+      <el-table-column label="付款账户名" align="center" prop="payerAccountName" />
+      <el-table-column label="收款人id" align="center" prop="payeeId" />
+      <el-table-column label="收款账户名" align="center" prop="payeeAccountName" />
+      <el-table-column label="交易金额" align="center" prop="transactionAmount" />
+      <el-table-column label="手续费" align="center" prop="fee" />
+      <el-table-column label="付款类型" align="center" prop="paymentType" />
+      <el-table-column label="订单状态" align="center" prop="status" />
+      <el-table-column label="支付方式" align="center" prop="paymentMethod" />
+      <el-table-column label="创建人" align="center" prop="creator" />
+      <el-table-column label="修改人" align="center" prop="modifier" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleDetail(scope.row)"
+            >详情</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['business:dealPayment:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['business:dealPayment:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改付款订单对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="auto">
+        <el-form-item label="付款人id" prop="payerId">
+          <el-input v-model="form.payerId" placeholder="请输入付款人id" />
+        </el-form-item>
+        <el-form-item label="付款账户名" prop="payerAccountName">
+          <el-input v-model="form.payerAccountName" placeholder="请输入付款账户名" />
+        </el-form-item>
+        <el-form-item label="收款人id" prop="payeeId">
+          <el-input v-model="form.payeeId" placeholder="请输入收款人id" />
+        </el-form-item>
+        <el-form-item label="收款账户名" prop="payeeAccountName">
+          <el-input v-model="form.payeeAccountName" placeholder="请输入收款账户名" />
+        </el-form-item>
+        <el-form-item label="交易金额" prop="transactionAmount">
+          <el-input v-model="form.transactionAmount" placeholder="请输入交易金额" />
+        </el-form-item>
+        <el-form-item label="手续费" prop="fee">
+          <el-input v-model="form.fee" placeholder="请输入手续费" />
+        </el-form-item>
+        <el-form-item label="支付方式" prop="paymentMethod">
+          <el-input v-model="form.paymentMethod" placeholder="请输入支付方式" />
+        </el-form-item>
+        <el-form-item label="创建人" prop="creator">
+          <el-input v-model="form.creator" placeholder="请输入创建人" />
+        </el-form-item>
+        <el-form-item label="修改人" prop="modifier">
+          <el-input v-model="form.modifier" placeholder="请输入修改人" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 付款订单详情 -->
+        <el-dialog :title="title" :visible.sync="detailOpen" width="700px" append-to-body>
+            <el-form ref="form" :model="form" label-width="auto">
+                    <el-form-item label="付款人id：">
+                      {{form.payerId}}
+                    </el-form-item>
+                    <el-form-item label="付款账户名：">
+                      {{form.payerAccountName}}
+                    </el-form-item>
+                    <el-form-item label="收款人id：">
+                      {{form.payeeId}}
+                    </el-form-item>
+                    <el-form-item label="收款账户名：">
+                      {{form.payeeAccountName}}
+                    </el-form-item>
+                    <el-form-item label="交易金额：">
+                      {{form.transactionAmount}}
+                    </el-form-item>
+                    <el-form-item label="手续费：">
+                      {{form.fee}}
+                    </el-form-item>
+                    <el-form-item label="支付方式：">
+                      {{form.paymentMethod}}
+                    </el-form-item>
+                    <el-form-item label="创建人：">
+                      {{form.creator}}
+                    </el-form-item>
+                    <el-form-item label="修改人：">
+                      {{form.modifier}}
+                    </el-form-item>
+                    <el-form-item label="备注：">
+                      {{form.remark}}
+
+                    </el-form-item>
+                  </el-form>
+                  <div slot="footer" class="dialog-footer">
+                    <el-button @click="cancel">关 闭</el-button>
+                  </div>
+        </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listDealPayment, getDealPayment, delDealPayment, addDealPayment, updateDealPayment } from "@/api/business/dealPayment";
+
+export default {
+  name: "DealPayment",
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 付款订单表格数据
+      dealPaymentList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否显示详情弹出层
+      detailOpen: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        payerId: undefined,
+        payerAccountName: undefined,
+        payeeId: undefined,
+        payeeAccountName: undefined,
+        transactionAmount: undefined,
+        fee: undefined,
+        paymentType: undefined,
+        status: undefined,
+        paymentMethod: undefined,
+        creator: undefined,
+        modifier: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        id: [
+          { required: true, message: "订单编号不能为空", trigger: "blur" }
+        ],
+        payerId: [
+          { required: true, message: "付款人id不能为空", trigger: "blur" }
+        ],
+        payerAccountName: [
+          { required: true, message: "付款账户名不能为空", trigger: "blur" }
+        ],
+        payeeId: [
+          { required: true, message: "收款人id不能为空", trigger: "blur" }
+        ],
+        payeeAccountName: [
+          { required: true, message: "收款账户名不能为空", trigger: "blur" }
+        ],
+        transactionAmount: [
+          { required: true, message: "交易金额不能为空", trigger: "blur" }
+        ],
+        fee: [
+          { required: true, message: "手续费不能为空", trigger: "blur" }
+        ],
+        paymentType: [
+          { required: true, message: "付款类型不能为空", trigger: "change" }
+        ],
+        status: [
+          { required: true, message: "订单状态不能为空", trigger: "change" }
+        ],
+        paymentMethod: [
+          { required: true, message: "支付方式不能为空", trigger: "blur" }
+        ],
+        createTime: [
+          { required: true, message: "创建时间不能为空", trigger: "blur" }
+        ],
+        creator: [
+          { required: true, message: "创建人不能为空", trigger: "blur" }
+        ],
+        modifier: [
+          { required: true, message: "修改人不能为空", trigger: "blur" }
+        ],
+        remark: [
+          { required: true, message: "备注不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询付款订单列表 */
+    getList() {
+      this.loading = true;
+      listDealPayment(this.queryParams).then(response => {
+        this.dealPaymentList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.detailOpen = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        payerId: undefined,
+        payerAccountName: undefined,
+        payeeId: undefined,
+        payeeAccountName: undefined,
+        transactionAmount: undefined,
+        fee: undefined,
+        paymentType: undefined,
+        status: undefined,
+        paymentMethod: undefined,
+        createTime: undefined,
+        updateTime: undefined,
+        creator: undefined,
+        modifier: undefined,
+        remark: undefined,
+        delFlag: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加付款订单";
+    },
+    /** 详情按钮操作 */
+    handleDetail(row){
+        this.reset();
+        this.form = row;
+        this.detailOpen = true;
+        this.title = "付款订单";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const id = row.id || this.ids
+      getDealPayment(id).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改付款订单";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.id != null) {
+            updateDealPayment(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addDealPayment(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除付款订单编号为"' + ids + '"的数据项？').then(() => {
+        this.loading = true;
+        return delDealPayment(ids);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('business/dealPayment/export', {
+        ...this.queryParams
+      }, `dealPayment_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/business/dealProxy/index.vue

@@ -0,0 +1,463 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="代缴人id" prop="proxyPayerId">
+        <el-input
+          v-model="queryParams.proxyPayerId"
+          placeholder="请输入代缴人id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="代缴账户名" prop="proxyPayerAccountName">
+        <el-input
+          v-model="queryParams.proxyPayerAccountName"
+          placeholder="请输入代缴账户名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="交易金额" prop="transactionAmount">
+        <el-input
+          v-model="queryParams.transactionAmount"
+          placeholder="请输入交易金额"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="手续费" prop="fee">
+        <el-input
+          v-model="queryParams.fee"
+          placeholder="请输入手续费"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="代缴服务账户" prop="proxyServiceAccount">
+        <el-input
+          v-model="queryParams.proxyServiceAccount"
+          placeholder="请输入代缴服务账户"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建人" prop="creator">
+        <el-input
+          v-model="queryParams.creator"
+          placeholder="请输入创建人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="修改人" prop="modifier">
+        <el-input
+          v-model="queryParams.modifier"
+          placeholder="请输入修改人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="支付渠道" prop="paymentChannel">
+        <el-input
+          v-model="queryParams.paymentChannel"
+          placeholder="请输入支付渠道"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </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>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['business:dealProxy:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['business:dealProxy:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['business:dealProxy:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['business:dealProxy:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="dealProxyList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="订单编号" align="center" prop="id" v-if="true"/>
+      <el-table-column label="代缴人id" align="center" prop="proxyPayerId" />
+      <el-table-column label="代缴账户名" align="center" prop="proxyPayerAccountName" />
+      <el-table-column label="交易金额" align="center" prop="transactionAmount" />
+      <el-table-column label="手续费" align="center" prop="fee" />
+      <el-table-column label="代缴服务类型" align="center" prop="proxyServiceType" />
+      <el-table-column label="代缴服务账户" align="center" prop="proxyServiceAccount" />
+      <el-table-column label="订单状态" align="center" prop="status" />
+      <el-table-column label="创建人" align="center" prop="creator" />
+      <el-table-column label="修改人" align="center" prop="modifier" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="支付渠道" align="center" prop="paymentChannel" />
+      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleDetail(scope.row)"
+            >详情</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['business:dealProxy:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['business:dealProxy:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改代缴订单对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="auto">
+        <el-form-item label="代缴人id" prop="proxyPayerId">
+          <el-input v-model="form.proxyPayerId" placeholder="请输入代缴人id" />
+        </el-form-item>
+        <el-form-item label="代缴账户名" prop="proxyPayerAccountName">
+          <el-input v-model="form.proxyPayerAccountName" placeholder="请输入代缴账户名" />
+        </el-form-item>
+        <el-form-item label="交易金额" prop="transactionAmount">
+          <el-input v-model="form.transactionAmount" placeholder="请输入交易金额" />
+        </el-form-item>
+        <el-form-item label="手续费" prop="fee">
+          <el-input v-model="form.fee" placeholder="请输入手续费" />
+        </el-form-item>
+        <el-form-item label="代缴服务账户" prop="proxyServiceAccount">
+          <el-input v-model="form.proxyServiceAccount" placeholder="请输入代缴服务账户" />
+        </el-form-item>
+        <el-form-item label="创建人" prop="creator">
+          <el-input v-model="form.creator" placeholder="请输入创建人" />
+        </el-form-item>
+        <el-form-item label="修改人" prop="modifier">
+          <el-input v-model="form.modifier" placeholder="请输入修改人" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="支付渠道" prop="paymentChannel">
+          <el-input v-model="form.paymentChannel" placeholder="请输入支付渠道" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 代缴订单详情 -->
+        <el-dialog :title="title" :visible.sync="detailOpen" width="700px" append-to-body>
+            <el-form ref="form" :model="form" label-width="auto">
+                    <el-form-item label="代缴人id：">
+                      {{form.proxyPayerId}}
+                    </el-form-item>
+                    <el-form-item label="代缴账户名：">
+                      {{form.proxyPayerAccountName}}
+                    </el-form-item>
+                    <el-form-item label="交易金额：">
+                      {{form.transactionAmount}}
+                    </el-form-item>
+                    <el-form-item label="手续费：">
+                      {{form.fee}}
+                    </el-form-item>
+                    <el-form-item label="代缴服务账户：">
+                      {{form.proxyServiceAccount}}
+                    </el-form-item>
+                    <el-form-item label="创建人：">
+                      {{form.creator}}
+                    </el-form-item>
+                    <el-form-item label="修改人：">
+                      {{form.modifier}}
+                    </el-form-item>
+                    <el-form-item label="备注：">
+                      {{form.remark}}
+
+                    </el-form-item>
+                    <el-form-item label="支付渠道：">
+                      {{form.paymentChannel}}
+                    </el-form-item>
+                  </el-form>
+                  <div slot="footer" class="dialog-footer">
+                    <el-button @click="cancel">关 闭</el-button>
+                  </div>
+        </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listDealProxy, getDealProxy, delDealProxy, addDealProxy, updateDealProxy } from "@/api/business/dealProxy";
+
+export default {
+  name: "DealProxy",
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 代缴订单表格数据
+      dealProxyList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否显示详情弹出层
+      detailOpen: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        proxyPayerId: undefined,
+        proxyPayerAccountName: undefined,
+        transactionAmount: undefined,
+        fee: undefined,
+        proxyServiceType: undefined,
+        proxyServiceAccount: undefined,
+        status: undefined,
+        creator: undefined,
+        modifier: undefined,
+        paymentChannel: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        id: [
+          { required: true, message: "订单编号不能为空", trigger: "blur" }
+        ],
+        proxyPayerId: [
+          { required: true, message: "代缴人id不能为空", trigger: "blur" }
+        ],
+        proxyPayerAccountName: [
+          { required: true, message: "代缴账户名不能为空", trigger: "blur" }
+        ],
+        transactionAmount: [
+          { required: true, message: "交易金额不能为空", trigger: "blur" }
+        ],
+        fee: [
+          { required: true, message: "手续费不能为空", trigger: "blur" }
+        ],
+        proxyServiceType: [
+          { required: true, message: "代缴服务类型不能为空", trigger: "change" }
+        ],
+        proxyServiceAccount: [
+          { required: true, message: "代缴服务账户不能为空", trigger: "blur" }
+        ],
+        status: [
+          { required: true, message: "订单状态不能为空", trigger: "change" }
+        ],
+        createTime: [
+          { required: true, message: "创建时间不能为空", trigger: "blur" }
+        ],
+        creator: [
+          { required: true, message: "创建人不能为空", trigger: "blur" }
+        ],
+        modifier: [
+          { required: true, message: "修改人不能为空", trigger: "blur" }
+        ],
+        remark: [
+          { required: true, message: "备注不能为空", trigger: "blur" }
+        ],
+        paymentChannel: [
+          { required: true, message: "支付渠道不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询代缴订单列表 */
+    getList() {
+      this.loading = true;
+      listDealProxy(this.queryParams).then(response => {
+        this.dealProxyList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.detailOpen = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        proxyPayerId: undefined,
+        proxyPayerAccountName: undefined,
+        transactionAmount: undefined,
+        fee: undefined,
+        proxyServiceType: undefined,
+        proxyServiceAccount: undefined,
+        status: undefined,
+        createTime: undefined,
+        updateTime: undefined,
+        creator: undefined,
+        modifier: undefined,
+        remark: undefined,
+        paymentChannel: undefined,
+        delFlag: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加代缴订单";
+    },
+    /** 详情按钮操作 */
+    handleDetail(row){
+        this.reset();
+        this.form = row;
+        this.detailOpen = true;
+        this.title = "代缴订单";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const id = row.id || this.ids
+      getDealProxy(id).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改代缴订单";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.id != null) {
+            updateDealProxy(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addDealProxy(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除代缴订单编号为"' + ids + '"的数据项？').then(() => {
+        this.loading = true;
+        return delDealProxy(ids);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('business/dealProxy/export', {
+        ...this.queryParams
+      }, `dealProxy_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/business/dealReceipt/index.vue

@@ -0,0 +1,483 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="付款人id" prop="payerId">
+        <el-input
+          v-model="queryParams.payerId"
+          placeholder="请输入付款人id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="付款账户名" prop="payerAccountName">
+        <el-input
+          v-model="queryParams.payerAccountName"
+          placeholder="请输入付款账户名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="收款人id" prop="payeeId">
+        <el-input
+          v-model="queryParams.payeeId"
+          placeholder="请输入收款人id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="收款账户名" prop="payeeAccountName">
+        <el-input
+          v-model="queryParams.payeeAccountName"
+          placeholder="请输入收款账户名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="交易金额" prop="transactionAmount">
+        <el-input
+          v-model="queryParams.transactionAmount"
+          placeholder="请输入交易金额"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="手续费" prop="fee">
+        <el-input
+          v-model="queryParams.fee"
+          placeholder="请输入手续费"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="支付方式" prop="paymentMethod">
+        <el-input
+          v-model="queryParams.paymentMethod"
+          placeholder="请输入支付方式"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建人" prop="creator">
+        <el-input
+          v-model="queryParams.creator"
+          placeholder="请输入创建人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="修改人" prop="modifier">
+        <el-input
+          v-model="queryParams.modifier"
+          placeholder="请输入修改人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </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>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['business:dealReceipt:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['business:dealReceipt:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['business:dealReceipt:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['business:dealReceipt:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="dealReceiptList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="订单编号" align="center" prop="id" v-if="true"/>
+      <el-table-column label="付款人id" align="center" prop="payerId" />
+      <el-table-column label="付款账户名" align="center" prop="payerAccountName" />
+      <el-table-column label="收款人id" align="center" prop="payeeId" />
+      <el-table-column label="收款账户名" align="center" prop="payeeAccountName" />
+      <el-table-column label="交易金额" align="center" prop="transactionAmount" />
+      <el-table-column label="手续费" align="center" prop="fee" />
+      <el-table-column label="收款类型" align="center" prop="receiptType" />
+      <el-table-column label="订单状态" align="center" prop="status" />
+      <el-table-column label="支付方式" align="center" prop="paymentMethod" />
+      <el-table-column label="创建人" align="center" prop="creator" />
+      <el-table-column label="修改人" align="center" prop="modifier" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleDetail(scope.row)"
+            >详情</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['business:dealReceipt:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['business:dealReceipt:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改收款订单对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="auto">
+        <el-form-item label="付款人id" prop="payerId">
+          <el-input v-model="form.payerId" placeholder="请输入付款人id" />
+        </el-form-item>
+        <el-form-item label="付款账户名" prop="payerAccountName">
+          <el-input v-model="form.payerAccountName" placeholder="请输入付款账户名" />
+        </el-form-item>
+        <el-form-item label="收款人id" prop="payeeId">
+          <el-input v-model="form.payeeId" placeholder="请输入收款人id" />
+        </el-form-item>
+        <el-form-item label="收款账户名" prop="payeeAccountName">
+          <el-input v-model="form.payeeAccountName" placeholder="请输入收款账户名" />
+        </el-form-item>
+        <el-form-item label="交易金额" prop="transactionAmount">
+          <el-input v-model="form.transactionAmount" placeholder="请输入交易金额" />
+        </el-form-item>
+        <el-form-item label="手续费" prop="fee">
+          <el-input v-model="form.fee" placeholder="请输入手续费" />
+        </el-form-item>
+        <el-form-item label="支付方式" prop="paymentMethod">
+          <el-input v-model="form.paymentMethod" placeholder="请输入支付方式" />
+        </el-form-item>
+        <el-form-item label="创建人" prop="creator">
+          <el-input v-model="form.creator" placeholder="请输入创建人" />
+        </el-form-item>
+        <el-form-item label="修改人" prop="modifier">
+          <el-input v-model="form.modifier" placeholder="请输入修改人" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 收款订单详情 -->
+        <el-dialog :title="title" :visible.sync="detailOpen" width="700px" append-to-body>
+            <el-form ref="form" :model="form" label-width="auto">
+                    <el-form-item label="付款人id：">
+                      {{form.payerId}}
+                    </el-form-item>
+                    <el-form-item label="付款账户名：">
+                      {{form.payerAccountName}}
+                    </el-form-item>
+                    <el-form-item label="收款人id：">
+                      {{form.payeeId}}
+                    </el-form-item>
+                    <el-form-item label="收款账户名：">
+                      {{form.payeeAccountName}}
+                    </el-form-item>
+                    <el-form-item label="交易金额：">
+                      {{form.transactionAmount}}
+                    </el-form-item>
+                    <el-form-item label="手续费：">
+                      {{form.fee}}
+                    </el-form-item>
+                    <el-form-item label="支付方式：">
+                      {{form.paymentMethod}}
+                    </el-form-item>
+                    <el-form-item label="创建人：">
+                      {{form.creator}}
+                    </el-form-item>
+                    <el-form-item label="修改人：">
+                      {{form.modifier}}
+                    </el-form-item>
+                    <el-form-item label="备注：">
+                      {{form.remark}}
+
+                    </el-form-item>
+                  </el-form>
+                  <div slot="footer" class="dialog-footer">
+                    <el-button @click="cancel">关 闭</el-button>
+                  </div>
+        </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listDealReceipt, getDealReceipt, delDealReceipt, addDealReceipt, updateDealReceipt } from "@/api/business/dealReceipt";
+
+export default {
+  name: "DealReceipt",
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 收款订单表格数据
+      dealReceiptList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否显示详情弹出层
+      detailOpen: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        payerId: undefined,
+        payerAccountName: undefined,
+        payeeId: undefined,
+        payeeAccountName: undefined,
+        transactionAmount: undefined,
+        fee: undefined,
+        receiptType: undefined,
+        status: undefined,
+        paymentMethod: undefined,
+        creator: undefined,
+        modifier: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        id: [
+          { required: true, message: "订单编号不能为空", trigger: "blur" }
+        ],
+        payerId: [
+          { required: true, message: "付款人id不能为空", trigger: "blur" }
+        ],
+        payerAccountName: [
+          { required: true, message: "付款账户名不能为空", trigger: "blur" }
+        ],
+        payeeId: [
+          { required: true, message: "收款人id不能为空", trigger: "blur" }
+        ],
+        payeeAccountName: [
+          { required: true, message: "收款账户名不能为空", trigger: "blur" }
+        ],
+        transactionAmount: [
+          { required: true, message: "交易金额不能为空", trigger: "blur" }
+        ],
+        fee: [
+          { required: true, message: "手续费不能为空", trigger: "blur" }
+        ],
+        receiptType: [
+          { required: true, message: "收款类型不能为空", trigger: "change" }
+        ],
+        status: [
+          { required: true, message: "订单状态不能为空", trigger: "change" }
+        ],
+        paymentMethod: [
+          { required: true, message: "支付方式不能为空", trigger: "blur" }
+        ],
+        createTime: [
+          { required: true, message: "创建时间不能为空", trigger: "blur" }
+        ],
+        creator: [
+          { required: true, message: "创建人不能为空", trigger: "blur" }
+        ],
+        modifier: [
+          { required: true, message: "修改人不能为空", trigger: "blur" }
+        ],
+        remark: [
+          { required: true, message: "备注不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询收款订单列表 */
+    getList() {
+      this.loading = true;
+      listDealReceipt(this.queryParams).then(response => {
+        this.dealReceiptList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.detailOpen = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        payerId: undefined,
+        payerAccountName: undefined,
+        payeeId: undefined,
+        payeeAccountName: undefined,
+        transactionAmount: undefined,
+        fee: undefined,
+        receiptType: undefined,
+        status: undefined,
+        paymentMethod: undefined,
+        createTime: undefined,
+        updateTime: undefined,
+        creator: undefined,
+        modifier: undefined,
+        remark: undefined,
+        delFlag: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加收款订单";
+    },
+    /** 详情按钮操作 */
+    handleDetail(row){
+        this.reset();
+        this.form = row;
+        this.detailOpen = true;
+        this.title = "收款订单";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const id = row.id || this.ids
+      getDealReceipt(id).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改收款订单";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.id != null) {
+            updateDealReceipt(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addDealReceipt(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除收款订单编号为"' + ids + '"的数据项？').then(() => {
+        this.loading = true;
+        return delDealReceipt(ids);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('business/dealReceipt/export', {
+        ...this.queryParams
+      }, `dealReceipt_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/business/dealRecharge/index.vue

@@ -0,0 +1,477 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="充值用户id" prop="rechargeUserId">
+        <el-input
+          v-model="queryParams.rechargeUserId"
+          placeholder="请输入充值用户id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="充值账户名" prop="rechargeAccountName">
+        <el-input
+          v-model="queryParams.rechargeAccountName"
+          placeholder="请输入充值账户名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="交易金额" prop="transactionAmount">
+        <el-input
+          v-model="queryParams.transactionAmount"
+          placeholder="请输入交易金额"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="手续费" prop="fee">
+        <el-input
+          v-model="queryParams.fee"
+          placeholder="请输入手续费"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="实际到账金额" prop="actualAmount">
+        <el-input
+          v-model="queryParams.actualAmount"
+          placeholder="请输入实际到账金额"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="支付方式" prop="paymentMethod">
+        <el-input
+          v-model="queryParams.paymentMethod"
+          placeholder="请输入支付方式"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="充值方式" prop="rechargeMethod">
+        <el-input
+          v-model="queryParams.rechargeMethod"
+          placeholder="请输入充值方式"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建人" prop="creator">
+        <el-input
+          v-model="queryParams.creator"
+          placeholder="请输入创建人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="修改人" prop="modifier">
+        <el-input
+          v-model="queryParams.modifier"
+          placeholder="请输入修改人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </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>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['business:dealRecharge:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['business:dealRecharge:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['business:dealRecharge:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['business:dealRecharge:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="dealRechargeList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="订单编号" align="center" prop="id" v-if="true"/>
+      <el-table-column label="充值用户id" align="center" prop="rechargeUserId" />
+      <el-table-column label="充值账户名" align="center" prop="rechargeAccountName" />
+      <el-table-column label="交易金额" align="center" prop="transactionAmount" />
+      <el-table-column label="手续费" align="center" prop="fee" />
+      <el-table-column label="实际到账金额" align="center" prop="actualAmount" />
+      <el-table-column label="支付方式" align="center" prop="paymentMethod" />
+      <el-table-column label="充值方式" align="center" prop="rechargeMethod" />
+      <el-table-column label="订单状态" align="center" prop="status" />
+      <el-table-column label="创建人" align="center" prop="creator" />
+      <el-table-column label="修改人" align="center" prop="modifier" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleDetail(scope.row)"
+            >详情</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['business:dealRecharge:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['business:dealRecharge:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改充值订单对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="auto">
+        <el-form-item label="充值用户id" prop="rechargeUserId">
+          <el-input v-model="form.rechargeUserId" placeholder="请输入充值用户id" />
+        </el-form-item>
+        <el-form-item label="充值账户名" prop="rechargeAccountName">
+          <el-input v-model="form.rechargeAccountName" placeholder="请输入充值账户名" />
+        </el-form-item>
+        <el-form-item label="交易金额" prop="transactionAmount">
+          <el-input v-model="form.transactionAmount" placeholder="请输入交易金额" />
+        </el-form-item>
+        <el-form-item label="手续费" prop="fee">
+          <el-input v-model="form.fee" placeholder="请输入手续费" />
+        </el-form-item>
+        <el-form-item label="实际到账金额" prop="actualAmount">
+          <el-input v-model="form.actualAmount" placeholder="请输入实际到账金额" />
+        </el-form-item>
+        <el-form-item label="支付方式" prop="paymentMethod">
+          <el-input v-model="form.paymentMethod" placeholder="请输入支付方式" />
+        </el-form-item>
+        <el-form-item label="充值方式" prop="rechargeMethod">
+          <el-input v-model="form.rechargeMethod" placeholder="请输入充值方式" />
+        </el-form-item>
+        <el-form-item label="创建人" prop="creator">
+          <el-input v-model="form.creator" placeholder="请输入创建人" />
+        </el-form-item>
+        <el-form-item label="修改人" prop="modifier">
+          <el-input v-model="form.modifier" placeholder="请输入修改人" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 充值订单详情 -->
+        <el-dialog :title="title" :visible.sync="detailOpen" width="700px" append-to-body>
+            <el-form ref="form" :model="form" label-width="auto">
+                    <el-form-item label="充值用户id：">
+                      {{form.rechargeUserId}}
+                    </el-form-item>
+                    <el-form-item label="充值账户名：">
+                      {{form.rechargeAccountName}}
+                    </el-form-item>
+                    <el-form-item label="交易金额：">
+                      {{form.transactionAmount}}
+                    </el-form-item>
+                    <el-form-item label="手续费：">
+                      {{form.fee}}
+                    </el-form-item>
+                    <el-form-item label="实际到账金额：">
+                      {{form.actualAmount}}
+                    </el-form-item>
+                    <el-form-item label="支付方式：">
+                      {{form.paymentMethod}}
+                    </el-form-item>
+                    <el-form-item label="充值方式：">
+                      {{form.rechargeMethod}}
+                    </el-form-item>
+                    <el-form-item label="创建人：">
+                      {{form.creator}}
+                    </el-form-item>
+                    <el-form-item label="修改人：">
+                      {{form.modifier}}
+                    </el-form-item>
+                    <el-form-item label="备注：">
+                      {{form.remark}}
+
+                    </el-form-item>
+                  </el-form>
+                  <div slot="footer" class="dialog-footer">
+                    <el-button @click="cancel">关 闭</el-button>
+                  </div>
+        </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listDealRecharge, getDealRecharge, delDealRecharge, addDealRecharge, updateDealRecharge } from "@/api/business/dealRecharge";
+
+export default {
+  name: "DealRecharge",
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 充值订单表格数据
+      dealRechargeList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否显示详情弹出层
+      detailOpen: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        rechargeUserId: undefined,
+        rechargeAccountName: undefined,
+        transactionAmount: undefined,
+        fee: undefined,
+        actualAmount: undefined,
+        paymentMethod: undefined,
+        rechargeMethod: undefined,
+        status: undefined,
+        creator: undefined,
+        modifier: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        id: [
+          { required: true, message: "订单编号不能为空", trigger: "blur" }
+        ],
+        rechargeUserId: [
+          { required: true, message: "充值用户id不能为空", trigger: "blur" }
+        ],
+        rechargeAccountName: [
+          { required: true, message: "充值账户名不能为空", trigger: "blur" }
+        ],
+        transactionAmount: [
+          { required: true, message: "交易金额不能为空", trigger: "blur" }
+        ],
+        fee: [
+          { required: true, message: "手续费不能为空", trigger: "blur" }
+        ],
+        actualAmount: [
+          { required: true, message: "实际到账金额不能为空", trigger: "blur" }
+        ],
+        paymentMethod: [
+          { required: true, message: "支付方式不能为空", trigger: "blur" }
+        ],
+        rechargeMethod: [
+          { required: true, message: "充值方式不能为空", trigger: "blur" }
+        ],
+        status: [
+          { required: true, message: "订单状态不能为空", trigger: "change" }
+        ],
+        createTime: [
+          { required: true, message: "创建时间不能为空", trigger: "blur" }
+        ],
+        creator: [
+          { required: true, message: "创建人不能为空", trigger: "blur" }
+        ],
+        modifier: [
+          { required: true, message: "修改人不能为空", trigger: "blur" }
+        ],
+        remark: [
+          { required: true, message: "备注不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询充值订单列表 */
+    getList() {
+      this.loading = true;
+      listDealRecharge(this.queryParams).then(response => {
+        this.dealRechargeList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.detailOpen = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        rechargeUserId: undefined,
+        rechargeAccountName: undefined,
+        transactionAmount: undefined,
+        fee: undefined,
+        actualAmount: undefined,
+        paymentMethod: undefined,
+        rechargeMethod: undefined,
+        status: undefined,
+        createTime: undefined,
+        updateTime: undefined,
+        creator: undefined,
+        modifier: undefined,
+        remark: undefined,
+        delFlag: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加充值订单";
+    },
+    /** 详情按钮操作 */
+    handleDetail(row){
+        this.reset();
+        this.form = row;
+        this.detailOpen = true;
+        this.title = "充值订单";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const id = row.id || this.ids
+      getDealRecharge(id).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改充值订单";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.id != null) {
+            updateDealRecharge(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addDealRecharge(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除充值订单编号为"' + ids + '"的数据项？').then(() => {
+        this.loading = true;
+        return delDealRecharge(ids);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('business/dealRecharge/export', {
+        ...this.queryParams
+      }, `dealRecharge_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/business/dealTransfer/index.vue

@@ -1,372 +1,483 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="$t('business.dealTransfer.transferAccount')" prop="userAccount">
+      <el-form-item label="转出人id" prop="senderId">
-        <el-input v-model="queryParams.userAccount" :placeholder="$t('business.dealTransfer.transferAccountPlaceholder')" clearable @keyup.enter.native="handleQuery" />
+        <el-input
+          v-model="queryParams.senderId"
+          placeholder="请输入转出人id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
-      <el-form-item :label="$t('business.dealTransfer.receiveAccount')" prop="toAccount">
+      <el-form-item label="转出账户名" prop="senderAccountName">
-        <el-input v-model="queryParams.toAccount" :placeholder="$t('business.dealTransfer.receiveAccountPlaceholder')" clearable @keyup.enter.native="handleQuery" />
+        <el-input
+          v-model="queryParams.senderAccountName"
+          placeholder="请输入转出账户名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
-      <el-form-item :label="$t('common.createTime')">
+      <el-form-item label="接收人id" prop="receiverId">
-        <el-date-picker v-model="daterangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
+        <el-input
-          type="daterange" range-separator="-" :start-placeholder="$t('common.startDate')" :end-placeholder="$t('common.endDate')"
+          v-model="queryParams.receiverId"
-          :default-time="['00:00:00', '23:59:59']"></el-date-picker>
+          placeholder="请输入接收人id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="接收人账户名" prop="receiverAccountName">
+        <el-input
+          v-model="queryParams.receiverAccountName"
+          placeholder="请输入接收人账户名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="交易金额" prop="transactionAmount">
+        <el-input
+          v-model="queryParams.transactionAmount"
+          placeholder="请输入交易金额"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="手续费" prop="fee">
+        <el-input
+          v-model="queryParams.fee"
+          placeholder="请输入手续费"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="支付方式" prop="paymentMethod">
+        <el-input
+          v-model="queryParams.paymentMethod"
+          placeholder="请输入支付方式"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建人" prop="creator">
+        <el-input
+          v-model="queryParams.creator"
+          placeholder="请输入创建人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="修改人" prop="modifier">
+        <el-input
+          v-model="queryParams.modifier"
+          placeholder="请输入修改人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('common.search') }}</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('common.reset') }}</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+        <el-button
-          v-hasPermi="['business:dealTransfer:add']">{{ $t('common.add') }}</el-button>
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['business:dealTransfer:add']"
+        >新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+        <el-button
-          v-hasPermi="['business:dealTransfer:edit']">{{ $t('common.edit') }}</el-button>
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['business:dealTransfer:edit']"
+        >修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+        <el-button
-          v-hasPermi="['business:dealTransfer:remove']">{{ $t('common.delete') }}</el-button>
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['business:dealTransfer:remove']"
+        >删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
+        <el-button
-          v-hasPermi="['business:dealTransfer:export']">{{ $t('common.export') }}</el-button>
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['business:dealTransfer:export']"
+        >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="dealTransferList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column :label="$t('business.dealTransfer.transferId')" align="center" prop="userId" />
+      <el-table-column label="订单编号" align="center" prop="id" v-if="true"/>
-      <el-table-column :label="$t('business.dealTransfer.transferAccount')" align="center" prop="userAccount" />
+      <el-table-column label="转出人id" align="center" prop="senderId" />
-      <el-table-column :label="$t('business.dealTransfer.receiveId')" align="center" prop="toId" />
+      <el-table-column label="转出账户名" align="center" prop="senderAccountName" />
-      <el-table-column :label="$t('business.dealTransfer.receiveAccount')" align="center" prop="toAccount" />
+      <el-table-column label="接收人id" align="center" prop="receiverId" />
-      <el-table-column :label="$t('business.dealTransfer.billCode')" align="center" prop="billCode" />
+      <el-table-column label="接收人账户名" align="center" prop="receiverAccountName" />
-      <el-table-column :label="$t('business.dealTransfer.amount')" align="center" prop="amount" />
+      <el-table-column label="交易金额" align="center" prop="transactionAmount" />
-      <el-table-column :label="$t('business.dealTransfer.transferType')" align="center" prop="transferType">
+      <el-table-column label="手续费" align="center" prop="fee" />
+      <el-table-column label="转账类型" align="center" prop="transferType" />
+      <el-table-column label="订单状态" align="center" prop="status" />
+      <el-table-column label="支付方式" align="center" prop="paymentMethod" />
+      <el-table-column label="创建人" align="center" prop="creator" />
+      <el-table-column label="修改人" align="center" prop="modifier" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-            <el-tag type="success" v-if="scope.row.transferType == '0'">{{ $t('business.dealTransfer.directTransfer') }}</el-tag>
+          <el-button
-            <el-tag type="danger" v-if="scope.row.transferType == '1'">{{ $t('business.dealTransfer.reviewTransfer') }}</el-tag>
+            size="mini"
-          </template>
+            type="text"
-        </el-table-column>
+            icon="el-icon-view"
-      <el-table-column :label="$t('business.dealTransfer.remark')" align="center" prop="remark" />
+            @click="handleDetail(scope.row)"
-      <el-table-column :label="$t('business.dealTransfer.status')" align="center" prop="status">
+            >详情</el-button>
-        <template slot-scope="scope">
+          <el-button
-          <el-tag v-if="scope.row.status == '0'">{{ $t('business.dealTransfer.statusInit') }}</el-tag>
+            size="mini"
-          <el-tag type="danger" v-if="scope.row.status == '1'">{{ $t('business.dealTransfer.statusReject') }}</el-tag>
+            type="text"
-          <el-tag type="success" v-if="scope.row.status == '2'">{{ $t('business.dealTransfer.statusPass') }}</el-tag>
+            icon="el-icon-edit"
-        </template>
+            @click="handleUpdate(scope.row)"
-      </el-table-column>
+            v-hasPermi="['business:dealTransfer:edit']"
-      <el-table-column :label="$t('common.createTime')" align="center" prop="createTime" width="180">
+          >修改</el-button>
-        <template slot-scope="scope">
+          <el-button
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+            size="mini"
-        </template>
+            type="text"
-      </el-table-column>
+            icon="el-icon-delete"
-      <el-table-column :label="$t('common.operation')" align="center" width="200" class-name="small-padding fixed-width">
+            @click="handleDelete(scope.row)"
-        <template slot-scope="scope">
+            v-hasPermi="['business:dealTransfer:remove']"
-          <el-button size="mini" type="text" icon="el-icon-view" @click="handleDetail(scope.row)">{{ $t('common.detail') }}</el-button>
+          >删除</el-button>
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['business:dealTransfer:edit']">{{ $t('common.edit') }}</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['business:dealTransfer:remove']">{{ $t('common.delete') }}</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+    <pagination
-      @pagination="getList" />
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
-    <!-- 添加或修改转账对话框 -->
+    <!-- 添加或修改转账订单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="auto">
-        <el-form-item :label="$t('business.dealTransfer.transferId')" prop="userId">
+        <el-form-item label="转出人id" prop="senderId">
-          <el-input v-model="form.userId" :placeholder="$t('business.dealTransfer.transferIdPlaceholder')" />
+          <el-input v-model="form.senderId" placeholder="请输入转出人id" />
-        </el-form-item>
-        <el-form-item :label="$t('business.dealTransfer.transferAccount')" prop="userAccount">
-          <el-input v-model="form.userAccount" :placeholder="$t('business.dealTransfer.transferAccountPlaceholder')" />
-        </el-form-item>
-        <el-form-item :label="$t('business.dealTransfer.receiveId')" prop="toId">
-          <el-input v-model="form.toId" :placeholder="$t('business.dealTransfer.receiveIdPlaceholder')" />
         </el-form-item>
-        <el-form-item :label="$t('business.dealTransfer.receiveAccount')" prop="toAccount">
+        <el-form-item label="转出账户名" prop="senderAccountName">
-          <el-input v-model="form.toAccount" :placeholder="$t('business.dealTransfer.receiveAccountPlaceholder')" />
+          <el-input v-model="form.senderAccountName" placeholder="请输入转出账户名" />
         </el-form-item>
-        <el-form-item :label="$t('business.dealTransfer.billCode')" prop="billCode">
+        <el-form-item label="接收人id" prop="receiverId">
-          <el-input v-model="form.billCode" :placeholder="$t('business.dealTransfer.billCodePlaceholder')" />
+          <el-input v-model="form.receiverId" placeholder="请输入接收人id" />
         </el-form-item>
-        <el-form-item :label="$t('business.dealTransfer.amount')" prop="amount">
+        <el-form-item label="接收人账户名" prop="receiverAccountName">
-          <el-input v-model="form.amount" :placeholder="$t('business.dealTransfer.amountPlaceholder')" />
+          <el-input v-model="form.receiverAccountName" placeholder="请输入接收人账户名" />
         </el-form-item>
-        <el-form-item label="状态" prop="amount" v-if="statusShow">
+        <el-form-item label="交易金额" prop="transactionAmount">
-          <el-switch v-model="value" active-color="#13ce66" inactive-color="#ff4949" active-value="2"
+          <el-input v-model="form.transactionAmount" placeholder="请输入交易金额" />
-            inactive-value="1">
-          </el-switch>
         </el-form-item>
-        <el-form-item :label="$t('business.dealTransfer.remark')" prop="remark">
+        <el-form-item label="手续费" prop="fee">
-          <el-input v-model="form.remark" :placeholder="$t('business.dealTransfer.remarkPlaceholder')" />
+          <el-input v-model="form.fee" placeholder="请输入手续费" />
         </el-form-item>
-      </el-form>
+        <el-form-item label="支付方式" prop="paymentMethod">
-      <div slot="footer" class="dialog-footer">
+          <el-input v-model="form.paymentMethod" placeholder="请输入支付方式" />
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm">{{ $t('common.confirm') }}</el-button>
-        <el-button @click="cancel">{{ $t('common.cancel') }}</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 转账详情 -->
-    <el-dialog :title="title" :visible.sync="detailOpen" width="700px" append-to-body>
-      <el-form ref="form" :model="form" label-width="auto">
-        <el-form-item :label="$t('business.dealTransfer.transferId') + '：'">
-          {{form.userId}}
-        </el-form-item>
-        <el-form-item :label="$t('business.dealTransfer.transferAccount') + '：'">
-          {{form.userAccount}}
-        </el-form-item>
-        <el-form-item :label="$t('business.dealTransfer.receiveId') + '：'">
-          {{form.toId}}
-        </el-form-item>
-        <el-form-item :label="$t('business.dealTransfer.receiveAccount') + '：'">
-          {{form.toAccount}}
         </el-form-item>
-        <el-form-item :label="$t('business.dealTransfer.billCode') + '：'">
+        <el-form-item label="创建人" prop="creator">
-          {{form.billCode}}
+          <el-input v-model="form.creator" placeholder="请输入创建人" />
         </el-form-item>
-        <el-form-item :label="$t('business.dealTransfer.amount') + '：'">
+        <el-form-item label="修改人" prop="modifier">
-          {{form.amount}}
+          <el-input v-model="form.modifier" placeholder="请输入修改人" />
         </el-form-item>
-        <el-form-item :label="$t('business.dealTransfer.remark') + '：'">
+        <el-form-item label="备注" prop="remark">
-          {{form.remark}}
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="cancel">{{ $t('common.close') }}</el-button>
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
 
+    <!-- 转账订单详情 -->
+        <el-dialog :title="title" :visible.sync="detailOpen" width="700px" append-to-body>
+            <el-form ref="form" :model="form" label-width="auto">
+                    <el-form-item label="转出人id：">
+                      {{form.senderId}}
+                    </el-form-item>
+                    <el-form-item label="转出账户名：">
+                      {{form.senderAccountName}}
+                    </el-form-item>
+                    <el-form-item label="接收人id：">
+                      {{form.receiverId}}
+                    </el-form-item>
+                    <el-form-item label="接收人账户名：">
+                      {{form.receiverAccountName}}
+                    </el-form-item>
+                    <el-form-item label="交易金额：">
+                      {{form.transactionAmount}}
+                    </el-form-item>
+                    <el-form-item label="手续费：">
+                      {{form.fee}}
+                    </el-form-item>
+                    <el-form-item label="支付方式：">
+                      {{form.paymentMethod}}
+                    </el-form-item>
+                    <el-form-item label="创建人：">
+                      {{form.creator}}
+                    </el-form-item>
+                    <el-form-item label="修改人：">
+                      {{form.modifier}}
+                    </el-form-item>
+                    <el-form-item label="备注：">
+                      {{form.remark}}
 
+                    </el-form-item>
+                  </el-form>
+                  <div slot="footer" class="dialog-footer">
+                    <el-button @click="cancel">关 闭</el-button>
+                  </div>
+        </el-dialog>
   </div>
 </template>
 
 <script>
-  import {
+import { listDealTransfer, getDealTransfer, delDealTransfer, addDealTransfer, updateDealTransfer } from "@/api/business/dealTransfer";
-    listDealTransfer,
-    getDealTransfer,
-    delDealTransfer,
-    addDealTransfer,
-    updateDealTransfer
-  } from "@/api/business/dealTransfer";
 
-  export default {
+export default {
-    name: "DealTransfer",
+  name: "DealTransfer",
-    data() {
+  data() {
-      return {
+    return {
-        // 滑块
+      // 按钮loading
-        statusShow: false,
+      buttonLoading: false,
-        value: '2',
+      // 遮罩层
-        // 按钮loading
+      loading: true,
-        buttonLoading: false,
+      // 选中数组
-        // 遮罩层
+      ids: [],
-        loading: true,
+      // 非单个禁用
-        // 选中数组
+      single: true,
-        ids: [],
+      // 非多个禁用
-        // 非单个禁用
+      multiple: true,
-        single: true,
+      // 显示搜索条件
-        // 非多个禁用
+      showSearch: true,
-        multiple: true,
+      // 总条数
-        // 显示搜索条件
+      total: 0,
-        showSearch: true,
+      // 转账订单表格数据
-        // 总条数
+      dealTransferList: [],
-        total: 0,
+      // 弹出层标题
-        // 转账表格数据
+      title: "",
-        dealTransferList: [],
+      // 是否显示弹出层
-        // 弹出层标题
+      open: false,
-        title: "",
+      // 是否显示详情弹出层
-        // 是否显示弹出层
+      detailOpen: false,
-        open: false,
+      // 查询参数
-        // 是否显示详情弹出层
+      queryParams: {
-        detailOpen: false,
+        pageNum: 1,
-        // 状态时间范围
+        pageSize: 10,
-        daterangeCreateTime: [],
+        senderId: undefined,
-        // 查询参数
+        senderAccountName: undefined,
-        queryParams: {
+        receiverId: undefined,
-          pageNum: 1,
+        receiverAccountName: undefined,
-          pageSize: 10,
+        transactionAmount: undefined,
-          userId: undefined,
+        fee: undefined,
-          userAccount: undefined,
+        transferType: undefined,
-          toId: undefined,
+        status: undefined,
-          toAccount: undefined,
+        paymentMethod: undefined,
-          billCode: undefined,
+        creator: undefined,
-          amount: undefined,
+        modifier: undefined,
-          transferType: undefined,
+      },
-          remark: undefined,
+      // 表单参数
-          status: undefined,
+      form: {},
-          createTime: undefined,
+      // 表单校验
-        },
+      rules: {
-        // 表单参数
+        id: [
-        form: {},
+          { required: true, message: "订单编号不能为空", trigger: "blur" }
-        // 表单校验
+        ],
-        rules: {
+        senderId: [
-          userId: [{
+          { required: true, message: "转出人id不能为空", trigger: "blur" }
-            required: true,
+        ],
-            message: this.$t('business.dealTransfer.transferIdRequired'),
+        senderAccountName: [
-            trigger: "blur"
+          { required: true, message: "转出账户名不能为空", trigger: "blur" }
-          }],
+        ],
-          userAccount: [{
+        receiverId: [
-            required: true,
+          { required: true, message: "接收人id不能为空", trigger: "blur" }
-            message: this.$t('business.dealTransfer.transferAccountRequired'),
+        ],
-            trigger: "blur"
+        receiverAccountName: [
-          }],
+          { required: true, message: "接收人账户名不能为空", trigger: "blur" }
-          toId: [{
+        ],
-            required: true,
+        transactionAmount: [
-            message: this.$t('business.dealTransfer.receiveIdRequired'),
+          { required: true, message: "交易金额不能为空", trigger: "blur" }
-            trigger: "blur"
+        ],
-          }],
+        fee: [
-          toAccount: [{
+          { required: true, message: "手续费不能为空", trigger: "blur" }
-            required: true,
+        ],
-            message: this.$t('business.dealTransfer.receiveAccountRequired'),
+        transferType: [
-            trigger: "blur"
+          { required: true, message: "转账类型不能为空", trigger: "change" }
-          }],
+        ],
-        }
+        status: [
+          { required: true, message: "订单状态不能为空", trigger: "change" }
+        ],
+        paymentMethod: [
+          { required: true, message: "支付方式不能为空", trigger: "blur" }
+        ],
+        createTime: [
+          { required: true, message: "创建时间不能为空", trigger: "blur" }
+        ],
+        creator: [
+          { required: true, message: "创建人不能为空", trigger: "blur" }
+        ],
+        modifier: [
+          { required: true, message: "修改人不能为空", trigger: "blur" }
+        ],
+        remark: [
+          { required: true, message: "备注不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询转账订单列表 */
+    getList() {
+      this.loading = true;
+      listDealTransfer(this.queryParams).then(response => {
+        this.dealTransferList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.detailOpen = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        senderId: undefined,
+        senderAccountName: undefined,
+        receiverId: undefined,
+        receiverAccountName: undefined,
+        transactionAmount: undefined,
+        fee: undefined,
+        transferType: undefined,
+        status: undefined,
+        paymentMethod: undefined,
+        createTime: undefined,
+        updateTime: undefined,
+        creator: undefined,
+        modifier: undefined,
+        remark: undefined,
+        delFlag: undefined
       };
+      this.resetForm("form");
     },
-    created() {
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
       this.getList();
     },
-    methods: {
+    /** 重置按钮操作 */
-      /** 查询转账列表 */
+    resetQuery() {
-      getList() {
+      this.resetForm("queryForm");
-        this.loading = true;
+      this.handleQuery();
-        this.queryParams.params = {};
+    },
-        if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
+    // 多选框选中数据
-          this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
+    handleSelectionChange(selection) {
-          this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
+      this.ids = selection.map(item => item.id)
-        }
+      this.single = selection.length!==1
-        listDealTransfer(this.queryParams).then(response => {
+      this.multiple = !selection.length
-          this.dealTransferList = response.rows;
+    },
-          this.total = response.total;
+    /** 新增按钮操作 */
-          this.loading = false;
+    handleAdd() {
-        });
+      this.reset();
-      },
+      this.open = true;
-      // 取消按钮
+      this.title = "添加转账订单";
-      cancel() {
+    },
-        this.open = false;
+    /** 详情按钮操作 */
-        this.detailOpen = false;
+    handleDetail(row){
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        this.form = {
-          id: undefined,
-          userId: undefined,
-          userAccount: undefined,
-          toId: undefined,
-          toAccount: undefined,
-          billCode: undefined,
-          amount: undefined,
-          transferType: undefined,
-          remark: undefined,
-          status: undefined,
-          delFlag: undefined,
-          createBy: undefined,
-          createTime: undefined,
-          updateBy: undefined,
-          updateTime: undefined
-        };
-        this.resetForm("form");
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.daterangeCreateTime = [];
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id)
-        this.single = selection.length !== 1
-        this.multiple = !selection.length
-      },
-      /** 新增按钮操作 */
-      handleAdd() {
-        this.reset();
-        this.open = true;
-        this.title = this.$t('business.dealTransfer.addTitle');
-      },
-      /** 详情按钮操作 */
-      handleDetail(row) {
         this.reset();
         this.form = row;
         this.detailOpen = true;
-        this.title = this.$t('business.dealTransfer.detailTitle');
+        this.title = "转账订单";
-      },
+    },
-      /** 修改按钮操作 */
+    /** 修改按钮操作 */
-      handleUpdate(row) {
+    handleUpdate(row) {
-        this.loading = true;
+      this.loading = true;
-        this.reset();
+      this.reset();
-        const id = row.id || this.ids
+      const id = row.id || this.ids
-        getDealTransfer(id).then(response => {
+      getDealTransfer(id).then(response => {
-          this.loading = false;
+        this.loading = false;
-          this.form = response.data;
+        this.form = response.data;
-          if (this.form.status == "0") {
+        this.open = true;
-            this.statusShow = true;
+        this.title = "修改转账订单";
-          }
+      });
-          this.open = true;
+    },
-          this.title = this.$t('business.dealTransfer.editTitle');
+    /** 提交按钮 */
-        });
+    submitForm() {
-      },
+      this.$refs["form"].validate(valid => {
-      /** 提交按钮 */
+        if (valid) {
-      submitForm() {
+          this.buttonLoading = true;
-        this.$refs["form"].validate(valid => {
+          if (this.form.id != null) {
-          if (valid) {
+            updateDealTransfer(this.form).then(response => {
-            this.buttonLoading = true;
+              this.$modal.msgSuccess("修改成功");
-            if (this.form.id != null) {
+              this.open = false;
-              this.form.status = this.value;
+              this.getList();
-              updateDealTransfer(this.form).then(response => {
+            }).finally(() => {
-                this.$modal.msgSuccess(this.$t('common.editSuccess'));
+              this.buttonLoading = false;
-                this.open = false;
+            });
-                this.getList();
+          } else {
-              }).finally(() => {
+            addDealTransfer(this.form).then(response => {
-                this.buttonLoading = false;
+              this.$modal.msgSuccess("新增成功");
-              });
+              this.open = false;
-            } else {
+              this.getList();
-              addDealTransfer(this.form).then(response => {
+            }).finally(() => {
-                this.$modal.msgSuccess(this.$t('common.addSuccess'));
+              this.buttonLoading = false;
-                this.open = false;
+            });
-                this.getList();
-              }).finally(() => {
-                this.buttonLoading = false;
-              });
-            }
           }
-        });
+        }
-      },
+      });
-      /** 删除按钮操作 */
+    },
-      handleDelete(row) {
+    /** 删除按钮操作 */
-        const ids = row.id || this.ids;
+    handleDelete(row) {
-        this.$modal.confirm(this.$t('common.deleteConfirm')).then(() => {
+      const ids = row.id || this.ids;
-          this.loading = true;
+      this.$modal.confirm('是否确认删除转账订单编号为"' + ids + '"的数据项？').then(() => {
-          return delDealTransfer(ids);
+        this.loading = true;
-        }).then(() => {
+        return delDealTransfer(ids);
-          this.loading = false;
+      }).then(() => {
-          this.getList();
+        this.loading = false;
-          this.$modal.msgSuccess(this.$t('common.deleteSuccess'));
+        this.getList();
-        }).catch(() => {}).finally(() => {
+        this.$modal.msgSuccess("删除成功");
-          this.loading = false;
+      }).catch(() => {
-        });
+      }).finally(() => {
-      },
+        this.loading = false;
-      /** 导出按钮操作 */
+      });
-      handleExport() {
+    },
-        this.download('business/dealTransfer/export', {
+    /** 导出按钮操作 */
-          ...this.queryParams
+    handleExport() {
-        }, `dealTransfer_${new Date().getTime()}.xlsx`)
+      this.download('business/dealTransfer/export', {
-      }
+        ...this.queryParams
+      }, `dealTransfer_${new Date().getTime()}.xlsx`)
     }
-  };
+  }
+};
 </script>

src/views/business/dealWithdrawal/index.vue

@@ -0,0 +1,457 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="提现用户id" prop="withdrawalUserId">
+        <el-input
+          v-model="queryParams.withdrawalUserId"
+          placeholder="请输入提现用户id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="提现账户名" prop="withdrawalAccountName">
+        <el-input
+          v-model="queryParams.withdrawalAccountName"
+          placeholder="请输入提现账户名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="交易金额" prop="transactionAmount">
+        <el-input
+          v-model="queryParams.transactionAmount"
+          placeholder="请输入交易金额"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="手续费" prop="fee">
+        <el-input
+          v-model="queryParams.fee"
+          placeholder="请输入手续费"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="实际到账金额" prop="actualAmount">
+        <el-input
+          v-model="queryParams.actualAmount"
+          placeholder="请输入实际到账金额"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="提现方式" prop="withdrawalMethod">
+        <el-input
+          v-model="queryParams.withdrawalMethod"
+          placeholder="请输入提现方式"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建人" prop="creator">
+        <el-input
+          v-model="queryParams.creator"
+          placeholder="请输入创建人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="修改人" prop="modifier">
+        <el-input
+          v-model="queryParams.modifier"
+          placeholder="请输入修改人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </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>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['business:dealWithdrawal:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['business:dealWithdrawal:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['business:dealWithdrawal:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['business:dealWithdrawal:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="dealWithdrawalList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="订单编号" align="center" prop="id" v-if="true"/>
+      <el-table-column label="提现用户id" align="center" prop="withdrawalUserId" />
+      <el-table-column label="提现账户名" align="center" prop="withdrawalAccountName" />
+      <el-table-column label="交易金额" align="center" prop="transactionAmount" />
+      <el-table-column label="手续费" align="center" prop="fee" />
+      <el-table-column label="实际到账金额" align="center" prop="actualAmount" />
+      <el-table-column label="提现方式" align="center" prop="withdrawalMethod" />
+      <el-table-column label="订单状态" align="center" prop="status" />
+      <el-table-column label="创建人" align="center" prop="creator" />
+      <el-table-column label="修改人" align="center" prop="modifier" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleDetail(scope.row)"
+            >详情</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['business:dealWithdrawal:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['business:dealWithdrawal:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改提现订单对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="auto">
+        <el-form-item label="提现用户id" prop="withdrawalUserId">
+          <el-input v-model="form.withdrawalUserId" placeholder="请输入提现用户id" />
+        </el-form-item>
+        <el-form-item label="提现账户名" prop="withdrawalAccountName">
+          <el-input v-model="form.withdrawalAccountName" placeholder="请输入提现账户名" />
+        </el-form-item>
+        <el-form-item label="交易金额" prop="transactionAmount">
+          <el-input v-model="form.transactionAmount" placeholder="请输入交易金额" />
+        </el-form-item>
+        <el-form-item label="手续费" prop="fee">
+          <el-input v-model="form.fee" placeholder="请输入手续费" />
+        </el-form-item>
+        <el-form-item label="实际到账金额" prop="actualAmount">
+          <el-input v-model="form.actualAmount" placeholder="请输入实际到账金额" />
+        </el-form-item>
+        <el-form-item label="提现方式" prop="withdrawalMethod">
+          <el-input v-model="form.withdrawalMethod" placeholder="请输入提现方式" />
+        </el-form-item>
+        <el-form-item label="创建人" prop="creator">
+          <el-input v-model="form.creator" placeholder="请输入创建人" />
+        </el-form-item>
+        <el-form-item label="修改人" prop="modifier">
+          <el-input v-model="form.modifier" placeholder="请输入修改人" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 提现订单详情 -->
+        <el-dialog :title="title" :visible.sync="detailOpen" width="700px" append-to-body>
+            <el-form ref="form" :model="form" label-width="auto">
+                    <el-form-item label="提现用户id：">
+                      {{form.withdrawalUserId}}
+                    </el-form-item>
+                    <el-form-item label="提现账户名：">
+                      {{form.withdrawalAccountName}}
+                    </el-form-item>
+                    <el-form-item label="交易金额：">
+                      {{form.transactionAmount}}
+                    </el-form-item>
+                    <el-form-item label="手续费：">
+                      {{form.fee}}
+                    </el-form-item>
+                    <el-form-item label="实际到账金额：">
+                      {{form.actualAmount}}
+                    </el-form-item>
+                    <el-form-item label="提现方式：">
+                      {{form.withdrawalMethod}}
+                    </el-form-item>
+                    <el-form-item label="创建人：">
+                      {{form.creator}}
+                    </el-form-item>
+                    <el-form-item label="修改人：">
+                      {{form.modifier}}
+                    </el-form-item>
+                    <el-form-item label="备注：">
+                      {{form.remark}}
+
+                    </el-form-item>
+                  </el-form>
+                  <div slot="footer" class="dialog-footer">
+                    <el-button @click="cancel">关 闭</el-button>
+                  </div>
+        </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listDealWithdrawal, getDealWithdrawal, delDealWithdrawal, addDealWithdrawal, updateDealWithdrawal } from "@/api/business/dealWithdrawal";
+
+export default {
+  name: "DealWithdrawal",
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 提现订单表格数据
+      dealWithdrawalList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否显示详情弹出层
+      detailOpen: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        withdrawalUserId: undefined,
+        withdrawalAccountName: undefined,
+        transactionAmount: undefined,
+        fee: undefined,
+        actualAmount: undefined,
+        withdrawalMethod: undefined,
+        status: undefined,
+        creator: undefined,
+        modifier: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        id: [
+          { required: true, message: "订单编号不能为空", trigger: "blur" }
+        ],
+        withdrawalUserId: [
+          { required: true, message: "提现用户id不能为空", trigger: "blur" }
+        ],
+        withdrawalAccountName: [
+          { required: true, message: "提现账户名不能为空", trigger: "blur" }
+        ],
+        transactionAmount: [
+          { required: true, message: "交易金额不能为空", trigger: "blur" }
+        ],
+        fee: [
+          { required: true, message: "手续费不能为空", trigger: "blur" }
+        ],
+        actualAmount: [
+          { required: true, message: "实际到账金额不能为空", trigger: "blur" }
+        ],
+        withdrawalMethod: [
+          { required: true, message: "提现方式不能为空", trigger: "blur" }
+        ],
+        status: [
+          { required: true, message: "订单状态不能为空", trigger: "change" }
+        ],
+        createTime: [
+          { required: true, message: "创建时间不能为空", trigger: "blur" }
+        ],
+        creator: [
+          { required: true, message: "创建人不能为空", trigger: "blur" }
+        ],
+        modifier: [
+          { required: true, message: "修改人不能为空", trigger: "blur" }
+        ],
+        remark: [
+          { required: true, message: "备注不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询提现订单列表 */
+    getList() {
+      this.loading = true;
+      listDealWithdrawal(this.queryParams).then(response => {
+        this.dealWithdrawalList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.detailOpen = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        withdrawalUserId: undefined,
+        withdrawalAccountName: undefined,
+        transactionAmount: undefined,
+        fee: undefined,
+        actualAmount: undefined,
+        withdrawalMethod: undefined,
+        status: undefined,
+        createTime: undefined,
+        updateTime: undefined,
+        creator: undefined,
+        modifier: undefined,
+        remark: undefined,
+        delFlag: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加提现订单";
+    },
+    /** 详情按钮操作 */
+    handleDetail(row){
+        this.reset();
+        this.form = row;
+        this.detailOpen = true;
+        this.title = "提现订单";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const id = row.id || this.ids
+      getDealWithdrawal(id).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改提现订单";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.id != null) {
+            updateDealWithdrawal(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addDealWithdrawal(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除提现订单编号为"' + ids + '"的数据项？').then(() => {
+        this.loading = true;
+        return delDealWithdrawal(ids);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('business/dealWithdrawal/export', {
+        ...this.queryParams
+      }, `dealWithdrawal_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/business/feeRecord/index.vue

@@ -0,0 +1,465 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="关联订单编号" prop="relatedOrderId">
+        <el-input
+          v-model="queryParams.relatedOrderId"
+          placeholder="请输入关联订单编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="用户编号" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入用户编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="手续费标准编号" prop="feeStandardId">
+        <el-input
+          v-model="queryParams.feeStandardId"
+          placeholder="请输入手续费标准编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="优惠规则编号" prop="discountRuleId">
+        <el-input
+          v-model="queryParams.discountRuleId"
+          placeholder="请输入优惠规则编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="计算手续费金额" prop="calculatedFeeAmount">
+        <el-input
+          v-model="queryParams.calculatedFeeAmount"
+          placeholder="请输入计算手续费金额"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="优惠减免手续费金额" prop="discountedFeeAmount">
+        <el-input
+          v-model="queryParams.discountedFeeAmount"
+          placeholder="请输入优惠减免手续费金额"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="实际收取手续费金额" prop="actualFeeAmount">
+        <el-input
+          v-model="queryParams.actualFeeAmount"
+          placeholder="请输入实际收取手续费金额"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="手续费收取时间" prop="feeCollectionTime">
+        <el-date-picker clearable
+          v-model="queryParams.feeCollectionTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择手续费收取时间">
+        </el-date-picker>
+      </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>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['business:feeRecord:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['business:feeRecord:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['business:feeRecord:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['business:feeRecord:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="feeRecordList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="记录编号" align="center" prop="id" v-if="true"/>
+      <el-table-column label="关联订单编号" align="center" prop="relatedOrderId" />
+      <el-table-column label="业务类型" align="center" prop="businessType" />
+      <el-table-column label="用户编号" align="center" prop="userId" />
+      <el-table-column label="手续费标准编号" align="center" prop="feeStandardId" />
+      <el-table-column label="优惠规则编号" align="center" prop="discountRuleId" />
+      <el-table-column label="计算手续费金额" align="center" prop="calculatedFeeAmount" />
+      <el-table-column label="优惠减免手续费金额" align="center" prop="discountedFeeAmount" />
+      <el-table-column label="实际收取手续费金额" align="center" prop="actualFeeAmount" />
+      <el-table-column label="手续费收取时间" align="center" prop="feeCollectionTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.feeCollectionTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status" />
+      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleDetail(scope.row)"
+            >详情</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['business:feeRecord:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['business:feeRecord:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改手续费记录对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="auto">
+        <el-form-item label="关联订单编号" prop="relatedOrderId">
+          <el-input v-model="form.relatedOrderId" placeholder="请输入关联订单编号" />
+        </el-form-item>
+        <el-form-item label="用户编号" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入用户编号" />
+        </el-form-item>
+        <el-form-item label="手续费标准编号" prop="feeStandardId">
+          <el-input v-model="form.feeStandardId" placeholder="请输入手续费标准编号" />
+        </el-form-item>
+        <el-form-item label="优惠规则编号" prop="discountRuleId">
+          <el-input v-model="form.discountRuleId" placeholder="请输入优惠规则编号" />
+        </el-form-item>
+        <el-form-item label="计算手续费金额" prop="calculatedFeeAmount">
+          <el-input v-model="form.calculatedFeeAmount" placeholder="请输入计算手续费金额" />
+        </el-form-item>
+        <el-form-item label="优惠减免手续费金额" prop="discountedFeeAmount">
+          <el-input v-model="form.discountedFeeAmount" placeholder="请输入优惠减免手续费金额" />
+        </el-form-item>
+        <el-form-item label="实际收取手续费金额" prop="actualFeeAmount">
+          <el-input v-model="form.actualFeeAmount" placeholder="请输入实际收取手续费金额" />
+        </el-form-item>
+        <el-form-item label="手续费收取时间" prop="feeCollectionTime">
+          <el-date-picker clearable
+            v-model="form.feeCollectionTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择手续费收取时间">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 手续费记录详情 -->
+        <el-dialog :title="title" :visible.sync="detailOpen" width="700px" append-to-body>
+            <el-form ref="form" :model="form" label-width="auto">
+                    <el-form-item label="关联订单编号：">
+                      {{form.relatedOrderId}}
+                    </el-form-item>
+                    <el-form-item label="用户编号：">
+                      {{form.userId}}
+                    </el-form-item>
+                    <el-form-item label="手续费标准编号：">
+                      {{form.feeStandardId}}
+                    </el-form-item>
+                    <el-form-item label="优惠规则编号：">
+                      {{form.discountRuleId}}
+                    </el-form-item>
+                    <el-form-item label="计算手续费金额：">
+                      {{form.calculatedFeeAmount}}
+                    </el-form-item>
+                    <el-form-item label="优惠减免手续费金额：">
+                      {{form.discountedFeeAmount}}
+                    </el-form-item>
+                    <el-form-item label="实际收取手续费金额：">
+                      {{form.actualFeeAmount}}
+                    </el-form-item>
+                    <el-form-item label="手续费收取时间" prop="feeCollectionTime">
+                      <el-date-picker clearable
+                        v-model="form.feeCollectionTime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="请选择手续费收取时间">
+                      </el-date-picker>
+                    </el-form-item>
+                  </el-form>
+                  <div slot="footer" class="dialog-footer">
+                    <el-button @click="cancel">关 闭</el-button>
+                  </div>
+        </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listFeeRecord, getFeeRecord, delFeeRecord, addFeeRecord, updateFeeRecord } from "@/api/business/feeRecord";
+
+export default {
+  name: "FeeRecord",
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 手续费记录表格数据
+      feeRecordList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否显示详情弹出层
+      detailOpen: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        relatedOrderId: undefined,
+        businessType: undefined,
+        userId: undefined,
+        feeStandardId: undefined,
+        discountRuleId: undefined,
+        calculatedFeeAmount: undefined,
+        discountedFeeAmount: undefined,
+        actualFeeAmount: undefined,
+        feeCollectionTime: undefined,
+        status: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        id: [
+          { required: true, message: "记录编号不能为空", trigger: "blur" }
+        ],
+        relatedOrderId: [
+          { required: true, message: "关联订单编号不能为空", trigger: "blur" }
+        ],
+        businessType: [
+          { required: true, message: "业务类型不能为空", trigger: "change" }
+        ],
+        userId: [
+          { required: true, message: "用户编号不能为空", trigger: "blur" }
+        ],
+        feeStandardId: [
+          { required: true, message: "手续费标准编号不能为空", trigger: "blur" }
+        ],
+        discountRuleId: [
+          { required: true, message: "优惠规则编号不能为空", trigger: "blur" }
+        ],
+        calculatedFeeAmount: [
+          { required: true, message: "计算手续费金额不能为空", trigger: "blur" }
+        ],
+        discountedFeeAmount: [
+          { required: true, message: "优惠减免手续费金额不能为空", trigger: "blur" }
+        ],
+        actualFeeAmount: [
+          { required: true, message: "实际收取手续费金额不能为空", trigger: "blur" }
+        ],
+        feeCollectionTime: [
+          { required: true, message: "手续费收取时间不能为空", trigger: "blur" }
+        ],
+        status: [
+          { required: true, message: "状态不能为空", trigger: "change" }
+        ],
+        createTime: [
+          { required: true, message: "创建时间不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询手续费记录列表 */
+    getList() {
+      this.loading = true;
+      listFeeRecord(this.queryParams).then(response => {
+        this.feeRecordList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.detailOpen = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        relatedOrderId: undefined,
+        businessType: undefined,
+        userId: undefined,
+        feeStandardId: undefined,
+        discountRuleId: undefined,
+        calculatedFeeAmount: undefined,
+        discountedFeeAmount: undefined,
+        actualFeeAmount: undefined,
+        feeCollectionTime: undefined,
+        status: undefined,
+        createTime: undefined,
+        updateTime: undefined,
+        delFlag: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加手续费记录";
+    },
+    /** 详情按钮操作 */
+    handleDetail(row){
+        this.reset();
+        this.form = row;
+        this.detailOpen = true;
+        this.title = "手续费记录";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const id = row.id || this.ids
+      getFeeRecord(id).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改手续费记录";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.id != null) {
+            updateFeeRecord(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addFeeRecord(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除手续费记录编号为"' + ids + '"的数据项？').then(() => {
+        this.loading = true;
+        return delFeeRecord(ids);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('business/feeRecord/export', {
+        ...this.queryParams
+      }, `feeRecord_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/business/feeStandard/index.vue

@@ -0,0 +1,391 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="用户级别" prop="userLevel">
+        <el-input
+          v-model="queryParams.userLevel"
+          placeholder="请输入用户级别"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="手续费值" prop="feeValue">
+        <el-input
+          v-model="queryParams.feeValue"
+          placeholder="请输入手续费值"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="最低手续费" prop="minFee">
+        <el-input
+          v-model="queryParams.minFee"
+          placeholder="请输入最低手续费"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="最高手续费" prop="maxFee">
+        <el-input
+          v-model="queryParams.maxFee"
+          placeholder="请输入最高手续费"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="适用条件" prop="applicableCondition">
+        <el-input
+          v-model="queryParams.applicableCondition"
+          placeholder="请输入适用条件"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </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>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['business:feeStandard:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['business:feeStandard:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['business:feeStandard:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['business:feeStandard:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="feeStandardList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="手续费标准编号" align="center" prop="feeStandardId" v-if="true"/>
+      <el-table-column label="业务类型" align="center" prop="businessType" />
+      <el-table-column label="用户级别" align="center" prop="userLevel" />
+      <el-table-column label="手续费类型" align="center" prop="feeType" />
+      <el-table-column label="手续费值" align="center" prop="feeValue" />
+      <el-table-column label="最低手续费" align="center" prop="minFee" />
+      <el-table-column label="最高手续费" align="center" prop="maxFee" />
+      <el-table-column label="适用条件" align="center" prop="applicableCondition" />
+      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleDetail(scope.row)"
+            >详情</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['business:feeStandard:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['business:feeStandard:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改手续费规则对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="auto">
+        <el-form-item label="用户级别" prop="userLevel">
+          <el-input v-model="form.userLevel" placeholder="请输入用户级别" />
+        </el-form-item>
+        <el-form-item label="手续费值" prop="feeValue">
+          <el-input v-model="form.feeValue" placeholder="请输入手续费值" />
+        </el-form-item>
+        <el-form-item label="最低手续费" prop="minFee">
+          <el-input v-model="form.minFee" placeholder="请输入最低手续费" />
+        </el-form-item>
+        <el-form-item label="最高手续费" prop="maxFee">
+          <el-input v-model="form.maxFee" placeholder="请输入最高手续费" />
+        </el-form-item>
+        <el-form-item label="适用条件" prop="applicableCondition">
+          <el-input v-model="form.applicableCondition" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 手续费规则详情 -->
+        <el-dialog :title="title" :visible.sync="detailOpen" width="700px" append-to-body>
+            <el-form ref="form" :model="form" label-width="auto">
+                    <el-form-item label="用户级别：">
+                      {{form.userLevel}}
+                    </el-form-item>
+                    <el-form-item label="手续费值：">
+                      {{form.feeValue}}
+                    </el-form-item>
+                    <el-form-item label="最低手续费：">
+                      {{form.minFee}}
+                    </el-form-item>
+                    <el-form-item label="最高手续费：">
+                      {{form.maxFee}}
+                    </el-form-item>
+                    <el-form-item label="适用条件：">
+                      {{form.applicableCondition}}
+
+                    </el-form-item>
+                  </el-form>
+                  <div slot="footer" class="dialog-footer">
+                    <el-button @click="cancel">关 闭</el-button>
+                  </div>
+        </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listFeeStandard, getFeeStandard, delFeeStandard, addFeeStandard, updateFeeStandard } from "@/api/business/feeStandard";
+
+export default {
+  name: "FeeStandard",
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 手续费规则表格数据
+      feeStandardList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否显示详情弹出层
+      detailOpen: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        businessType: undefined,
+        userLevel: undefined,
+        feeType: undefined,
+        feeValue: undefined,
+        minFee: undefined,
+        maxFee: undefined,
+        applicableCondition: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        feeStandardId: [
+          { required: true, message: "手续费标准编号不能为空", trigger: "blur" }
+        ],
+        businessType: [
+          { required: true, message: "业务类型不能为空", trigger: "change" }
+        ],
+        userLevel: [
+          { required: true, message: "用户级别不能为空", trigger: "blur" }
+        ],
+        feeType: [
+          { required: true, message: "手续费类型不能为空", trigger: "change" }
+        ],
+        feeValue: [
+          { required: true, message: "手续费值不能为空", trigger: "blur" }
+        ],
+        minFee: [
+          { required: true, message: "最低手续费不能为空", trigger: "blur" }
+        ],
+        maxFee: [
+          { required: true, message: "最高手续费不能为空", trigger: "blur" }
+        ],
+        applicableCondition: [
+          { required: true, message: "适用条件不能为空", trigger: "blur" }
+        ],
+        createTime: [
+          { required: true, message: "创建时间不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询手续费规则列表 */
+    getList() {
+      this.loading = true;
+      listFeeStandard(this.queryParams).then(response => {
+        this.feeStandardList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.detailOpen = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        feeStandardId: undefined,
+        businessType: undefined,
+        userLevel: undefined,
+        feeType: undefined,
+        feeValue: undefined,
+        minFee: undefined,
+        maxFee: undefined,
+        applicableCondition: undefined,
+        createTime: undefined,
+        updateTime: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.feeStandardId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加手续费规则";
+    },
+    /** 详情按钮操作 */
+    handleDetail(row){
+        this.reset();
+        this.form = row;
+        this.detailOpen = true;
+        this.title = "手续费规则";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const feeStandardId = row.feeStandardId || this.ids
+      getFeeStandard(feeStandardId).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改手续费规则";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.feeStandardId != null) {
+            updateFeeStandard(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addFeeStandard(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const feeStandardIds = row.feeStandardId || this.ids;
+      this.$modal.confirm('是否确认删除手续费规则编号为"' + feeStandardIds + '"的数据项？').then(() => {
+        this.loading = true;
+        return delFeeStandard(feeStandardIds);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('business/feeStandard/export', {
+        ...this.queryParams
+      }, `feeStandard_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/business/recordPaymentReceipt/index.vue

@@ -0,0 +1,524 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="用户编号" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入用户编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="关联订单编号" prop="relatedOrderId">
+        <el-input
+          v-model="queryParams.relatedOrderId"
+          placeholder="请输入关联订单编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="第三方支付平台名称" prop="thirdPartyPlatform">
+        <el-input
+          v-model="queryParams.thirdPartyPlatform"
+          placeholder="请输入第三方支付平台名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="交易金额" prop="transactionAmount">
+        <el-input
+          v-model="queryParams.transactionAmount"
+          placeholder="请输入交易金额"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="支付渠道交易编号" prop="paymentChannelNo">
+        <el-input
+          v-model="queryParams.paymentChannelNo"
+          placeholder="请输入支付渠道交易编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="回执时间" prop="receiptTime">
+        <el-date-picker clearable
+          v-model="queryParams.receiptTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择回执时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="验证失败原因" prop="verificationFailureReason">
+        <el-input
+          v-model="queryParams.verificationFailureReason"
+          placeholder="请输入验证失败原因"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="IP地址" prop="ipAddress">
+        <el-input
+          v-model="queryParams.ipAddress"
+          placeholder="请输入IP地址"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建人" prop="creator">
+        <el-input
+          v-model="queryParams.creator"
+          placeholder="请输入创建人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="修改人" prop="modifier">
+        <el-input
+          v-model="queryParams.modifier"
+          placeholder="请输入修改人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </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>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['business:recordPaymentReceipt:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['business:recordPaymentReceipt:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['business:recordPaymentReceipt:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['business:recordPaymentReceipt:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="recordPaymentReceiptList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="回执编号" align="center" prop="id" v-if="true"/>
+      <el-table-column label="用户编号" align="center" prop="userId" />
+      <el-table-column label="关联订单编号" align="center" prop="relatedOrderId" />
+      <el-table-column label="第三方支付平台名称" align="center" prop="thirdPartyPlatform" />
+      <el-table-column label="交易金额" align="center" prop="transactionAmount" />
+      <el-table-column label="交易状态" align="center" prop="transactionStatus" />
+      <el-table-column label="支付渠道交易编号" align="center" prop="paymentChannelNo" />
+      <el-table-column label="回执时间" align="center" prop="receiptTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.receiptTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="回执内容" align="center" prop="receiptContent" />
+      <el-table-column label="验证状态" align="center" prop="verificationStatus" />
+      <el-table-column label="验证失败原因" align="center" prop="verificationFailureReason" />
+      <el-table-column label="处理状态" align="center" prop="processingStatus" />
+      <el-table-column label="IP地址" align="center" prop="ipAddress" />
+      <el-table-column label="创建人" align="center" prop="creator" />
+      <el-table-column label="修改人" align="center" prop="modifier" />
+      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleDetail(scope.row)"
+            >详情</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['business:recordPaymentReceipt:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['business:recordPaymentReceipt:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改支付回执对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="auto">
+        <el-form-item label="用户编号" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入用户编号" />
+        </el-form-item>
+        <el-form-item label="关联订单编号" prop="relatedOrderId">
+          <el-input v-model="form.relatedOrderId" placeholder="请输入关联订单编号" />
+        </el-form-item>
+        <el-form-item label="第三方支付平台名称" prop="thirdPartyPlatform">
+          <el-input v-model="form.thirdPartyPlatform" placeholder="请输入第三方支付平台名称" />
+        </el-form-item>
+        <el-form-item label="交易金额" prop="transactionAmount">
+          <el-input v-model="form.transactionAmount" placeholder="请输入交易金额" />
+        </el-form-item>
+        <el-form-item label="支付渠道交易编号" prop="paymentChannelNo">
+          <el-input v-model="form.paymentChannelNo" placeholder="请输入支付渠道交易编号" />
+        </el-form-item>
+        <el-form-item label="回执时间" prop="receiptTime">
+          <el-date-picker clearable
+            v-model="form.receiptTime"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            placeholder="请选择回执时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="回执内容">
+          <editor v-model="form.receiptContent" :min-height="192"/>
+        </el-form-item>
+        <el-form-item label="验证失败原因" prop="verificationFailureReason">
+          <el-input v-model="form.verificationFailureReason" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="IP地址" prop="ipAddress">
+          <el-input v-model="form.ipAddress" placeholder="请输入IP地址" />
+        </el-form-item>
+        <el-form-item label="创建人" prop="creator">
+          <el-input v-model="form.creator" placeholder="请输入创建人" />
+        </el-form-item>
+        <el-form-item label="修改人" prop="modifier">
+          <el-input v-model="form.modifier" placeholder="请输入修改人" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 支付回执详情 -->
+        <el-dialog :title="title" :visible.sync="detailOpen" width="700px" append-to-body>
+            <el-form ref="form" :model="form" label-width="auto">
+                    <el-form-item label="用户编号：">
+                      {{form.userId}}
+                    </el-form-item>
+                    <el-form-item label="关联订单编号：">
+                      {{form.relatedOrderId}}
+                    </el-form-item>
+                    <el-form-item label="第三方支付平台名称：">
+                      {{form.thirdPartyPlatform}}
+                    </el-form-item>
+                    <el-form-item label="交易金额：">
+                      {{form.transactionAmount}}
+                    </el-form-item>
+                    <el-form-item label="支付渠道交易编号：">
+                      {{form.paymentChannelNo}}
+                    </el-form-item>
+                    <el-form-item label="回执时间" prop="receiptTime">
+                      <el-date-picker clearable
+                        v-model="form.receiptTime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="请选择回执时间">
+                      </el-date-picker>
+                    </el-form-item>
+                    <el-form-item label="回执内容">
+                      <editor v-model="form.receiptContent" :min-height="192"/>
+                    </el-form-item>
+                    <el-form-item label="验证失败原因：">
+                      {{form.verificationFailureReason}}
+
+                    </el-form-item>
+                    <el-form-item label="IP地址：">
+                      {{form.ipAddress}}
+                    </el-form-item>
+                    <el-form-item label="创建人：">
+                      {{form.creator}}
+                    </el-form-item>
+                    <el-form-item label="修改人：">
+                      {{form.modifier}}
+                    </el-form-item>
+                  </el-form>
+                  <div slot="footer" class="dialog-footer">
+                    <el-button @click="cancel">关 闭</el-button>
+                  </div>
+        </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listRecordPaymentReceipt, getRecordPaymentReceipt, delRecordPaymentReceipt, addRecordPaymentReceipt, updateRecordPaymentReceipt } from "@/api/business/recordPaymentReceipt";
+
+export default {
+  name: "RecordPaymentReceipt",
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 支付回执表格数据
+      recordPaymentReceiptList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否显示详情弹出层
+      detailOpen: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userId: undefined,
+        relatedOrderId: undefined,
+        thirdPartyPlatform: undefined,
+        transactionAmount: undefined,
+        transactionStatus: undefined,
+        paymentChannelNo: undefined,
+        receiptTime: undefined,
+        receiptContent: undefined,
+        verificationStatus: undefined,
+        verificationFailureReason: undefined,
+        processingStatus: undefined,
+        ipAddress: undefined,
+        creator: undefined,
+        modifier: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        id: [
+          { required: true, message: "回执编号不能为空", trigger: "blur" }
+        ],
+        userId: [
+          { required: true, message: "用户编号不能为空", trigger: "blur" }
+        ],
+        relatedOrderId: [
+          { required: true, message: "关联订单编号不能为空", trigger: "blur" }
+        ],
+        thirdPartyPlatform: [
+          { required: true, message: "第三方支付平台名称不能为空", trigger: "blur" }
+        ],
+        transactionAmount: [
+          { required: true, message: "交易金额不能为空", trigger: "blur" }
+        ],
+        transactionStatus: [
+          { required: true, message: "交易状态不能为空", trigger: "change" }
+        ],
+        paymentChannelNo: [
+          { required: true, message: "支付渠道交易编号不能为空", trigger: "blur" }
+        ],
+        receiptTime: [
+          { required: true, message: "回执时间不能为空", trigger: "blur" }
+        ],
+        receiptContent: [
+          { required: true, message: "回执内容不能为空", trigger: "blur" }
+        ],
+        verificationStatus: [
+          { required: true, message: "验证状态不能为空", trigger: "change" }
+        ],
+        verificationFailureReason: [
+          { required: true, message: "验证失败原因不能为空", trigger: "blur" }
+        ],
+        processingStatus: [
+          { required: true, message: "处理状态不能为空", trigger: "change" }
+        ],
+        ipAddress: [
+          { required: true, message: "IP地址不能为空", trigger: "blur" }
+        ],
+        createTime: [
+          { required: true, message: "创建时间不能为空", trigger: "blur" }
+        ],
+        creator: [
+          { required: true, message: "创建人不能为空", trigger: "blur" }
+        ],
+        modifier: [
+          { required: true, message: "修改人不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询支付回执列表 */
+    getList() {
+      this.loading = true;
+      listRecordPaymentReceipt(this.queryParams).then(response => {
+        this.recordPaymentReceiptList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.detailOpen = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: undefined,
+        userId: undefined,
+        relatedOrderId: undefined,
+        thirdPartyPlatform: undefined,
+        transactionAmount: undefined,
+        transactionStatus: undefined,
+        paymentChannelNo: undefined,
+        receiptTime: undefined,
+        receiptContent: undefined,
+        verificationStatus: undefined,
+        verificationFailureReason: undefined,
+        processingStatus: undefined,
+        ipAddress: undefined,
+        createTime: undefined,
+        updateTime: undefined,
+        creator: undefined,
+        modifier: undefined,
+        delFlag: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加支付回执";
+    },
+    /** 详情按钮操作 */
+    handleDetail(row){
+        this.reset();
+        this.form = row;
+        this.detailOpen = true;
+        this.title = "支付回执";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const id = row.id || this.ids
+      getRecordPaymentReceipt(id).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改支付回执";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.id != null) {
+            updateRecordPaymentReceipt(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addRecordPaymentReceipt(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除支付回执编号为"' + ids + '"的数据项？').then(() => {
+        this.loading = true;
+        return delRecordPaymentReceipt(ids);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('business/recordPaymentReceipt/export', {
+        ...this.queryParams
+      }, `recordPaymentReceipt_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/business/userInfo/index.vue

@@ -7,6 +7,13 @@
       <el-form-item :label="$t('business.userInfo.name')" prop="name">
         <el-input v-model="queryParams.name" :placeholder="$t('business.userInfo.namePlaceholder')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
+      <el-form-item :label="$t('business.userInfo.gender')" prop="gender">
+        <el-select v-model="form.region" placeholder="请选择性别">
+          <el-option label="男" value="1"></el-option>
+          <el-option label="女" value="0"></el-option>
+        </el-select>
+<!--        <el-input v-model="queryParams.gender" :placeholder="$t('business.userInfo.genderPlaceholder')" clearable @keyup.enter.native="handleQuery" />-->
+      </el-form-item>
       <el-form-item :label="$t('business.userInfo.phone')" prop="phone">
         <el-input v-model="queryParams.phone" :placeholder="$t('business.userInfo.phonePlaceholder')" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
@@ -71,14 +78,18 @@
     <!-- 添加或修改用户信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="auto">
-        <el-form-item :label="$t('business.userInfo.userCode')" prop="userCode">
+<!--        <el-form-item :label="$t('business.userInfo.userCode')" prop="userCode">-->
-          <el-input v-model="form.userCode" :placeholder="$t('business.userInfo.userCodePlaceholder')" />
+<!--          <el-input v-model="form.userCode" :placeholder="$t('business.userInfo.userCodePlaceholder')" />-->
-        </el-form-item>
+<!--        </el-form-item>-->
         <el-form-item :label="$t('business.userInfo.name')" prop="name">
           <el-input v-model="form.name" :placeholder="$t('business.userInfo.namePlaceholder')" />
         </el-form-item>
         <el-form-item :label="$t('business.userInfo.gender')" prop="gender">
-          <el-input v-model="form.gender" :placeholder="$t('business.userInfo.genderPlaceholder')" />
+          <el-select v-model="form.region" placeholder="请选择性别">
+            <el-option label="男" value="1"></el-option>
+            <el-option label="女" value="0"></el-option>
+          </el-select>
+<!--          <el-input v-model="form.gender" :placeholder="$t('business.userInfo.genderPlaceholder')" />-->
         </el-form-item>
         <el-form-item :label="$t('business.userInfo.idCard')" prop="idCard">
           <el-input v-model="form.idCard" :placeholder="$t('business.userInfo.idCardPlaceholder')" />
@@ -187,7 +198,26 @@
         // 表单参数
         form: {},
         // 表单校验
-        rules: {}
+        rules: {
+          name: [
+            { required: true, message: "姓名不能为空", trigger: "blur" }
+          ],
+          gender: [
+            { required: true, message: "性别不能为空", trigger: "blur" }
+          ],
+          idCard: [
+            { required: true, message: "身份证号不能为空", trigger: "blur" }
+          ],
+          phone: [
+            { required: true, message: "用户电话", trigger: "blur" }
+          ],
+          age: [
+            { required: true, message: "用户年龄", trigger: "blur" }
+          ],
+          addr: [
+            { required: true, message: "用户地址", trigger: "change" }
+          ]
+        }
       };
     },
     created() {

src/views/business/userInfoBus/index.vue

@@ -130,10 +130,28 @@
     <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="auto">
         <el-form-item label="营业执照" prop="license">
-          <el-input v-model="form.license" placeholder="请输入营业执照" />
+          <el-upload
+            class="upload-demo"
+            drag
+            action="https://jsonplaceholder.typicode.com/posts/"
+            multiple>
+            <i class="el-icon-upload"></i>
+            <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+            <div class="el-upload__tip" slot="tip">只能上传jpg/png文件，且不超过500kb</div>
+          </el-upload>
+<!--          <el-input v-model="form.license" placeholder="请输入营业执照" />-->
         </el-form-item>
         <el-form-item label="其它证照信息" prop="licenseOther">
-          <el-input v-model="form.licenseOther" placeholder="请输入其它证照信息" />
+          <el-upload
+            class="upload-demo"
+            drag
+            action="https://jsonplaceholder.typicode.com/posts/"
+            multiple>
+            <i class="el-icon-upload"></i>
+            <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+            <div class="el-upload__tip" slot="tip">只能上传jpg/png文件，且不超过500kb</div>
+          </el-upload>
+<!--          <el-input v-model="form.licenseOther" placeholder="请输入其它证照信息" />-->
         </el-form-item>
         <el-form-item label="法人姓名" prop="legalPerson">
           <el-input v-model="form.legalPerson" placeholder="请输入法人姓名" />
@@ -153,6 +171,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
+        <el-button  type="warning" @click="">审 核</el-button>
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>