商户功能

src/api/merchant/accountInfo.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData){
+  return request.post(constant.serverUrl + "/merchant/accountInfo/pageList", formData);
+}
+
+function create(){
+  return request.get(constant.serverUrl + "/merchant/accountInfo/create");
+}
+
+function edit(id){
+  return request.get(constant.serverUrl + "/merchant/accountInfo/edit/" + id);
+}
+
+function add(formModel){
+  return request.post(constant.serverUrl + "/merchant/accountInfo/add", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel){  
+  return request.post(constant.serverUrl + "/merchant/accountInfo/update", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id){
+  return request.post(constant.serverUrl + "/merchant/accountInfo/delete/" + id);
+}
+
+function batchRemove(idList){
+  return request.post(constant.serverUrl + "/merchant/accountInfo/batchDelete",idList,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+export default {
+  pageList,create,edit,add,update,remove,batchRemove
+}

src/api/merchant/capitalInfo.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData){
+  return request.post(constant.serverUrl + "/merchant/capitalInfo/pageList", formData);
+}
+
+function create(){
+  return request.get(constant.serverUrl + "/merchant/capitalInfo/create");
+}
+
+function edit(id){
+  return request.get(constant.serverUrl + "/merchant/capitalInfo/edit/" + id);
+}
+
+function add(formModel){
+  return request.post(constant.serverUrl + "/merchant/capitalInfo/add", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel){  
+  return request.post(constant.serverUrl + "/merchant/capitalInfo/update", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id){
+  return request.post(constant.serverUrl + "/merchant/capitalInfo/delete/" + id);
+}
+
+function batchRemove(idList){
+  return request.post(constant.serverUrl + "/merchant/capitalInfo/batchDelete",idList,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+export default {
+  pageList,create,edit,add,update,remove,batchRemove
+}

src/api/merchant/withdrawalRecord.js

@@ -0,0 +1,50 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData){
+  return request.post(constant.serverUrl + "/merchant/withdrawalRecord/pageList", formData);
+}
+
+function create(){
+  return request.get(constant.serverUrl + "/merchant/withdrawalRecord/create");
+}
+
+function edit(id){
+  return request.get(constant.serverUrl + "/merchant/withdrawalRecord/edit/" + id);
+}
+
+function add(formModel){
+  return request.post(constant.serverUrl + "/merchant/withdrawalRecord/add", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel){  
+  return request.post(constant.serverUrl + "/merchant/withdrawalRecord/update", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id){
+  return request.post(constant.serverUrl + "/merchant/withdrawalRecord/delete/" + id);
+}
+
+function batchRemove(idList){
+  return request.post(constant.serverUrl + "/merchant/withdrawalRecord/batchDelete",idList,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function approval(formData){
+  return request.post(constant.serverUrl + "/merchant/withdrawalRecord/approval", formData);
+}
+
+export default {
+  pageList,create,edit,add,update,remove,batchRemove,approval
+}

src/routers/index.js

@@ -5,6 +5,7 @@ import Home from '@/views/Home.vue'
 import baseRouters from './modules/base'
 import sysRouters from './modules/sys'
 import busRouters from './modules/bus'
+import merchantRouters from './modules/merchant'
 import { Message } from 'element-ui'
 import NProgress from 'nprogress' // progress bar
 import 'nprogress/nprogress.css' // progress bar style
@@ -31,6 +32,7 @@ export const constantRoutes = [
       ...sysRouters,
       ...baseRouters,
       ...busRouters,
+      ...merchantRouters,
     ]
   },
   {

src/routers/modules/merchant.js

@@ -0,0 +1,28 @@
+var routers = [
+        {
+                path: '/merchant/accountInfo/list',
+                name: 'MerchantAccountInfoList',
+                // route level code-splitting
+                // this generates a separate chunk (about.[hash].js) for this route
+                // which is lazy-loaded when the route is visited.
+                component: () => import('@/views/merchant/accountInfo-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '营收用户管理'
+                }
+        },{
+                path: '/merchant/withdrawalRecord/list',
+                name: 'MerchantWithdrawalRecordList',
+                // route level code-splitting
+                // this generates a separate chunk (about.[hash].js) for this route
+                // which is lazy-loaded when the route is visited.
+                component: () => import('@/views/merchant/withdrawalRecord-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '营收用户提现审核'
+                }
+        },
+        
+]
+
+export default routers;

src/views/merchant/accountInfo-detail.vue

@@ -0,0 +1,255 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align: left"
+    @close="closeDialog"
+    :close-on-click-modal="false"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form
+        ref="form"
+        :model="formModel"
+        :rules="ruleValidate"
+        :label-width="'100px'"
+      >
+        <el-form-item label="公司车队" prop="companyId">
+          <el-select-tree
+            :props="props"
+            :options="companyResult"
+            v-model="formModel.companyId"
+            size="mediumn"
+            width="300px"
+          ></el-select-tree>
+        </el-form-item>
+        <el-form-item label="商户名称" prop="name">
+          <el-input
+            v-model="formModel.name"
+            placeholder="请输入商户名称"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="头像" prop="imageUrl">
+          <el-upload
+            class="avatar-uploader"
+            name="photoFile"
+            :action="uploadUrl"
+            :show-file-list="false"
+            :headers="headers"
+            :data="uploadData"
+            :on-success="handleAvatarSuccess"
+            :before-upload="beforeAvatarUpload"
+          >
+            <img v-if="fileUrl" :src="fileUrl" class="avatar" />
+            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+          </el-upload>
+        </el-form-item>
+        
+        <el-form-item label="手机号" prop="phone">
+          <el-input
+            v-model="formModel.phone"
+            placeholder="请输入手机号"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="银行名称" prop="bankName">
+          <el-input
+            v-model="formModel.bankName"
+            placeholder="请输入银行名称"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="银行卡账号" prop="bankNumber">
+          <el-input
+            v-model="formModel.bankNumber"
+            placeholder="请输入银行卡账号"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="提现许可" prop="withdrawAllow">
+          <el-radio-group v-model="formModel.withdrawAllow">
+            <el-radio :label="true">可提现</el-radio>
+            <el-radio :label="false">不可提现</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="商户状态" prop="frozen">
+          <el-radio-group v-model="formModel.frozen">
+            <el-radio :label="true">已冻结</el-radio>
+            <el-radio :label="false">未冻结</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting"
+        >确 定</el-button
+      >
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import accountInfoApi from "@/api/merchant/accountInfo";
+import companyInfoApi from "@/api/bus/companyInfo";
+import SelectTree from "@/components/SelectTree";
+
+import { getToken } from "@/utils/auth"; // get token from cookie
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      formModel: {},
+      ruleValidate: {
+        name: [
+          { required: true, message: "商户名称不能为空", trigger: "blur" },
+        ],
+        companyId: [
+          {
+            required: true,
+            message: "关联的公司车队不能为空",
+            trigger: "blur",
+          },
+        ],
+        phone: [{ required: true, message: "手机号不能为空", trigger: "blur" }],
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      //上传地址
+      uploadUrl: Constant.serverUrl + "/uploadPicture",
+      uploadData: {
+        subFolder: "accountInfo",
+      },
+      fileUrl: "",
+      headers: {
+        Authorization: getToken(),
+      },
+      companyResult: [],
+      treeData: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children",
+      },
+    };
+  },
+  created() {
+    var self = this;
+
+    companyInfoApi.treeList().then(function (response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        self.companyResult = jsonData.data;
+      }
+    });
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          (function () {
+            var id = self.formModel.id;
+
+            if (id == null || id.length == 0) {
+              return accountInfoApi.add(self.formModel);
+            } else {
+              return accountInfoApi.update(self.formModel);
+            }
+          })().then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              self.$message({
+                message: "保存成功!",
+                type: "success",
+              });
+
+              self.$emit("close", true);
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning",
+              });
+
+              self.$emit("close", false);
+            }
+          });
+        }
+      });
+    },
+    handleAvatarSuccess(res, file) {
+      var self = this;
+      self.formModel.imageUrl = res.data;
+      self.fileUrl =
+        res.data + "?x-oss-process=image/resize,m_lfit,h_200,w_200";
+    },
+    beforeAvatarUpload(file) {
+      const isJPG = file.type === "image/jpeg";
+      const isLt2M = file.size / 1024 / 1024 < 2;
+
+      if (!isJPG) {
+        this.$message.error("上传头像图片只能是 JPG 格式!");
+      }
+      if (!isLt2M) {
+        this.$message.error("上传头像图片大小不能超过 2MB!");
+      }
+      return isJPG && isLt2M;
+    },
+  },
+  mounted: function () {
+    var self = this;
+
+    (function () {
+      if (self.businessKey.length == 0) {
+        return accountInfoApi.create();
+      } else {
+        return accountInfoApi.edit(self.businessKey);
+      }
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+          let imageUrl = self.formModel.imageUrl;
+          if (imageUrl != null) {
+            self.fileUrl =
+              imageUrl + "?x-oss-process=image/resize,m_lfit,h_200,w_200";
+          }
+
+          let withdrawAllow = self.formModel.withdrawAllow;
+          if (withdrawAllow == null) {
+            self.formModel.withdrawAllow = false;
+          }
+          let frozen = self.formModel.frozen;
+          if (frozen == null) {
+            self.formModel.frozen = false;
+          }
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+  components: {
+    "el-select-tree": SelectTree,
+  },
+};
+</script>

src/views/merchant/accountInfo-list.vue

@@ -0,0 +1,423 @@
+<template>
+  <div>
+    <el-breadcrumb separator=">">
+      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="#">系统管理</a>
+      </el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="/accountInfo">营收用户管理</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <!--
+      要resetFields起作用，必须配置:model和prop
+    -->
+    <el-form
+      ref="queryForm"
+      :model="queryModel"
+      inline
+      class="demo-form-inline"
+    >
+      <el-form-item label="关联的公司车队" prop="companyId">
+        <el-select-tree
+          :props="props"
+          :options="companyResult"
+          v-model="queryModel.companyId"
+          size="mini"
+          width="200px"
+        ></el-select-tree>
+      </el-form-item>
+      <el-form-item label="商户名称" prop="name">
+        <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
+      </el-form-item>
+      <el-form-item label="手机号" prop="phone">
+        <el-input type="text" size="mini" v-model="queryModel.phone"></el-input>
+      </el-form-item>
+      <el-form-item label="商户冻结" prop="frozen">
+        <el-select
+          v-model="queryModel.frozen"
+          size="mini"
+          placeholder="请选择"
+          style="width:100px"
+        >
+          <el-option label="全部" value=""> </el-option>
+          <el-option label="未冻结" value="0"> </el-option>
+          <el-option label="已冻结" value="1"> </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="ios-search"
+          @click="changePage(1)"
+          :loading="loading"
+          >查询</el-button
+        >&nbsp;
+        <el-button
+          type="info"
+          size="mini"
+          style="margin-left: 8px"
+          @click="handleReset('queryForm')"
+          >重置</el-button
+        >&nbsp;
+      </el-form-item>
+    </el-form>
+    <el-divider></el-divider>
+    <el-row class="button-group">
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-circle-plus"
+        @click="handleAdd"
+        >新增</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-circle-plus"
+        :disabled="multipleSelection.length == 0"
+        @click="handleBatchDelete"
+        >删除选中项</el-button
+      >
+    </el-row>
+    <el-table
+      :data="tableData"
+      style="min-height: 400px"
+      v-loading="loading"
+      stripe
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column
+        type="index"
+        label="序号"
+        :index="indexMethod"
+        width="50"
+      ></el-table-column>
+      <el-table-column prop="imageUrl" label="头像" width="80">
+        <template slot-scope="{ row }">
+          <a :href="row.imageUrl" target="_blank">
+            <el-avatar
+              :size="48"
+              shape="circle"
+              :src="
+                row.imageUrl + '?x-oss-process=image/resize,m_fill,w_64,h_64'
+              "
+              :key="row.id"
+            ></el-avatar>
+          </a> </template
+      ></el-table-column>
+      <el-table-column
+        prop="companyName"
+        label="关联的公司车队"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="商户名称"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="openId"
+        label="微信openId"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="phone"
+        label="手机号"
+        width="180"
+      ></el-table-column>
+      <el-table-column prop="withdrawAllow" label="提现许可" width="180">
+        <template slot-scope="{ row }">
+          <el-switch
+            v-model="row.withdrawAllow"
+            active-color="#13ce66"
+            inactive-color="#ff4949"
+            active-text="可提现 "
+            inactive-text="不可提现"
+            @change="updateSwitch(row)"
+          ></el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column prop="frozen" label="商户状态" width="180">
+        <template slot-scope="{ row }">
+          <el-switch
+            v-model="row.frozen"
+            active-color="#ff4949"
+            inactive-color="#13ce66"
+            active-text="冻结"
+            inactive-text="正常"
+            @change="updateSwitch(row)"
+          ></el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="bankName"
+        label="银行名称"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="bankNumber"
+        label="银行卡账号"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="updateTime"
+        label="更新时间"
+        width="180"
+      ></el-table-column>
+      <el-table-column label="操作" width="120">
+        <template slot-scope="{ row }">
+          <el-link type="primary" :underline="false" @click="handleEdit(row)"
+            >编辑</el-link
+          >-
+          <el-link type="danger" :underline="false" @click="handleDelete(row)"
+            >删除</el-link
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :current-page.sync="pageIndex"
+      :total="totalElements"
+      :page-sizes="pageSizeList"
+      @current-change="changePage"
+      @size-change="pageSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
+    ></el-pagination>
+    <accountInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></accountInfo-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import AccountInfoDetail from "./accountInfo-detail";
+import accountInfoApi from "@/api/merchant/accountInfo";
+import companyInfoApi from "@/api/bus/companyInfo";
+import SelectTree from "@/components/SelectTree";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        name: "",
+        companyId: "",
+        openId: "",
+        phone: "",
+        frozen: "",
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      companyResult: [],
+      treeData: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children",
+      },
+    };
+  },
+  created() {
+    var self = this;
+
+    companyInfoApi.treeList().then(function (response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        self.companyResult = jsonData.data;
+      }
+    });
+  },
+  methods: {
+    indexMethod(index) {
+      return (this.pageIndex - 1) * this.pageSize + (index + 1);
+    },
+    changePage(pageIndex) {
+      var self = this;
+
+      self.loading = true;
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
+
+      formData.append("name", self.queryModel.name);
+      if(self.queryModel.companyId == null){
+        self.queryModel.companyId = '';
+      }
+      formData.append("companyId", self.queryModel.companyId);
+      formData.append("phone", self.queryModel.phone);
+      formData.append("frozen", self.queryModel.frozen);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      accountInfoApi
+        .pageList(formData)
+        .then(function (response) {
+          self.loading = false;
+
+          var jsonData = response.data.data;
+
+          self.tableData = jsonData.data;
+          self.totalPages = jsonData.totalPages;
+          self.totalElements = jsonData.recordsTotal;
+        })
+        .catch((error) => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+
+      this.$nextTick(() => {
+        this.changePage(this.pageIndex);
+      });
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order;
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(() => {
+          accountInfoApi.remove(record.id).then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+            }
+          });
+        });
+    },
+    handleBatchDelete() {
+      var self = this;
+
+      var idList = this.multipleSelection.map((record) => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认删除选中项？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        accountInfoApi.batchRemove(idList).then(function (response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!",
+            });
+          }
+        });
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+    updateSwitch(row) {
+      accountInfoApi.update(row);
+    },
+  },
+  mounted: function () {
+    this.changePage(1);
+  },
+  components: {
+    "el-select-tree": SelectTree,
+    "accountInfo-detail": AccountInfoDetail,
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/merchant/capitalInfo-detail.vue

@@ -0,0 +1,224 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align: left"
+    @close="closeDialog"
+    :close-on-click-modal="false"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form
+        ref="form"
+        :model="formModel"
+        :rules="ruleValidate"
+        :label-width="'100px'"
+      >
+        <el-form-item label="" prop="id">
+          <el-input
+            v-model="formModel.id"
+            placeholder="请输入"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="商户id" prop="merchantId">
+          <el-input
+            v-model="formModel.merchantId"
+            placeholder="请输入商户id"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="可提现金额（线上）" prop="withdrawalAmount">
+          <el-input
+            v-model="formModel.withdrawalAmount"
+            placeholder="请输入可提现金额（线上）"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="已提现金额（线上）" prop="alreadyWithdrawalAmount">
+          <el-input
+            v-model="formModel.alreadyWithdrawalAmount"
+            placeholder="请输入已提现金额（线上）"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="总收益（线上，不包含当天）" prop="totalRevenue">
+          <el-input
+            v-model="formModel.totalRevenue"
+            placeholder="请输入总收益（线上，不包含当天）"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="创建人" prop="createBy">
+          <el-input
+            v-model="formModel.createBy"
+            placeholder="请输入创建人"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="创建时间" prop="createTime">
+          <el-input
+            v-model="formModel.createTime"
+            placeholder="请输入创建时间"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="更新人" prop="updateBy">
+          <el-input
+            v-model="formModel.updateBy"
+            placeholder="请输入更新人"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="更新时间" prop="updateTime">
+          <el-input
+            v-model="formModel.updateTime"
+            placeholder="请输入更新时间"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="是否删除" prop="delFlag">
+          <el-input
+            v-model="formModel.delFlag"
+            placeholder="请输入是否删除"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting"
+        >确 定</el-button
+      >
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import capitalInfoApi from "@/api/merchant/capitalInfo";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      formModel: {},
+      ruleValidate: {
+        id: [{ required: true, message: "不能为空", trigger: "blur" }],
+        merchantId: [
+          { required: true, message: "商户id不能为空", trigger: "blur" },
+        ],
+        withdrawalAmount: [
+          {
+            required: true,
+            message: "可提现金额（线上）不能为空",
+            trigger: "blur",
+          },
+        ],
+        alreadyWithdrawalAmount: [
+          {
+            required: true,
+            message: "已提现金额（线上）不能为空",
+            trigger: "blur",
+          },
+        ],
+        totalRevenue: [
+          {
+            required: true,
+            message: "总收益（线上，不包含当天）不能为空",
+            trigger: "blur",
+          },
+        ],
+        createBy: [
+          { required: true, message: "创建人不能为空", trigger: "blur" },
+        ],
+        createTime: [
+          { required: true, message: "创建时间不能为空", trigger: "blur" },
+        ],
+        updateBy: [
+          { required: true, message: "更新人不能为空", trigger: "blur" },
+        ],
+        updateTime: [
+          { required: true, message: "更新时间不能为空", trigger: "blur" },
+        ],
+        delFlag: [
+          { required: true, message: "是否删除不能为空", trigger: "blur" },
+        ],
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+    };
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          (function () {
+            var id = self.formModel.id;
+
+            if (id == null || id.length == 0) {
+              return capitalInfoApi.add(self.formModel);
+            } else {
+              return capitalInfoApi.update(self.formModel);
+            }
+          })().then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              self.$message({
+                message: "保存成功!",
+                type: "success",
+              });
+
+              self.$emit("close", true);
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning",
+              });
+
+              self.$emit("close", false);
+            }
+          });
+        }
+      });
+    },
+  },
+  mounted: function () {
+    var self = this;
+
+    (function () {
+      if (self.businessKey.length == 0) {
+        return capitalInfoApi.create();
+      } else {
+        return capitalInfoApi.edit(self.businessKey);
+      }
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+};
+</script>

src/views/merchant/capitalInfo-list.vue

@@ -0,0 +1,414 @@
+<template>
+  <div>
+    <el-breadcrumb separator=">">
+      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="#">系统管理</a>
+      </el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="/capitalInfo">capitalInfo管理</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <!--
+      要resetFields起作用，必须配置:model和prop
+    -->
+    <el-form
+      ref="queryForm"
+      :model="queryModel"
+      inline
+      class="demo-form-inline"
+    >
+      <el-form-item label="" prop="id">
+        <el-input type="text" size="mini" v-model="queryModel.id"></el-input>
+      </el-form-item>
+      <el-form-item label="商户id" prop="merchantId">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.merchantId"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="可提现金额（线上）" prop="withdrawalAmount">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.withdrawalAmount"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="已提现金额（线上）" prop="alreadyWithdrawalAmount">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.alreadyWithdrawalAmount"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="总收益（线上，不包含当天）" prop="totalRevenue">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.totalRevenue"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="创建人" prop="createBy">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.createBy"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.createTime"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="更新人" prop="updateBy">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.updateBy"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="更新时间" prop="updateTime">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.updateTime"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="是否删除" prop="delFlag">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.delFlag"
+        ></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="ios-search"
+          @click="changePage(1)"
+          :loading="loading"
+          >查询</el-button
+        >&nbsp;
+        <el-button
+          type="info"
+          size="mini"
+          style="margin-left: 8px"
+          @click="handleReset('queryForm')"
+          >重置</el-button
+        >&nbsp;
+      </el-form-item>
+    </el-form>
+    <el-divider></el-divider>
+    <el-row class="button-group">
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-circle-plus"
+        @click="handleAdd"
+        >新增</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-circle-plus"
+        :disabled="multipleSelection.length == 0"
+        @click="handleBatchDelete"
+        >删除选中项</el-button
+      >
+    </el-row>
+    <el-table
+      :data="tableData"
+      style="min-height: 400px"
+      v-loading="loading"
+      stripe
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column prop="id" label="" width="180"></el-table-column>
+      <el-table-column
+        prop="merchantId"
+        label="商户id"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="withdrawalAmount"
+        label="可提现金额（线上）"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="alreadyWithdrawalAmount"
+        label="已提现金额（线上）"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="totalRevenue"
+        label="总收益（线上，不包含当天）"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="createBy"
+        label="创建人"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="createTime"
+        label="创建时间"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="updateBy"
+        label="更新人"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="updateTime"
+        label="更新时间"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="delFlag"
+        label="是否删除"
+        width="180"
+      ></el-table-column>
+      <el-table-column label="操作">
+        <template slot-scope="{ row }">
+          <el-button size="mini" type="warning" @click="handleEdit(row)"
+            >编辑</el-button
+          >
+          <el-button size="mini" type="danger" @click="handleDelete(row)"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :current-page.sync="pageIndex"
+      :total="totalElements"
+      :page-sizes="pageSizeList"
+      @current-change="changePage"
+      @size-change="pageSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
+    ></el-pagination>
+    <capitalInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></capitalInfo-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import CapitalInfoDetail from "./capitalInfo-detail";
+import capitalInfoApi from "@/api/merchant/capitalInfo";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        id: "",
+        merchantId: "",
+        withdrawalAmount: "",
+        alreadyWithdrawalAmount: "",
+        totalRevenue: "",
+        createBy: "",
+        createTime: "",
+        updateBy: "",
+        updateTime: "",
+        delFlag: "",
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+    };
+  },
+  methods: {
+    changePage(pageIndex) {
+      var self = this;
+
+      self.loading = true;
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
+
+      formData.append("id", self.queryModel.id);
+      formData.append("merchantId", self.queryModel.merchantId);
+      formData.append("withdrawalAmount", self.queryModel.withdrawalAmount);
+      formData.append(
+        "alreadyWithdrawalAmount",
+        self.queryModel.alreadyWithdrawalAmount
+      );
+      formData.append("totalRevenue", self.queryModel.totalRevenue);
+      formData.append("createBy", self.queryModel.createBy);
+      formData.append("createTime", self.queryModel.createTime);
+      formData.append("updateBy", self.queryModel.updateBy);
+      formData.append("updateTime", self.queryModel.updateTime);
+      formData.append("delFlag", self.queryModel.delFlag);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      capitalInfoApi
+        .pageList(formData)
+        .then(function (response) {
+          self.loading = false;
+
+          var jsonData = response.data.data;
+
+          self.tableData = jsonData.data;
+          self.totalPages = jsonData.totalPages;
+          self.totalElements = jsonData.recordsTotal;
+        })
+        .catch((error) => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+
+      this.$nextTick(() => {
+        this.changePage(this.pageIndex);
+      });
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order;
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(() => {
+          capitalInfoApi.remove(record.id).then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+            }
+          });
+        });
+    },
+    handleBatchDelete() {
+      var self = this;
+
+      var idList = this.multipleSelection.map((record) => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认删除选中项？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        capitalInfoApi.batchRemove(idList).then(function (response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!",
+            });
+          }
+        });
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+  },
+  mounted: function () {
+    this.changePage(1);
+  },
+  components: {
+    "capitalInfo-detail": CapitalInfoDetail,
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/merchant/withdrawalRecord-detail.vue

@@ -0,0 +1,254 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align: left"
+    @close="closeDialog"
+    :close-on-click-modal="false"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form
+        ref="form"
+        :model="formModel"
+        :rules="ruleValidate"
+        :label-width="'100px'"
+      >
+        <el-form-item label="" prop="id">
+          <el-input
+            v-model="formModel.id"
+            placeholder="请输入"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="商户id" prop="merchantId">
+          <el-input
+            v-model="formModel.merchantId"
+            placeholder="请输入商户id"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="申请提现金额" prop="applyWithdrawalAmount">
+          <el-input
+            v-model="formModel.applyWithdrawalAmount"
+            placeholder="请输入申请提现金额"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="申请时间" prop="applyTime">
+          <el-input
+            v-model="formModel.applyTime"
+            placeholder="请输入申请时间"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="状态（0：申请中，1：同意，2：拒绝）" prop="status">
+          <el-input
+            v-model="formModel.status"
+            placeholder="请输入状态（0：申请中，1：同意，2：拒绝）"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="审核时间" prop="examineTime">
+          <el-input
+            v-model="formModel.examineTime"
+            placeholder="请输入审核时间"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="审核人" prop="examineBy">
+          <el-input
+            v-model="formModel.examineBy"
+            placeholder="请输入审核人"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input
+            v-model="formModel.remark"
+            placeholder="请输入备注"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="提现编号" prop="withdrawalNo">
+          <el-input
+            v-model="formModel.withdrawalNo"
+            placeholder="请输入提现编号"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="创建人" prop="createBy">
+          <el-input
+            v-model="formModel.createBy"
+            placeholder="请输入创建人"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="创建时间" prop="createTime">
+          <el-input
+            v-model="formModel.createTime"
+            placeholder="请输入创建时间"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="更新人" prop="updateBy">
+          <el-input
+            v-model="formModel.updateBy"
+            placeholder="请输入更新人"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="更新时间" prop="updateTime">
+          <el-input
+            v-model="formModel.updateTime"
+            placeholder="请输入更新时间"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="是否删除" prop="delFlag">
+          <el-input
+            v-model="formModel.delFlag"
+            placeholder="请输入是否删除"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting"
+        >确 定</el-button
+      >
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import withdrawalRecordApi from "@/api/merchant/withdrawalRecord";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      formModel: {},
+      ruleValidate: {
+        id: [{ required: true, message: "不能为空", trigger: "blur" }],
+        merchantId: [
+          { required: true, message: "商户id不能为空", trigger: "blur" },
+        ],
+        applyWithdrawalAmount: [
+          { required: true, message: "申请提现金额不能为空", trigger: "blur" },
+        ],
+        applyTime: [
+          { required: true, message: "申请时间不能为空", trigger: "blur" },
+        ],
+        status: [
+          {
+            required: true,
+            message: "状态（0：申请中，1：同意，2：拒绝）不能为空",
+            trigger: "blur",
+          },
+        ],
+        examineTime: [
+          { required: true, message: "审核时间不能为空", trigger: "blur" },
+        ],
+        examineBy: [
+          { required: true, message: "审核人不能为空", trigger: "blur" },
+        ],
+        remark: [{ required: true, message: "备注不能为空", trigger: "blur" }],
+        withdrawalNo: [
+          { required: true, message: "提现编号不能为空", trigger: "blur" },
+        ],
+        createBy: [
+          { required: true, message: "创建人不能为空", trigger: "blur" },
+        ],
+        createTime: [
+          { required: true, message: "创建时间不能为空", trigger: "blur" },
+        ],
+        updateBy: [
+          { required: true, message: "更新人不能为空", trigger: "blur" },
+        ],
+        updateTime: [
+          { required: true, message: "更新时间不能为空", trigger: "blur" },
+        ],
+        delFlag: [
+          { required: true, message: "是否删除不能为空", trigger: "blur" },
+        ],
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+    };
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          (function () {
+            var id = self.formModel.id;
+
+            if (id == null || id.length == 0) {
+              return withdrawalRecordApi.add(self.formModel);
+            } else {
+              return withdrawalRecordApi.update(self.formModel);
+            }
+          })().then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              self.$message({
+                message: "保存成功!",
+                type: "success",
+              });
+
+              self.$emit("close", true);
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning",
+              });
+
+              self.$emit("close", false);
+            }
+          });
+        }
+      });
+    },
+  },
+  mounted: function () {
+    var self = this;
+
+    (function () {
+      if (self.businessKey.length == 0) {
+        return withdrawalRecordApi.create();
+      } else {
+        return withdrawalRecordApi.edit(self.businessKey);
+      }
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+};
+</script>

src/views/merchant/withdrawalRecord-list.vue

@@ -0,0 +1,440 @@
+<template>
+  <div>
+    <el-breadcrumb separator=">">
+      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="#">系统管理</a>
+      </el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="/withdrawalRecord">营收用户提现审核</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <!--
+      要resetFields起作用，必须配置:model和prop
+    -->
+    <el-form
+      ref="queryForm"
+      :model="queryModel"
+      inline
+      class="demo-form-inline"
+    >
+      <el-form-item label="关联的公司车队" prop="companyId">
+        <el-select-tree
+          :props="props"
+          :options="companyResult"
+          v-model="queryModel.companyId"
+          size="mini"
+          width="200px"
+        ></el-select-tree>
+      </el-form-item>
+      <el-form-item label="商户名称" prop="name">
+        <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
+      </el-form-item>
+      <!-- <el-form-item label="申请时间" prop="applyTime">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.applyTime"
+        ></el-input>
+      </el-form-item> -->
+      <el-form-item label="提现编号" prop="withdrawalNo">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.withdrawalNo"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="审批状态" prop="status">
+        <el-select
+          v-model="queryModel.status"
+          size="mini"
+          placeholder="请选择"
+          style="width: 100px"
+        >
+          <el-option label="全部" value=""> </el-option>
+          <el-option label="申请中" value="0"> </el-option>
+          <el-option label="同意" value="1"> </el-option>
+          <el-option label="拒绝" value="2"> </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="ios-search"
+          @click="changePage(1)"
+          :loading="loading"
+          >查询</el-button
+        >&nbsp;
+        <el-button
+          type="info"
+          size="mini"
+          style="margin-left: 8px"
+          @click="handleReset('queryForm')"
+          >重置</el-button
+        >&nbsp;
+      </el-form-item>
+    </el-form>
+    <el-divider></el-divider>
+    <el-row class="button-group"> </el-row>
+    <el-table
+      :data="tableData"
+      style="min-height: 400px"
+      v-loading="loading"
+      stripe
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column
+        type="index"
+        label="序号"
+        :index="indexMethod"
+        width="50"
+      ></el-table-column>
+      <el-table-column
+        prop="accountInfo.companyName"
+        label="所属公司"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="accountInfo.name"
+        label="提现人员名称"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="capitalInfo.withdrawalAmount"
+        label="可提现金额"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="withdrawalNo"
+        label="提现编号"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="applyWithdrawalAmount"
+        label="申请提现金额"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="applyTime"
+        label="申请时间"
+        width="180"
+      ></el-table-column>
+      <el-table-column prop="status" label="状态" width="150">
+        <template slot-scope="{ row }">
+          <span v-if="row.status == 0">申请中</span>
+          <span v-else-if="row.status == 1">同意</span>
+          <span v-else-if="row.status == 2">拒绝</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="examineTime"
+        label="审核时间"
+        width="180"
+      ></el-table-column>
+      <el-table-column prop="remark" label="备注" width="180"></el-table-column>
+      <el-table-column label="操作" fixed="right" width="180">
+        <template slot-scope="{ row }">
+          <el-row>
+            <el-col :span="12">
+              <el-link
+                v-if="row.status == 0"
+                type="primary"
+                :underline="false"
+                @click="handleApproval(row, '1')"
+                >审核通过</el-link
+              >
+            </el-col>
+            <el-col :span="12">
+              <el-link
+                v-if="row.status == 0"
+                type="primary"
+                :underline="false"
+                @click="handleApproval(row, '2')"
+                >审核不通过</el-link
+              >
+            </el-col>
+          </el-row>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :current-page.sync="pageIndex"
+      :total="totalElements"
+      :page-sizes="pageSizeList"
+      @current-change="changePage"
+      @size-change="pageSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
+    ></el-pagination>
+    <withdrawalRecord-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></withdrawalRecord-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import WithdrawalRecordDetail from "./withdrawalRecord-detail";
+import withdrawalRecordApi from "@/api/merchant/withdrawalRecord";
+import companyInfoApi from "@/api/bus/companyInfo";
+import SelectTree from "@/components/SelectTree";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        id: "",
+        companyId: "",
+        name: "",
+        phone: "",
+        applyTime: "",
+        status: "",
+        withdrawalNo: "",
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      companyResult: [],
+      treeData: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children",
+      },
+    };
+  },
+  created() {
+    var self = this;
+
+    companyInfoApi.treeList().then(function (response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        self.companyResult = jsonData.data;
+      }
+    });
+  },
+  methods: {
+    indexMethod(index) {
+      return (this.pageIndex - 1) * this.pageSize + (index + 1);
+    },
+    changePage(pageIndex) {
+      var self = this;
+
+      self.loading = true;
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
+
+      formData.append("id", self.queryModel.id);
+      formData.append("merchantId", self.queryModel.merchantId);
+      formData.append(
+        "applyWithdrawalAmount",
+        self.queryModel.applyWithdrawalAmount
+      );
+      formData.append("name", self.queryModel.name);
+      formData.append("status", self.queryModel.status);
+      if (self.queryModel.companyId == null) {
+        self.queryModel.companyId = "";
+      }
+      formData.append("companyId", self.queryModel.companyId);
+      formData.append("examineBy", self.queryModel.examineBy);
+      formData.append("withdrawalNo", self.queryModel.withdrawalNo);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      withdrawalRecordApi
+        .pageList(formData)
+        .then(function (response) {
+          self.loading = false;
+
+          var jsonData = response.data.data;
+
+          self.tableData = jsonData.data;
+          self.totalPages = jsonData.totalPages;
+          self.totalElements = jsonData.recordsTotal;
+        })
+        .catch((error) => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+
+      this.$nextTick(() => {
+        this.changePage(this.pageIndex);
+      });
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order;
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(() => {
+          withdrawalRecordApi.remove(record.id).then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+            }
+          });
+        });
+    },
+    handleBatchDelete() {
+      var self = this;
+
+      var idList = this.multipleSelection.map((record) => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认删除选中项？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        withdrawalRecordApi.batchRemove(idList).then(function (response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!",
+            });
+          }
+        });
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+    handleApproval(record, status) {
+      var self = this;
+      self
+        .$confirm("是否确认审核?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(() => {
+          var formData = new FormData();
+          formData.append("id", record.id);
+          formData.append("status", status);
+          withdrawalRecordApi.approval(formData).then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: jsonData.message,
+              });
+            } else {
+              self.$message({
+                showClose: true,
+                dangerouslyUseHTMLString: true,
+                message: jsonData.message,
+              });
+            }
+          });
+        });
+    },
+  },
+  mounted: function () {
+    this.changePage(1);
+  },
+  components: {
+    "el-select-tree": SelectTree,
+    "withdrawalRecord-detail": WithdrawalRecordDetail,
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>